From 2b0152f6f4ad7e9dbc6127a051a29e10e0b534c7 Mon Sep 17 00:00:00 2001
From: Markus Linnala <Markus.Linnala@cybercom.com>
Date: Thu, 27 Mar 2014 14:34:41 +0200
Subject: [PATCH 1/3] add support for graphite func consolidateBy

---
 src/app/services/graphite/gfunc.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index 56bb83667f4..b6117f1bb50 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -111,6 +111,19 @@ function (_) {
     defaultParams: ['stacked']
   });
 
+  addFuncDef({
+    name: "consolidateBy",
+    category: categories.Special,
+    params: [
+      {
+        name: 'function',
+        type: 'string',
+        options: ['sum', 'average', 'min', 'max']
+      }
+    ],
+    defaultParams: ['max']
+  });
+  
   addFuncDef({
     name: "groupByNode",
     category: categories.Special,

From e441e970306a54406aa43900b53eda0c06a0f21c Mon Sep 17 00:00:00 2001
From: Markus Linnala <Markus.Linnala@cybercom.com>
Date: Thu, 27 Mar 2014 14:53:26 +0200
Subject: [PATCH 2/3] add support for graphite func substr

---
 src/app/services/graphite/gfunc.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index b6117f1bb50..dcd6ef3e632 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -152,6 +152,16 @@ function (_) {
     defaultParams: [3]
   });
 
+  addFuncDef({
+    name: 'substr',
+    category: categories.Special,
+    params: [
+      { name: "start", type: "int", options: [-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12] },
+      { name: "stop", type: "int", options: [-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,12] },
+    ],
+    defaultParams: [0, 0]
+  });
+
   addFuncDef({
     name: 'sortByName',
     category: categories.Special

From 863e58a8e7ffa03747022d8bcccc79e466637daa Mon Sep 17 00:00:00 2001
From: Markus Linnala <Markus.Linnala@cybercom.com>
Date: Thu, 27 Mar 2014 15:03:09 +0200
Subject: [PATCH 3/3] add support for graphite functions: maximumAbove
 maximumBelow minimumAbove

---
 src/app/services/graphite/gfunc.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index dcd6ef3e632..cf1e3a50721 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -294,6 +294,27 @@ function (_) {
     defaultParams: [25]
   });
 
+  addFuncDef({
+    name: 'maximumAbove',
+    category: categories.Filter,
+    params: [ { name: "value", type: "int" } ],
+    defaultParams: [0]
+  });
+
+  addFuncDef({
+    name: 'maximumBelow',
+    category: categories.Filter,
+    params: [ { name: "value", type: "int" } ],
+    defaultParams: [0]
+  });
+
+  addFuncDef({
+    name: 'minimumAbove',
+    category: categories.Filter,
+    params: [ { name: "value", type: "int" } ],
+    defaultParams: [0]
+  });
+
   addFuncDef({
     name: "exclude",
     category: categories.Filter,