ambari git commit: AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)

2016-03-19 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 9df79e5ff -> 0244d233a


AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)


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

Branch: refs/heads/branch-2.2
Commit: 0244d233a6999e7ec45a60218c792546229cd468
Parents: 9df79e5
Author: Siddharth Wagle 
Authored: Thu Mar 17 12:22:12 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 12:22:12 2016 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0244d233/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
index 13a2c26..012bdcb 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
@@ -284,7 +284,8 @@ def create_ams_dashboards():
   dashboard_def['id'] = None
 # Set correct tags
 if 'tags' in dashboard_def:
-  dashboard_def['tags'].append('builtin', version)
+  dashboard_def['tags'].append('builtin')
+  dashboard_def['tags'].append(version)
 else:
   dashboard_def['tags'] = [ 'builtin', version ]

ambari git commit: AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)

2016-03-18 Thread swagle 
Repository: ambari
Updated Branches:
  refs/heads/trunk 95798ad96 -> 33eeec800


AMBARI-15472. Appending Grafana dashboard tags. (Prajwal Rao via swagle)


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

Branch: refs/heads/trunk
Commit: 33eeec80051601b7931a186cff1ee405fc64e179
Parents: 95798ad
Author: Siddharth Wagle 
Authored: Thu Mar 17 12:21:34 2016 -0700
Committer: Siddharth Wagle 
Committed: Thu Mar 17 12:21:40 2016 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33eeec80/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
index 13a2c26..012bdcb 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py
@@ -284,7 +284,8 @@ def create_ams_dashboards():
   dashboard_def['id'] = None
 # Set correct tags
 if 'tags' in dashboard_def:
-  dashboard_def['tags'].append('builtin', version)
+  dashboard_def['tags'].append('builtin')
+  dashboard_def['tags'].append(version)
 else:
   dashboard_def['tags'] = [ 'builtin', version ]