From e6bccc5eff30ba62b6406af9396a05c406ebd0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 2 May 2016 09:06:57 +0200
Subject: [PATCH] feat(influxdb): Added new functions moving_average and
 difference to query editor, closes #4698

---
 CHANGELOG.md                                   |  3 +++
 docker/blocks/influxdb/fig                     |  2 +-
 .../plugins/datasource/influxdb/query_part.ts  | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33a3814051..3cfe94cdf06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 * **Graphite PNG*: Fixed issue graphite png rendering option, fixes [#4864](https://github.com/grafana/grafana/issues/4864)
 * **InfluxDB**: Fixed issue missing plus group by iconn, fixes [#4862](https://github.com/grafana/grafana/issues/4862)
 
+### Enhancements
+* **InfluxDB**: Added new functions moving_average and difference to query editor, closes [#4698](https://github.com/grafana/grafana/issues/4698)
+
 # 3.0.0-beta6 (2016-04-29)
 
 ### Enhancements
diff --git a/docker/blocks/influxdb/fig b/docker/blocks/influxdb/fig
index 931f8a2640a..c537a74b003 100644
--- a/docker/blocks/influxdb/fig
+++ b/docker/blocks/influxdb/fig
@@ -1,5 +1,5 @@
 influxdb:
-  image: tutum/influxdb:latest
+  image: tutum/influxdb:0.12
   ports:
     - "2004:2004"
     - "8083:8083"
diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts
index 922440bd482..63d70be5653 100644
--- a/public/app/plugins/datasource/influxdb/query_part.ts
+++ b/public/app/plugins/datasource/influxdb/query_part.ts
@@ -239,6 +239,24 @@ QueryPartDef.register({
   renderer: functionRenderer,
 });
 
+QueryPartDef.register({
+  type: 'difference',
+  addStrategy: addTransformationStrategy,
+  category: categories.Transformations,
+  params: [],
+  defaultParams: [],
+  renderer: functionRenderer,
+});
+
+QueryPartDef.register({
+  type: 'moving_average',
+  addStrategy: addTransformationStrategy,
+  category: categories.Transformations,
+  params: [{ name: "window", type: "number", options: [5, 10, 20, 30, 40]}],
+  defaultParams: [10],
+  renderer: functionRenderer,
+});
+
 QueryPartDef.register({
   type: 'stddev',
   addStrategy: addTransformationStrategy,