You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2016/04/18 19:47:50 UTC

[3/3] ambari git commit: AMBARI-15868. Metric Query Editor Changes - Grafana. (Prajwal Rao via yusaku)

AMBARI-15868. Metric Query Editor Changes - Grafana. (Prajwal Rao via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d554f8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d554f8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d554f8c

Branch: refs/heads/trunk
Commit: 2d554f8c12484bac7fcfcde887e5ef2f561a82b9
Parents: 9e15408
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Apr 18 10:47:21 2016 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Apr 18 10:47:40 2016 -0700

----------------------------------------------------------------------
 .../ambari-metrics/datasource.js                |  35 ++-
 .../ambari-metrics/partials/query.editor.html   |  13 +-
 .../ambari-metrics/queryCtrl.js                 |  27 +-
 .../grafana-dashboards/grafana-hbase-home.json  | 247 ++++++++-------
 .../grafana-dashboards/grafana-hbase-misc.json  |  54 ++--
 .../grafana-hbase-performance.json              | 302 +++++++++----------
 .../grafana-hdfs-datanodes.json                 |  42 +--
 .../grafana-dashboards/grafana-hdfs-home.json   |  22 +-
 .../grafana-hdfs-namenodes.json                 |  70 +++--
 .../grafana-dashboards/grafana-system-home.json | 117 ++++---
 .../grafana-system-servers.json                 |  71 +++--
 .../grafana-yarn-applications.json              |  35 +--
 .../grafana-dashboards/grafana-yarn-home.json   |  31 +-
 .../grafana-yarn-jobhistoryserver.json          |  14 +-
 .../grafana-yarn-nodemanagers.json              |  46 ++-
 .../grafana-dashboards/grafana-yarn-queues.json |  69 ++---
 .../grafana-yarn-resourcemanagers.json          |  30 +-
 .../grafana-yarn-timelineserver.json            |  22 +-
 18 files changed, 614 insertions(+), 633 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d554f8c/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
index ca13ff1..d215b76 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -147,11 +147,12 @@ define([
             };
           };
           var getHostAppIdData = function(target) {
-            var precision = target.shouldAddPrecision && target.precision !== '' ? '&precision=' + target.precision : '';
-            var rate = target.shouldComputeRate ? '._rate._' : '._';
-            target.aggregator = target.precision !== "seconds" ? target.aggregator : '';
+            var precision = target.precision === 'default' || typeof target.precision == 'undefined'  ? '' : '&precision=' 
+            + target.precision;
+            var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator;
+            var rate = target.transform === "rate" ? '._rate' : '';
             return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + rate +
-                target.aggregator + "&hostname=" + target.hosts + '&appId=' + target.app + '&startTime=' + from +
+                metricAggregator + "&hostname=" + target.hosts + '&appId=' + target.app + '&startTime=' + from +
                 '&endTime=' + to + precision).then(
                 getMetricsData(target)
             );
@@ -167,30 +168,36 @@ define([
 
           var getServiceAppIdData = function(target) {
             var tHost = (_.isEmpty(templateSrv.variables)) ? templatedHost : target.templatedHost;
-            var precision = target.shouldAddPrecision && target.precision !== '' ? '&precision=' + target.precision : '';
-            var rate = target.shouldComputeRate ? '._rate._' : '._';
+            var precision = target.precision === 'default' || typeof target.precision == 'undefined'  ? '' : '&precision=' 
+            + target.precision;
+            var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator;
+            var rate = target.transform === "rate" ? '._rate' : '';
             return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + rate
-              + target.aggregator + '&hostname=' + tHost + '&appId=' + target.app + '&startTime=' + from +
+              + metricAggregator + '&hostname=' + tHost + '&appId=' + target.app + '&startTime=' + from +
               '&endTime=' + to + precision).then(
               getMetricsData(target)
             );
           };
           // To speed up querying on templatized dashboards.
           var getAllHostData = function(target) {
-            var precision = target.shouldAddPrecision && target.precision !== '' ? '&precision=' + target.precision : '';
-            var rate = target.shouldComputeRate ? '._rate._' : '._';
+            var precision = target.precision === 'default' || typeof target.precision == 'undefined'  ? '' : '&precision=' 
+            + target.precision;
+            var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator;
+            var rate = target.transform === "rate" ? '._rate' : '';
             var templatedComponent = (_.isEmpty(tComponent)) ? target.app : tComponent;
             return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + rate
-              + target.aggregator + '&hostname=' + target.templatedHost + '&appId=' + templatedComponent + '&startTime=' + from +
+              + metricAggregator + '&hostname=' + target.templatedHost + '&appId=' + templatedComponent + '&startTime=' + from +
               '&endTime=' + to + precision).then(
               allHostMetricsData(target)
             );
           };
           var getYarnAppIdData = function(target) {
-            var precision = target.shouldAddPrecision && target.precision !== '' ? '&precision=' + target.precision : '';
-            var rate = target.shouldComputeRate ? '._rate._' : '._';
+            var precision = target.precision === 'default' || typeof target.precision == 'undefined'  ? '' : '&precision=' 
+            + target.precision;
+            var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator;
+            var rate = target.transform === "rate" ? '._rate' : '';
             return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.queue + rate
-              + target.aggregator + '&appId=resourcemanager&startTime=' + from +
+              + metricAggregator + '&appId=resourcemanager&startTime=' + from +
               '&endTime=' + to + precision).then(
               getMetricsData(target)
             );
@@ -466,7 +473,7 @@ define([
             return aggregatorsPromise;
           }
           aggregatorsPromise = $q.when([
-            'avg', 'sum', 'min', 'max'
+            'default','avg', 'sum', 'min', 'max'
           ]);
           return aggregatorsPromise;
         };

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d554f8c/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html
index 744d238..b034c03 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/partials/query.editor.html
@@ -131,15 +131,22 @@
             </a>
         </li>
         <li class="tight-form-item tight-form-align">
-            <editor-checkbox text="Rate (/sec)" model="target.shouldComputeRate" change="targetBlur()"></editor-checkbox>
+           Transform
+        </li>
+        <li>
+            <select ng-model="target.transform" class="tight-form-input input-small"
+                    ng-options="transform for transform in transforms"
+                    ng-init="transform()"
+                    ng-change="targetBlur()"></select>
         </li>
 
         <li class="tight-form-item tight-form-align">
-            <editor-checkbox text="Precision" model="target.shouldAddPrecision" change="targetBlur()"></editor-checkbox>
+            Precision
         </li>
-        <li ng-show="target.shouldAddPrecision">
+        <li>
             <select ng-model="target.precision" class="tight-form-input input-small"
                     ng-options="precision for precision in precisions"
+                    ng-init="precisionInit()"
                     ng-change="targetBlur()">
             </select>
         </li>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d554f8c/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js
index 3f5e31e..1e943e4 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js
@@ -28,30 +28,29 @@ define([
 
         $scope.init = function() {
           $scope.target.errors = validateTarget($scope.target);
-          $scope.aggregators = ['avg', 'sum', 'min', 'max'];
-          $scope.precisions = ['seconds', 'minutes', 'hours', 'days'];
+          $scope.aggregators = ['none','avg', 'sum', 'min', 'max'];
+          $scope.precisions = ['default','seconds', 'minutes', 'hours', 'days'];
+          $scope.transforms = ['none','rate'];
 
           if (!$scope.target.aggregator) {
             $scope.target.aggregator = 'avg';
           }
-
-          if (!$scope.target.shouldAddPrecision) {
-            $scope.target.precision = '';
-          }
-
-          
-          $scope.$watch('target.precision', function() {
-            if ($scope.target.precision !== "seconds") {
-              $scope.target.aggregator = $scope.target.aggregator;
-            }
-          });
+          $scope.precisionInit = function () {
+           if (typeof $scope.target.precision == 'undefined') {
+                $scope.target.precision = "default";
+           }
+          };
+          $scope.transform = function () {
+           if (typeof $scope.target.transform == 'undefined') {
+                $scope.target.transform = "none";
+           }
+          };
           $scope.$watch('target.app', function (newValue) {
             if (newValue === '') {
               $scope.target.metric = '';
               $scope.target.hosts = '';
             }
           });
-
           if (!$scope.target.downsampleAggregator) {
             $scope.target.downsampleAggregator = 'avg';
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d554f8c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
index 635795f..9d983e4 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-home.json
@@ -78,10 +78,8 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.Server.numRegionServers",
-              "precision": "",
-              "refId": "A",
-              "shouldAddPrecision": false,
-              "shouldComputeRate": false
+              "precision": "default",
+              "refId": "A"
             }
           ],
           "thresholds": "",
@@ -138,7 +136,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.Server.numDeadRegionServers",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             }
           ],
@@ -196,7 +194,7 @@
               "errors": {},
               "hosts": "",
               "metric": "regionserver.Server.regionCount",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             }
           ],
@@ -257,7 +255,7 @@
               "hosts": "",
               "metric": "master.Server.averageLoad",
               "refId": "A",
-              "shouldComputeRate": false
+              "precision": "default"
             }
           ],
           "thresholds": "",
@@ -334,7 +332,7 @@
               "errors": {},
               "hosts": "",
               "metric": "regionserver.Server.regionCount",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -344,7 +342,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.storeCount",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             }
           ],
@@ -418,7 +416,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.storeFileSize",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -428,7 +426,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.storeFileCount",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -438,7 +436,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.storeFileIndexSize",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -448,7 +446,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.staticIndexSize",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -458,7 +456,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.staticBloomSize",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             }
           ],
@@ -536,9 +534,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.totalRequestCount",
-              "precision": "",
+              "precision": "default",
               "refId": "B",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -547,9 +545,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.readRequestCount",
-              "precision": "",
+              "precision": "default",
               "refId": "C",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -558,9 +556,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.writeRequestCount",
-              "precision": "",
+              "precision": "default",
               "refId": "D",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -569,9 +567,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.TotalCallTime_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "E",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -642,9 +640,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -653,9 +651,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.ScanNext_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "B",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -664,9 +662,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "C",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -675,9 +673,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "D",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -686,9 +684,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "E",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -697,9 +695,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "F",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -708,9 +706,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -789,7 +787,7 @@
               "errors": {},
               "hosts": "",
               "metric": "jvm.RegionServer.JvmMetrics.MemHeapMaxM",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -800,7 +798,7 @@
               "errors": {},
               "hosts": "",
               "metric": "jvm.RegionServer.JvmMetrics.MemHeapUsedM",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -811,7 +809,7 @@
               "errors": {},
               "hosts": "",
               "metric": "jvm.RegionServer.JvmMetrics.MemHeapCommittedM",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -822,7 +820,7 @@
               "errors": {},
               "hosts": "",
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapMaxM",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -833,7 +831,7 @@
               "errors": {},
               "hosts": "",
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapUsedM",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -843,7 +841,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapCommittedM",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             }
           ],
@@ -912,7 +910,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapMaxM",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -922,7 +920,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapUsedM",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -932,7 +930,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.MemNonHeapCommittedM",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             }
           ],
@@ -1010,7 +1008,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.memStoreSize",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1021,7 +1019,7 @@
               "errors": {},
               "hosts": "",
               "metric": "regionserver.Server.blockCacheSize",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1032,7 +1030,7 @@
               "errors": {},
               "hosts": "",
               "metric": "regionserver.Server.blockCacheFreeSize",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             }
           ],
@@ -1101,7 +1099,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheCount",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             }
           ],
@@ -1179,9 +1177,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheHitCount",
-              "precision": "",
+              "precision": "default",
               "refId": "D",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "sum",
@@ -1190,9 +1188,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheMissCount",
-              "precision": "",
+              "precision": "default",
               "refId": "E",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "sum",
@@ -1201,9 +1199,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheEvictionCount",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -1271,7 +1269,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheExpressHitPercent",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -1281,7 +1279,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.blockCacheCountHitPercent",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             }
           ],
@@ -1364,7 +1362,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1374,7 +1372,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1384,7 +1382,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -1394,7 +1392,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -1404,7 +1402,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -1414,7 +1412,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -1424,7 +1422,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Get_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -1435,9 +1433,9 @@
               "errors": {},
               "hosts": "",
               "metric": "regionserver.Server.Get_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -1510,7 +1508,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1520,7 +1518,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1530,7 +1528,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -1540,7 +1538,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -1550,7 +1548,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -1560,7 +1558,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -1570,7 +1568,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -1580,9 +1578,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Mutate_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -1664,7 +1662,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1674,7 +1672,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1684,7 +1682,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -1694,7 +1692,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -1704,7 +1702,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -1714,7 +1712,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -1724,7 +1722,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -1734,9 +1732,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Delete_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -1809,7 +1807,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1819,7 +1817,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1829,7 +1827,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -1839,7 +1837,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -1849,7 +1847,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -1859,7 +1857,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -1869,7 +1867,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -1879,9 +1877,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Increment_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -1963,7 +1961,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -1973,7 +1971,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -1983,7 +1981,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -1993,7 +1991,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -2003,7 +2001,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -2013,7 +2011,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -2023,7 +2021,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -2033,9 +2031,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Append_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -2108,7 +2106,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_mean",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -2118,7 +2116,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_median",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             },
             {
@@ -2128,7 +2126,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_75th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -2138,7 +2136,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_95th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -2148,7 +2146,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_99th_percentile",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -2158,7 +2156,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_max",
-              "precision": "",
+              "precision": "default",
               "refId": "G"
             },
             {
@@ -2168,7 +2166,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_min",
-              "precision": "",
+              "precision": "default",
               "refId": "F"
             },
             {
@@ -2178,9 +2176,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.Server.Replay_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "H",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,
@@ -2263,9 +2261,9 @@
               "errors": {},
               "hide": false,
               "metric": "master.Master.TotalCallTime_num_ops",
-              "precision": "",
+              "precision": "default",
               "refId": "C",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -2274,7 +2272,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.numActiveHandler",
-              "precision": "",
+              "precision": "default",
               "refId": "A"
             },
             {
@@ -2284,7 +2282,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.numOpenConnections",
-              "precision": "",
+              "precision": "default",
               "refId": "B"
             }
           ],
@@ -2358,7 +2356,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.numCallsInGeneralQueue",
-              "precision": "",
+              "precision": "default",
               "refId": "C"
             },
             {
@@ -2369,7 +2367,7 @@
               "errors": {},
               "hide": false,
               "metric": "regionserver.RegionServer.numCallsInPriorityQueue",
-              "precision": "",
+              "precision": "default",
               "refId": "D"
             },
             {
@@ -2379,7 +2377,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.numCallsInReplicationQueue",
-              "precision": "",
+              "precision": "default",
               "refId": "E"
             },
             {
@@ -2389,9 +2387,8 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.queueSize",
-              "precision": "",
-              "refId": "G",
-              "shouldComputeRate": false
+              "precision": "default",
+              "refId": "G"
             }
           ],
           "timeFrom": null,
@@ -2473,9 +2470,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.receivedBytes",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true
+              "transform": "rate"
             },
             {
               "aggregator": "avg",
@@ -2484,9 +2481,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.sentBytes",
-              "precision": "",
+              "precision": "default",
               "refId": "B",
-              "shouldComputeRate": true
+              "transform": "rate"
             }
           ],
           "timeFrom": null,

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d554f8c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
index b91b4b7..705f73c 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/grafana-dashboards/grafana-hbase-misc.json
@@ -87,7 +87,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.AssignmentManger.ritCount",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -156,7 +156,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.AssignmentManger.ritCountOverThreshold",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -225,7 +225,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.AssignmentManger.ritOldestAge",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -303,7 +303,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsRunnable",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -372,7 +372,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsRunnable",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -450,7 +450,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsBlocked",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -519,7 +519,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsBlocked",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -597,7 +597,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsWaiting",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -666,7 +666,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsWaiting",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -744,7 +744,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsTimedWaiting",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -813,7 +813,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsTimedWaiting",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -891,7 +891,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsNew",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -960,7 +960,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsNew",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -1038,7 +1038,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.Master.JvmMetrics.ThreadsTerminated",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -1107,7 +1107,7 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "jvm.RegionServer.JvmMetrics.ThreadsTerminated",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
               "templatedHost": ""
             }
@@ -1185,9 +1185,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.authenticationSuccesses",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],
@@ -1255,9 +1255,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.authenticationFailures",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],
@@ -1334,9 +1334,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.authorizationSuccesses",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],
@@ -1404,9 +1404,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.authorizationFailures",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],
@@ -1483,9 +1483,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "master.Master.exceptions",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],
@@ -1553,9 +1553,9 @@
               "downsampleAggregator": "avg",
               "errors": {},
               "metric": "regionserver.RegionServer.exceptions",
-              "precision": "",
+              "precision": "default",
               "refId": "A",
-              "shouldComputeRate": true,
+              "transform": "rate",
               "templatedHost": ""
             }
           ],