ambari git commit: AMBARI-17416. [Grafana] show 'alias' when there's no datapoint available. (Prajwal Rao via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4331b29a7 -> 5711f39c1


AMBARI-17416. [Grafana] show 'alias' when there's no datapoint available. 
(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/5711f39c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5711f39c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5711f39c

Branch: refs/heads/trunk
Commit: 5711f39c1a677647655c576101f9c33bac7732e2
Parents: 4331b29
Author: Yusaku Sako <yus...@hortonworks.com>
Authored: Thu Jul 7 12:39:45 2016 -0700
Committer: Yusaku Sako <yus...@hortonworks.com>
Committed: Thu Jul 7 12:39:45 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/5711f39c/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 66043c5..8546e67 100644
--- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
+++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js
@@ -85,9 +85,10 @@ define([
         AmbariMetricsDatasource.prototype.query = function (options) {
 
           var emptyData = function (metric) {
+            var legend = metric.alias ? metric.alias : metric.metric;
             return {
               data: {
-                target: metric,
+                target: legend,
                 datapoints: []
               }
             };
@@ -102,7 +103,7 @@ define([
             return function (res) {
               console.log('processing metric ' + target.metric);
               if (!res.metrics[0] || target.hide) {
-                return $q.when(emptyData(target.metric));
+                return $q.when(emptyData(target));
               }
               var series = [];
               var metricData = res.metrics[0].metrics;
@@ -130,7 +131,7 @@ define([
             return function (res) {
               console.log('processing metric ' + target.metric);
               if (!res.metrics[0] || target.hide) {
-                return $q.when(emptyData(target.metric));
+                return $q.when(emptyData(target));
               }
               var series = [];
               var timeSeries = {};