metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject incubator-metron git commit: METRON-564 Mpack shows UI error when changing configuration closes apache/incubator-metron#355
Date Fri, 11 Nov 2016 15:16:22 GMT
Repository: incubator-metron
Updated Branches:
  refs/heads/master d85494cec -> 2e2bea430


METRON-564 Mpack shows UI error when changing configuration closes apache/incubator-metron#355


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/2e2bea43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/2e2bea43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/2e2bea43

Branch: refs/heads/master
Commit: 2e2bea430dfbd6a1455c1893713ea72447d5476a
Parents: d85494c
Author: justinleet <justinjleet@gmail.com>
Authored: Fri Nov 11 10:15:33 2016 -0500
Committer: justinjleet <justinjleet@gmail.com>
Committed: Fri Nov 11 10:15:33 2016 -0500

----------------------------------------------------------------------
 .../METRON/0.2.1BETA/service_advisor.py         | 27 +++++---------------
 1 file changed, 6 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/2e2bea43/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/0.2.1BETA/service_advisor.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/0.2.1BETA/service_advisor.py
b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/0.2.1BETA/service_advisor.py
index 9ad2836..c481ce2 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/0.2.1BETA/service_advisor.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/0.2.1BETA/service_advisor.py
@@ -36,19 +36,6 @@ except Exception as e:
 
 class METRON021BETAServiceAdvisor(service_advisor.ServiceAdvisor):
 
-    def getServiceConfigurationRecommendations(self, configurations, clusterData, services,
hosts):
-
-        #Suggest Storm Rest URL
-        stormUIServerHost = self.getComponentHostNames(services, "STORM", "STORM_UI_SERVER")[0]
-        stormUIServerPort = services["configurations"]["storm-site"]["properties"]["ui.port"]
-        stormUIServerURL = stormUIServerHost + ":" + stormUIServerPort
-        putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
-        putMetronEnvProperty("storm_rest_addr",stormUIServerURL)
-
-        #Suggest mysql server hostname
-        mySQLServerHost = self.getComponentHostNames(services, "METRON", "METRON_ENRICHMENT_MYSQL_SERVER")[0]
-        putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
-        putMetronEnvProperty("mysql_host",mySQLServerHost)
     def getServiceComponentLayoutValidations(self, services, hosts):
 
         componentsListList = [service["components"] for service in services["services"]]
@@ -97,20 +84,18 @@ class METRON021BETAServiceAdvisor(service_advisor.ServiceAdvisor):
         return items
 
     def getServiceConfigurationRecommendations(self, configurations, clusterData, services,
hosts):
-
-        #Suggest Storm Rest URL
-        stormUIServerHost = self.getComponentHostNames(services, "STORM", "STORM_UI_SERVER")[0]
-        stormUIServerPort = services["configurations"]["storm-site"]["properties"]["ui.port"]
-        stormUIServerURL = stormUIServerHost + ":" + stormUIServerPort
-        putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
-        putMetronEnvProperty("storm_rest_addr",stormUIServerURL)
-
         #Suggest mysql server hostname
         mySQLServerHost = self.getComponentHostNames(services, "METRON", "METRON_ENRICHMENT_MYSQL_SERVER")[0]
         putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
         putMetronEnvProperty("mysql_host",mySQLServerHost)
 
+        #Suggest Storm Rest URL
         if "storm-site" in services["configurations"]:
+            stormUIServerHost = self.getComponentHostNames(services, "STORM", "STORM_UI_SERVER")[0]
+            stormUIServerPort = services["configurations"]["storm-site"]["properties"]["ui.port"]
+            stormUIServerURL = stormUIServerHost + ":" + stormUIServerPort
+            putMetronEnvProperty = self.putProperty(configurations, "metron-env", services)
+            putMetronEnvProperty("storm_rest_addr",stormUIServerURL)
 
             storm_site = services["configurations"]["storm-site"]["properties"]
             putStormSiteProperty = self.putProperty(configurations, "storm-site", services)


Mime
View raw message