From 7c6f0ad445f25cb4bcae3b1d8a5bc540d33bd100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 5 Jan 2015 20:25:55 +0100
Subject: [PATCH] Graphite: Added cumulative and minimumBelow graphite
 functions, Closes #1297

---
 CHANGELOG.md                       |  5 +++++
 src/app/features/graphite/gfunc.js | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

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,