AMBARI-4183. Supplemental patch for HBase and Nagios fixes (ncole)

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']

ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -127,17 +127,6 @@ define service {
         max_check_attempts      4
 }
 
-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

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']

ambari-server/src/main/resources/stacks/HDP/2.0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -140,17 +140,6 @@ define service {
         max_check_attempts      4
 }
 
-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