Updated Branches: refs/heads/trunk 13ac36e28 -> f8d0acb83
AMBARI-4183. Supplemental patch for HBase and Nagios fixes (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8d0acb8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8d0acb8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8d0acb8 Branch: refs/heads/trunk Commit: f8d0acb83b68c0a1bf6d72add7ce18179dd93e33 Parents: 13ac36e Author: Nate Cole <[email protected]> Authored: Fri Jan 3 10:06:35 2014 -0500 Committer: Nate Cole <[email protected]> Committed: Fri Jan 3 10:38:12 2014 -0500 ---------------------------------------------------------------------- .../HDP/1.3.4/services/HBASE/package/scripts/params.py | 5 ++++- .../NAGIOS/package/templates/hadoop-services.cfg.j2 | 11 ----------- .../HDP/2.0.8/services/HBASE/package/scripts/params.py | 5 ++++- .../NAGIOS/package/templates/hadoop-services.cfg.j2 | 11 ----------- 4 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f8d0acb8/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HBASE/package/scripts/params.py index ca5b171..95880cb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/HBASE/package/scripts/params.py @@ -51,7 +51,10 @@ tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir'] client_jaas_config_file = default('hbase_client_jaas_config_file', format("{conf_dir}/hbase_client_jaas.conf")) master_jaas_config_file = default('hbase_master_jaas_config_file', format("{conf_dir}/hbase_master_jaas.conf")) regionserver_jaas_config_file = default('hbase_regionserver_jaas_config_file', format("{conf_dir}/hbase_regionserver_jaas.conf")) -ganglia_server_host = default('ganglia_server_host', "") # is not passed when ganglia is not present + +ganglia_server_hosts = default('/clusterHostInfo/ganglia_server_host', []) # is not passed when ganglia is not present +ganglia_server_host = '' if len(ganglia_server_hosts) == 0 else ganglia_server_hosts[0] + rs_hosts = default('hbase_rs_hosts', config['clusterHostInfo']['slave_hosts']) #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves smoke_test_user = config['configurations']['global']['smokeuser'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f8d0acb8/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2 index 0d789d1..76c1a88 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2 @@ -130,17 +130,6 @@ define service { define service { hostgroup_name ganglia-server use hadoop-service - service_description GANGLIA::Ganglia Monitor process for Slaves - servicegroups GANGLIA - check_command check_tcp!{{ ganglia_collector_slaves_port }}!-w 1 -c 1 - normal_check_interval 0.25 - retry_check_interval 0.25 - max_check_attempts 4 -} - -define service { - hostgroup_name ganglia-server - use hadoop-service service_description GANGLIA::Ganglia Monitor process for NameNode servicegroups GANGLIA check_command check_tcp!{{ ganglia_collector_namenode_port }}!-w 1 -c 1 http://git-wip-us.apache.org/repos/asf/ambari/blob/f8d0acb8/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HBASE/package/scripts/params.py index 915afea..674b2d9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/HBASE/package/scripts/params.py @@ -51,7 +51,10 @@ tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir'] client_jaas_config_file = default('hbase_client_jaas_config_file', format("{conf_dir}/hbase_client_jaas.conf")) master_jaas_config_file = default('hbase_master_jaas_config_file', format("{conf_dir}/hbase_master_jaas.conf")) regionserver_jaas_config_file = default('hbase_regionserver_jaas_config_file', format("{conf_dir}/hbase_regionserver_jaas.conf")) -ganglia_server_host = default('ganglia_server_host', "") # is not passed when ganglia is not present + +ganglia_server_hosts = default('/clusterHostInfo/ganglia_server_host', []) # is not passed when ganglia is not present +ganglia_server_host = '' if len(ganglia_server_hosts) == 0 else ganglia_server_hosts[0] + rs_hosts = default('hbase_rs_hosts', config['clusterHostInfo']['slave_hosts']) #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves smoke_test_user = config['configurations']['global']['smokeuser'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f8d0acb8/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 index be14e57..5941c15 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 @@ -143,17 +143,6 @@ define service { define service { hostgroup_name ganglia-server use hadoop-service - service_description GANGLIA::Ganglia Monitor process for Slaves - servicegroups GANGLIA - check_command check_tcp!{{ ganglia_collector_slaves_port }}!-w 1 -c 1 - normal_check_interval 0.25 - retry_check_interval 0.25 - max_check_attempts 4 -} - -define service { - hostgroup_name ganglia-server - use hadoop-service service_description GANGLIA::Ganglia Monitor process for NameNode servicegroups GANGLIA check_command check_tcp!{{ ganglia_collector_namenode_port }}!-w 1 -c 1
