Repository: ambari Updated Branches: refs/heads/trunk 1ea7498d7 -> e81706fc0
AMBARI-6014. HDFS alert hangs for a long time after enabling Maintenance mode (Jonathan Hurley via ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e81706fc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e81706fc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e81706fc Branch: refs/heads/trunk Commit: e81706fc05d5f065bba5ee64dea8443af1aa7924 Parents: 1ea7498 Author: Nate Cole <[email protected]> Authored: Tue Jun 3 16:48:33 2014 -0400 Committer: Nate Cole <[email protected]> Committed: Tue Jun 3 16:48:33 2014 -0400 ---------------------------------------------------------------------- .../HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh | 2 +- .../HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2 | 3 ++- .../HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh | 2 +- .../HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2 | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e81706fc/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh index 600cc5c..2a20fb7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/e81706fc/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2 index c778b2e..05d94b5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/nagios.cfg.j2 +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/e81706fc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh index d198014..68e8470 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh +++ b/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 http://git-wip-us.apache.org/repos/asf/ambari/blob/e81706fc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2 index c778b2e..05d94b5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.cfg.j2 +++ b/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
