From 38b71bf386b1281913fae20588c15310f381ef16 Mon Sep 17 00:00:00 2001
From: Raul Simiciuc <byraul@gmail.com>
Date: Mon, 13 Oct 2014 12:36:26 +0100
Subject: [PATCH 1/3] adding counterMax option to opentsdb

---
 src/app/partials/opentsdb/editor.html           | 13 +++++++++++++
 src/app/services/opentsdb/opentsdbDatasource.js |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/app/partials/opentsdb/editor.html b/src/app/partials/opentsdb/editor.html
index b74b1d7a269..4c12ac09b87 100644
--- a/src/app/partials/opentsdb/editor.html
+++ b/src/app/partials/opentsdb/editor.html
@@ -89,6 +89,19 @@
                    ng-model="target.isCounter"
                    ng-change="targetBlur()">
           </li>
+          <li class="grafana-target-segment" ng-hide="!target.isCounter">
+            Counter Max:
+          </li>
+          <li ng-hide="!target.isCounter">
+            <input type="text"
+                   class="grafana-target-segment-input input-medium"
+                   ng-disabled="!target.shouldComputeRate"
+                   ng-model="target.counterMax"
+                   spellcheck='false'
+                   placeholder="Counter max value"
+                   ng-blur="targetBlur()"
+                   />
+          </li>
           <li class="grafana-target-segment">
             Alias:
           </li>
diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js
index f6a36c6f035..6aca0463624 100644
--- a/src/app/services/opentsdb/opentsdbDatasource.js
+++ b/src/app/services/opentsdb/opentsdbDatasource.js
@@ -136,6 +136,10 @@ function (angular, _, kbn) {
         query.rateOptions = {
           counter: !!target.isCounter
         };
+
+        if (target.counterMax && target.counterMax.length) {
+            query.rateOptions['counterMax'] = parseInt(target.counterMax);
+        }
       }
 
       if (target.shouldDownsample) {

From 87e8162a2d26b9a4c4fc06f49f1742ff5c6b2f10 Mon Sep 17 00:00:00 2001
From: Raul Simiciuc <byraul@gmail.com>
Date: Mon, 13 Oct 2014 13:07:46 +0100
Subject: [PATCH 2/3] fixed identation

---
 src/app/services/opentsdb/opentsdbDatasource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js
index 6aca0463624..a497d23c119 100644
--- a/src/app/services/opentsdb/opentsdbDatasource.js
+++ b/src/app/services/opentsdb/opentsdbDatasource.js
@@ -138,7 +138,7 @@ function (angular, _, kbn) {
         };
 
         if (target.counterMax && target.counterMax.length) {
-            query.rateOptions['counterMax'] = parseInt(target.counterMax);
+          query.rateOptions['counterMax'] = parseInt(target.counterMax);
         }
       }
 

From 29d7d6994a5a394e8bc6216057d698b949d688bd Mon Sep 17 00:00:00 2001
From: Raul Simiciuc <byraul@gmail.com>
Date: Mon, 13 Oct 2014 13:43:25 +0100
Subject: [PATCH 3/3] added reset value

---
 src/app/partials/opentsdb/editor.html           | 13 +++++++++++++
 src/app/services/opentsdb/opentsdbDatasource.js |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/app/partials/opentsdb/editor.html b/src/app/partials/opentsdb/editor.html
index 4c12ac09b87..51a575d933c 100644
--- a/src/app/partials/opentsdb/editor.html
+++ b/src/app/partials/opentsdb/editor.html
@@ -102,6 +102,19 @@
                    ng-blur="targetBlur()"
                    />
           </li>
+          <li class="grafana-target-segment" ng-hide="!target.isCounter">
+            Counter Reset Value:
+          </li>
+          <li ng-hide="!target.isCounter">
+            <input type="text"
+                   class="grafana-target-segment-input input-medium"
+                   ng-disabled="!target.shouldComputeRate"
+                   ng-model="target.counterResetValue"
+                   spellcheck='false'
+                   placeholder="Counter reset value"
+                   ng-blur="targetBlur()"
+                   />
+          </li>
           <li class="grafana-target-segment">
             Alias:
           </li>
diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js
index a497d23c119..0cf3e5f1148 100644
--- a/src/app/services/opentsdb/opentsdbDatasource.js
+++ b/src/app/services/opentsdb/opentsdbDatasource.js
@@ -138,7 +138,11 @@ function (angular, _, kbn) {
         };
 
         if (target.counterMax && target.counterMax.length) {
-          query.rateOptions['counterMax'] = parseInt(target.counterMax);
+          query.rateOptions.counterMax = parseInt(target.counterMax);
+        }
+
+        if (target.counterResetValue && target.counterResetValue.length) {
+          query.rateOptions.resetValue = parseInt(target.counterResetValue);
         }
       }