diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e460999994..3ac7613f754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.0.0 (unreleased) + +**Enhancements** +- [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions + # 1.9.1 (2014-12-29) **Enhancements** diff --git a/src/app/features/graphite/gfunc.js b/src/app/features/graphite/gfunc.js index dc912f9328c..7190fbf0295 100644 --- a/src/app/features/graphite/gfunc.js +++ b/src/app/features/graphite/gfunc.js @@ -223,6 +223,13 @@ function (_, $) { defaultParams: ['max'] }); + addFuncDef({ + name: "cumulative", + category: categories.Special, + params: [], + defaultParams: [] + }); + addFuncDef({ name: "groupByNode", category: categories.Special, @@ -467,6 +474,13 @@ function (_, $) { defaultParams: [0] }); + addFuncDef({ + name: 'minimumBelow', + category: categories.Filter, + params: [{ name: "value", type: "int" }], + defaultParams: [0] + }); + addFuncDef({ name: 'limit', category: categories.Filter,