Repository: ambari Updated Branches: refs/heads/trunk 39320fd8a -> a763ace5e
AMBARI-16105. Add "diff" capability in Grafana. (prajwal rao via jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a763ace5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a763ace5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a763ace5 Branch: refs/heads/trunk Commit: a763ace5ef86bce33ef4539f47c3d0ec22d16d87 Parents: 39320fd Author: Jaimin Jetly <[email protected]> Authored: Tue Apr 26 11:53:04 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Apr 26 11:53:04 2016 -0700 ---------------------------------------------------------------------- .../ambari-metrics/datasource.js | 16 ++++++++-------- .../ambari-metrics/queryCtrl.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a763ace5/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 9258821..fab755b 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js @@ -150,8 +150,8 @@ define([ 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 + + var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; + return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform + metricAggregator + "&hostname=" + target.hosts + '&appId=' + target.app + '&startTime=' + from + '&endTime=' + to + precision).then( getMetricsData(target) @@ -171,8 +171,8 @@ define([ 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 + var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; + return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform + metricAggregator + '&hostname=' + tHost + '&appId=' + target.app + '&startTime=' + from + '&endTime=' + to + precision).then( getMetricsData(target) @@ -183,9 +183,9 @@ define([ 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 metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; var templatedComponent = (_.isEmpty(tComponent)) ? target.app : tComponent; - return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + rate + return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.metric + metricTransform + metricAggregator + '&hostname=' + target.templatedHost + '&appId=' + templatedComponent + '&startTime=' + from + '&endTime=' + to + precision).then( allHostMetricsData(target) @@ -195,8 +195,8 @@ define([ 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 + var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; + return backendSrv.get(self.url + '/ws/v1/timeline/metrics?metricNames=' + target.queue + metricTransform + metricAggregator + '&appId=resourcemanager&startTime=' + from + '&endTime=' + to + precision).then( getMetricsData(target) http://git-wip-us.apache.org/repos/asf/ambari/blob/a763ace5/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 1e943e4..2eb3613 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/queryCtrl.js @@ -30,7 +30,7 @@ define([ $scope.target.errors = validateTarget($scope.target); $scope.aggregators = ['none','avg', 'sum', 'min', 'max']; $scope.precisions = ['default','seconds', 'minutes', 'hours', 'days']; - $scope.transforms = ['none','rate']; + $scope.transforms = ['none','diff','rate']; if (!$scope.target.aggregator) { $scope.target.aggregator = 'avg';
