Repository: ambari Updated Branches: refs/heads/branch-2.2 8f481496e -> 2b1e7b75d
AMBARI-15444. HOST Graph Legends - 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/2b1e7b75 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b1e7b75 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b1e7b75 Branch: refs/heads/branch-2.2 Commit: 2b1e7b75d1970f26b0a033cdfac8b53b457b83ff Parents: 8f48149 Author: Yusaku Sako <yus...@hortonworks.com> Authored: Wed Mar 16 17:06:25 2016 -0700 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Wed Mar 16 17:07:07 2016 -0700 ---------------------------------------------------------------------- .../ambari-metrics/datasource.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2b1e7b75/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 fa83b47..f62a58f 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js @@ -107,17 +107,10 @@ define([ // Added hostname to legend for templated dashboards. var hostLegend = res.metrics[0].hostname ? ' on ' + res.metrics[0].hostname : ''; var timeSeries = {}; - if (target.hosts === undefined || target.hosts.trim() === "") { - timeSeries = { - target: alias + hostLegend, - datapoints: [] - }; - } else { - timeSeries = { - target: alias + ' on ' + target.hosts, - datapoints: [] - }; - } + timeSeries = { + target: alias + hostLegend, + datapoints: [] + }; for (var k in metricData){ if (metricData.hasOwnProperty(k)) { timeSeries.datapoints.push([metricData[k], (k - k % 1000)]);
