Переглянути джерело

AMBARI-6014. HDFS alert hangs for a long time after enabling Maintenance mode (Jonathan Hurley via ncole)

Nate Cole 11 роки тому
батько
коміт
e81706fc05

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh

@@ -79,7 +79,7 @@ if [ ! -f /var/nagios/ignore.dat ]; then
   echo "$wrapper_output"
   exit $wrapper_result
 else
-  count=`grep $NAGIOS_HOSTNAME /var/nagios/ignore.dat | grep $real_service_var | grep $real_comp_var | wc -l`
+  count=$(grep $NAGIOS_HOSTNAME /var/nagios/ignore.dat | grep $real_service_var | grep $real_comp_var | wc -l)
   if [ "$count" -ne "0" ]; then
     echo "$wrapper_output\nAMBARIPASSIVE=${wrapper_result}" | sed 's/^[ \t]*//g'
     exit 0

+ 2 - 1
ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2

@@ -1283,7 +1283,8 @@ use_large_installation_tweaks=1
 # Values: 1 - Enable environment variable macros (default)
 #         0 - Disable environment variable macros
 
-enable_environment_macros=0
+# NAGIOS_* macros are required for Ambari Maintenance Mode (check_wrapper.sh)
+enable_environment_macros=1
 
 
 

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh

@@ -82,7 +82,7 @@ if [ ! -f /var/nagios/ignore.dat ]; then
   echo "$wrapper_output"
   exit $wrapper_result
 else
-  count=`grep $NAGIOS_HOSTNAME /var/nagios/ignore.dat | grep $real_service_var | grep $real_comp_var | wc -l`
+  count=$(grep $NAGIOS_HOSTNAME /var/nagios/ignore.dat | grep $real_service_var | grep $real_comp_var | wc -l)
   if [ "$count" -ne "0" ]; then
     echo "$wrapper_output\nAMBARIPASSIVE=${wrapper_result}" | sed 's/^[ \t]*//g'
     exit 0

+ 2 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2

@@ -1283,7 +1283,8 @@ use_large_installation_tweaks=1
 # Values: 1 - Enable environment variable macros (default)
 #         0 - Disable environment variable macros
 
-enable_environment_macros=0
+# NAGIOS_* macros are required for Ambari Maintenance Mode (check_wrapper.sh)
+enable_environment_macros=1