Repository: ambari Updated Branches: refs/heads/branch-2.2 238a7698d -> 20aaff5fa
AMBARI-14962 Auto configure AMS UI to use AMS Datasource - Commit 3 (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20aaff5f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20aaff5f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20aaff5f Branch: refs/heads/branch-2.2 Commit: 20aaff5faf2468c8839fa54eb1f8603786b37e5b Parents: e42e05a Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Wed Feb 10 12:21:14 2016 -0800 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Wed Feb 10 12:21:21 2016 -0800 ---------------------------------------------------------------------- .../0.1.0/package/scripts/metrics_grafana_util.py | 6 ++++-- .../0.1.0/package/templates/metrics_grafana_datasource.json.j2 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20aaff5f/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 c4a91e1..5ab40b0 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 @@ -58,8 +58,9 @@ def create_ams_datasource(): Logger.info("Ambari Metrics Grafana datasource already present. Checking Metrics Collector URL") datasource_url = datasources_json[i]["url"] - if datasource_url == (params.metric_collector_host + ":" + params.metric_collector_port - + "/ws/v1/timeline/metrics") : + if datasource_url == (params.ams_grafana_protocol + "://" + + params.metric_collector_host + ":" + + params.metric_collector_port): Logger.info("Metrics Collector URL validation succeeded. Skipping datasource creation") GRAFANA_CONNECT_TRIES = 0 # No need to create datasource again @@ -84,6 +85,7 @@ def create_ams_datasource(): try: ams_datasource_json = Template('metrics_grafana_datasource.json.j2', ams_datasource_name=METRICS_GRAFANA_DATASOURCE_NAME, + ams_grafana_protocol=params.ams_grafana_protocol, ams_collector_host=params.metric_collector_host, ams_collector_port=params.metric_collector_port).get_content() http://git-wip-us.apache.org/repos/asf/ambari/blob/20aaff5f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 index 1b03a2d..a803da5 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metrics_grafana_datasource.json.j2 @@ -20,7 +20,7 @@ "name": "{{ams_datasource_name}}", "type": "ambarimetrics", "access": "proxy", - "url": "{{ams_collector_host}}:{{ams_collector_port}}/ws/v1/timeline/metrics", + "url": "{{ams_grafana_protocol}}://{{ams_collector_host}}:{{ams_collector_port}}", "password": "", "user": "", "database": "",