ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vivekratna...@apache.org
Subject ambari git commit: AMBARI-21290. Grafana Yarn Queue dashboard is not working (JaySenSharma via vsubramanian)
Date Thu, 22 Jun 2017 20:00:25 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f6bd2b907 -> 4cbd9d7d0


AMBARI-21290. Grafana Yarn Queue dashboard is not working (JaySenSharma via vsubramanian)


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

Branch: refs/heads/branch-2.5
Commit: 4cbd9d7d012458cd742a189e76b89fca58781a8d
Parents: f6bd2b9
Author: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
Authored: Thu Jun 22 13:00:14 2017 -0700
Committer: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
Committed: Thu Jun 22 13:00:14 2017 -0700

----------------------------------------------------------------------
 .../ambari-metrics-grafana/ambari-metrics/datasource.js         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4cbd9d7d/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 72e64e2..b4a339e 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -275,13 +275,14 @@ define([
             );
           };
           var getYarnAppIdData = function(target) {
-            var precision = target.precision === 'default' || typeof target.precision ==
'undefined'  ? '' : '&precision=' 
+            var precision = target.precision === 'default' || typeof target.precision ==
'undefined'  ? '' : '&precision='
             + target.precision;
+            var instanceId = typeof target.templatedCluster == 'undefined'  ? '' : '&instanceId='
+ target.templatedCluster;
             var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator;
             var metricTransform = !target.transform || target.transform === "none" ? '' :
'._' + target.transform;
             var seriesAggregator = !target.seriesAggregator || target.seriesAggregator ===
"none" ? '' : '&seriesAggregateFunction=' + target.seriesAggregator;
             return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.queue
+ metricTransform
-              + metricAggregator + '&appId=resourcemanager&startTime=' + + '&instanceId='
+ target.templatedCluster + from +
+              + metricAggregator + '&appId=resourcemanager' + instanceId + '&startTime='
+ from +
               '&endTime=' + to + precision + seriesAggregator }).then(
               getMetricsData(target)
             );


Mime
View raw message