Author: swagle
Date: Mon Apr 15 22:14:17 2013
New Revision: 1468252
URL: http://svn.apache.org/r1468252
Log:
AMBARI-1942. Nagios server failed to start. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1468252&r1=1468251&r2=1468252&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Apr 15 22:14:17 2013
@@ -723,6 +723,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1942. Nagios server failed to start. (swagle)
+
AMBARI-1938. Update mock data for stack HDP-1.3.0. (jaimin)
AMBARI-1934. Security vulnerability with Ganglia and Nagios. (smohanty)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb?rev=1468252&r1=1468251&r2=1468252&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
Mon Apr 15 22:14:17 2013
@@ -484,6 +484,7 @@ define service {
}
<%end-%>
+<%if scope.function_hdp_nagios_members_exist('hue-server')-%>
define service {
hostgroup_name hue-server
use hadoop-service
@@ -494,3 +495,5 @@ define service {
retry_check_interval 0.5
max_check_attempts 3
}
+<%end-%>
+
