METRON-1348 Metron Service Checks Use Wrong Hostname (nickwallen) closes

apache#864
iraghumitra · Feb 17, 2018 · 4c9bd6e · 4c9bd6e
1 parent 1de68bd
commit 4c9bd6e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/...k/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py b/...k/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
@@ -66,7 +66,7 @@ def status_alerts_ui(self, env):
         """
         Logger.info('Status check the Alerts UI')
         metron_service.check_http(
-          self.__params.hostname,
+          self.__params.metron_alerts_ui_host,
           self.__params.metron_alerts_ui_port,
           self.__params.metron_user)
 
@@ -77,7 +77,7 @@ def service_check(self, env):
         """
         Logger.info('Checking connectivity to Alerts UI')
         metron_service.check_http(
-          self.__params.hostname,
+          self.__params.metron_alerts_ui_host,
           self.__params.metron_alerts_ui_port,
           self.__params.metron_user)
 

diff --git a/...c/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py b/...c/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
@@ -68,7 +68,7 @@ def status_management_ui(self, env):
         """
         Logger.info('Status check the Management UI')
         metron_service.check_http(
-          self.__params.hostname,
+          self.__params.metron_management_ui_host,
           self.__params.metron_management_ui_port,
           self.__params.metron_user)
 
@@ -79,7 +79,7 @@ def service_check(self, env):
         """
         Logger.info('Checking connectivity to Management UI')
         metron_service.check_http(
-          self.__params.hostname,
+          self.__params.metron_management_ui_host,
           self.__params.metron_management_ui_port,
           self.__params.metron_user)
 

diff --git a/.../src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/.../src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
@@ -49,8 +49,11 @@
 metron_group = config['configurations']['metron-env']['metron_group']
 metron_log_dir = config['configurations']['metron-env']['metron_log_dir']
 metron_pid_dir = config['configurations']['metron-env']['metron_pid_dir']
+
 metron_rest_port = status_params.metron_rest_port
+metron_management_ui_host = status_params.metron_management_ui_host
 metron_management_ui_port = status_params.metron_management_ui_port
+metron_alerts_ui_host = status_params.metron_alerts_ui_host
 metron_alerts_ui_port = status_params.metron_alerts_ui_port
 metron_jvm_flags = config['configurations']['metron-rest-env']['metron_jvm_flags']
 metron_spring_profiles_active = config['configurations']['metron-rest-env']['metron_spring_profiles_active']
@@ -237,7 +240,7 @@
     nimbus_seeds = config['configurations']['storm-site']['nimbus.seeds']
 
 # Management UI
-metron_rest_host = default("/clusterHostInfo/metron_rest_hosts", ['localhost'])[0]
+metron_rest_host = default("/clusterHostInfo/metron_rest_hosts", [hostname])[0]
 
 # REST
 metron_rest_pid_dir = config['configurations']['metron-rest-env']['metron_rest_pid_dir']

diff --git a/...src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py b/...src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
@@ -25,6 +25,7 @@
 
 config = Script.get_config()
 
+hostname = config['hostname']
 metron_user = config['configurations']['metron-env']['metron_user']
 metron_home = config['configurations']['metron-env']['metron_home']
 metron_zookeeper_config_dir = config['configurations']['metron-env']['metron_zookeeper_config_dir']
@@ -80,10 +81,14 @@
 # REST
 metron_rest_port = config['configurations']['metron-rest-env']['metron_rest_port']
 
-# UI
-metron_management_ui_port = config['configurations']['metron-management-ui-env']['metron_management_ui_port']
+# Alerts UI
+metron_alerts_ui_host = default("/clusterHostInfo/metron_alerts_ui_hosts", [hostname])[0]
 metron_alerts_ui_port = config['configurations']['metron-alerts-ui-env']['metron_alerts_ui_port']
 
+# Management UI
+metron_management_ui_host = default("/clusterHostInfo/metron_management_ui_hosts", [hostname])[0]
+metron_management_ui_port = config['configurations']['metron-management-ui-env']['metron_management_ui_port']
+
 # Storm
 storm_rest_addr = config['configurations']['metron-env']['storm_rest_addr']
 
@@ -93,7 +98,7 @@
 # Security
 stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
 stack_version_formatted = format_stack_version(stack_version_unformatted)
-hostname = config['hostname']
+
 security_enabled = config['configurations']['cluster-env']['security_enabled']
 kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
 tmp_dir = Script.get_tmp_dir()

diff --git a/...-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py b/...-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
@@ -175,7 +175,7 @@ def status_rest_application(self, env):
         """
         Logger.info('Status check the REST application')
         metron_service.check_http(
-            self.__params.hostname,
+            self.__params.metron_rest_host,
             self.__params.metron_rest_port,
             self.__params.metron_user)
 
@@ -186,7 +186,7 @@ def service_check(self, env):
         """
         Logger.info('Checking connectivity to REST application')
         metron_service.check_http(
-            self.__params.hostname,
+            self.__params.metron_rest_host,
             self.__params.metron_rest_port,
             self.__params.metron_user)