Updated Branches: refs/heads/trunk 053882789 -> d5a04c730
AMBARI-2865. Nagios server fails to start with invalid configuration error. (smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/d5a04c73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/d5a04c73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/d5a04c73 Branch: refs/heads/trunk Commit: d5a04c73074914b78217263ae1910ddbd3a5db0f Parents: 0538827 Author: Sumit Mohanty <[email protected]> Authored: Fri Aug 9 23:35:07 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Aug 9 23:35:07 2013 -0700 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-nagios/files/check_webui.sh | 4 ++-- .../main/puppet/modules/hdp-nagios/manifests/params.pp | 2 +- .../hdp-nagios/templates/hadoop-servicegroups.cfg.erb | 2 +- .../hdp-nagios/templates/hadoop-services.cfg.erb | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d5a04c73/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_webui.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_webui.sh b/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_webui.sh index 1cc8a86..57381e4 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_webui.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/files/check_webui.sh @@ -64,7 +64,7 @@ hbase) exit 1; fi ;; -resorcemanager) +resourcemanager) rmweburl="http://$host:$port/cluster"; if [[ `checkurl "$rmweburl"` -ne 0 ]]; then echo "WARNING: ResourceManager web UI not accessible : $rmweburl"; @@ -78,7 +78,7 @@ historyserver2) exit 1; fi ;; -*) echo "UNKNOWN: Invalid service name [$service], valid options [jobtracker|jobhistory|hbase|namenode|resorcemanager|historyserver2]" +*) echo "UNKNOWN: Invalid service name [$service], valid options [jobtracker|jobhistory|hbase|namenode|resourcemanager|historyserver2]" exit 3 ;; esac http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d5a04c73/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp index b9dbf37..29a3ff8 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp @@ -84,7 +84,7 @@ class hdp-nagios::params() inherits hdp::params oozie-server => {host_member_info => 'oozie_server'}, webhcat-server => {host_member_info => 'webhcat_server_host'}, hue-server => {host_member_info => 'hue_server_host'}, - resorcemanager => {host_member_info => 'rm_host'}, + resourcemanager => {host_member_info => 'rm_host'}, nodemanagers => {host_member_info => 'nm_hosts'}, historyserver2 => {host_member_info => 'hs_host'} } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d5a04c73/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-servicegroups.cfg.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-servicegroups.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-servicegroups.cfg.erb index 6629e3f..eb382bc 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-servicegroups.cfg.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-servicegroups.cfg.erb @@ -13,7 +13,7 @@ define servicegroup { alias MAPREDUCE Checks } <% end -%> -<%if scope.function_hdp_nagios_members_exist('resorcemanager') || +<%if scope.function_hdp_nagios_members_exist('resourcemanager') || scope.function_hdp_nagios_members_exist('nodemanagers') -%> define servicegroup { servicegroup_name YARN http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/d5a04c73/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb index 401c79f..3a8e3cb 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb @@ -180,7 +180,7 @@ define service { } <%end-%> -<%if scope.function_hdp_nagios_members_exist('resorcemanager')-%> +<%if scope.function_hdp_nagios_members_exist('resourcemanager')-%> define service { hostgroup_name ganglia-server use hadoop-service @@ -400,21 +400,21 @@ define service { <%end-%> -<%if scope.function_hdp_nagios_members_exist('resorcemanager')-%> +<%if scope.function_hdp_nagios_members_exist('resourcemanager')-%> # YARN::RESOURCEMANAGER Checks define service { - hostgroup_name resorcemanager + hostgroup_name resourcemanager use hadoop-service service_description RESOURCEMANAGER::Resource Manager Web UI down servicegroups YARN - check_command check_webui!resorcemanager!<%=scope.function_hdp_template_var("::hdp::rm_port")%> + check_command check_webui!resourcemanager!<%=scope.function_hdp_template_var("::hdp::rm_port")%> normal_check_interval 1 retry_check_interval 1 max_check_attempts 3 } define service { - hostgroup_name resorcemanager + hostgroup_name resourcemanager use hadoop-service service_description RESOURCEMANAGER::Resource Manager CPU utilization servicegroups YARN @@ -425,7 +425,7 @@ define service { } define service { - hostgroup_name resorcemanager + hostgroup_name resourcemanager use hadoop-service service_description RESOURCEMANAGER::Resource Manager RPC latency servicegroups YARN
