AMBARI-19112 : Grafana start failing at create datasource step (and a minor AbstractUpgradeCatalog log line change).
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/502d4447 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/502d4447 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/502d4447 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 502d4447fa7f78421e606cff83661b41c4923a61 Parents: 9b46fd2 Author: Aravindan Vijayan <[email protected]> Authored: Tue Dec 6 12:07:38 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Dec 6 12:07:48 2016 -0800 ---------------------------------------------------------------------- .../apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 4 ++-- .../0.1.0/package/scripts/metrics_grafana_util.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/502d4447/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index 7f91a68..4f6cbb7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -585,8 +585,8 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { } if (!Maps.difference(oldConfigProperties, mergedProperties).areEqual()) { - LOG.info("Applying configuration with tag '{}' to " + - "cluster '{}'", newTag, cluster.getClusterName()); + LOG.info("Applying configuration with tag '{}' and configType '{}' to " + + "cluster '{}'", newTag, configType, cluster.getClusterName()); Map<String, Map<String, String>> propertiesAttributes = null; if (oldConfig != null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/502d4447/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 6030fc4..41bd2b4 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 @@ -34,8 +34,8 @@ import ambari_simplejson as json import network import os -GRAFANA_CONNECT_TRIES = 5 -GRAFANA_CONNECT_TIMEOUT = 10 +GRAFANA_CONNECT_TRIES = 15 +GRAFANA_CONNECT_TIMEOUT = 20 GRAFANA_SEARCH_BUILTIN_DASHBOARDS = "/api/search?tag=builtin" GRAFANA_DATASOURCE_URL = "/api/datasources" GRAFANA_DASHBOARDS_URL = "/api/dashboards/db" @@ -202,6 +202,7 @@ def do_ams_collector_post(metric_collector_host, params): post_metrics_to_collector(ams_metrics_post_url, metric_collector_host, params.metric_collector_port, params.metric_collector_https_enabled, metric_json, headers, ca_certs) + def create_ams_datasource(): import params server = Server(protocol = params.ams_grafana_protocol.strip(),
