AMBARI-4313. HistoryServer alerts on 1.3.4 stack (aonishuk)

ambari-server/src/main/resources/stacks/HDP/1.3.4/services/NAGIOS/package/scripts/params.py

@@ -59,7 +59,7 @@ snamenode_port = get_port_from_url(config['configurations']['hdfs-site']["dfs.se
 hbase_master_rpc_port = "60000"
 rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'])
 nm_port = "8042"
-hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.jobhistory.webapp.address'])
+hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.history.server.http.address'])
 journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
 datanode_port = config['configurations']['hdfs-site']['ambari.dfs.datanode.http.port']
 flume_port = "4159"

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

@@ -502,17 +502,6 @@ define service {
 }
 {%  endif %}
 
-define service {
-        hostgroup_name          historyserver2
-        use                     hadoop-service
-        service_description     JOBHISTORY::HistoryServer RPC latency
-        servicegroups           MAPREDUCE
-        check_command           check_rpcq_latency!JobHistoryServer!{{ hs_port }}!3000!5000!{{ str(hadoop_ssl_enabled).lower() }}!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}!{{ str(security_enabled).lower() }}
-        normal_check_interval   5
-        retry_check_interval    1 
-        max_check_attempts      5
-}
-
 define service {
         hostgroup_name          historyserver2
         use                     hadoop-service