You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2017/12/21 14:06:18 UTC
metron git commit: METRON-1348 Metron Service Checks Use Wrong
Hostname (nickwallen) closes apache/metron#864
Repository: metron
Updated Branches:
refs/heads/master 3f0b1b7b4 -> 196da12c4
METRON-1348 Metron Service Checks Use Wrong Hostname (nickwallen) closes apache/metron#864
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/196da12c
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/196da12c
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/196da12c
Branch: refs/heads/master
Commit: 196da12c43337d019a52b99bf6178fbda45f886d
Parents: 3f0b1b7
Author: nickwallen <ni...@nickallen.org>
Authored: Thu Dec 21 09:04:49 2017 -0500
Committer: nickallen <ni...@apache.org>
Committed: Thu Dec 21 09:04:49 2017 -0500
----------------------------------------------------------------------
.../METRON/CURRENT/package/scripts/alerts_ui_commands.py | 4 ++--
.../CURRENT/package/scripts/management_ui_commands.py | 4 ++--
.../CURRENT/package/scripts/params/params_linux.py | 5 ++++-
.../CURRENT/package/scripts/params/status_params.py | 11 ++++++++---
.../METRON/CURRENT/package/scripts/rest_commands.py | 4 ++--
5 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/196da12c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
index 92ddcf9..41cd375 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/alerts_ui_commands.py
@@ -66,7 +66,7 @@ class AlertsUICommands:
"""
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 @@ class AlertsUICommands:
"""
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)
http://git-wip-us.apache.org/repos/asf/metron/blob/196da12c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
index 0f9194f..1f16fa4 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_commands.py
@@ -68,7 +68,7 @@ class ManagementUICommands:
"""
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 @@ class ManagementUICommands:
"""
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)
http://git-wip-us.apache.org/repos/asf/metron/blob/196da12c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
index 32d8889..de53e38 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
@@ -49,8 +49,11 @@ metron_user = status_params.metron_user
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 @@ if security_enabled:
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']
http://git-wip-us.apache.org/repos/asf/metron/blob/196da12c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
index a9a37d3..4351814 100644
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/status_params.py
@@ -25,6 +25,7 @@ from resource_management.libraries.functions.version import format_stack_version
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 @@ elasticsearch_template_installed_flag_file = metron_zookeeper_config_path + '/..
# 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 @@ zeppelin_server_url = config['configurations']['metron-env']['zeppelin_server_ur
# 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()
http://git-wip-us.apache.org/repos/asf/metron/blob/196da12c/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
index 0828e3a..4f717bb 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_commands.py
@@ -175,7 +175,7 @@ class RestCommands:
"""
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 @@ class RestCommands:
"""
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)