ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 2.2.2. Fix for upgrades issue. (swagle)
Date Tue, 22 Mar 2016 18:30:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 6f6d79e4a -> 895cf6899


AMBARI-15416. Grafana password is required field after upgrade from 2.2.0 to 2.2.2. Fix for
upgrades issue. (swagle)


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

Branch: refs/heads/branch-2.2
Commit: 895cf68997b45a97799cdc06f463b7cdd5088cf6
Parents: 6f6d79e
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Mar 22 11:07:09 2016 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Mar 22 11:07:09 2016 -0700

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.0.6/services/stack_advisor.py    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/895cf689/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index d33e081..61aa2ba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -664,7 +664,9 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
       if 'components' in service:
         for component in service['components']:
           if 'StackServiceComponents' in component:
-            if 'METRICS_GRAFANA' in component['StackServiceComponents']['component_name']:
+            # If Grafana is installed the hostnames would indicate its location
+            if 'METRICS_GRAFANA' in component['StackServiceComponents']['component_name']
and\
+              len(component['StackServiceComponents']['hostnames']) != 0:
               component_grafana_exists = True
               break
     pass


Mime
View raw message