Repository: ambari Updated Branches: refs/heads/trunk 6305fb6ab -> 845eb86c2
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/845eb86c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/845eb86c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/845eb86c Branch: refs/heads/trunk Commit: 845eb86c24a5b4a7d4735d50715522bd8795eff4 Parents: 6305fb6 Author: Vivek Ratnavel Subramanian <[email protected]> Authored: Thu Jun 22 12:57:27 2017 -0700 Committer: Vivek Ratnavel Subramanian <[email protected]> Committed: Thu Jun 22 12:57:27 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/845eb86c/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) );
