From 1a9d3e25e46db64d66a6ac26b20f831608794da8 Mon Sep 17 00:00:00 2001 From: Ramesh Nachimuthu Date: Fri, 14 Nov 2014 09:41:41 +0530 Subject: Revert "packaging: install temp_node1.cfg only for the first time" This reverts commit 11f96adbb1f8bff8cf7b385da10200a5627d980a. Bug-Url:https://bugzilla.redhat.com/1162446 Bug-Url:https://bugzilla.redhat.com/1162443 Change-Id: I831bb0c84721a0c3181a2d58421520a6fb788621 Signed-off-by: Ramesh Nachimuthu Reviewed-on: http://review.gluster.org/9122 Reviewed-by: Kanagaraj M Reviewed-by: Sahina Bose --- config/Makefile.am | 1 + config/temp_node1.cfg | 20 ++++++++++++++++++++ nagios-server-addons.spec.in | 27 --------------------------- 3 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 config/temp_node1.cfg diff --git a/config/Makefile.am b/config/Makefile.am index 5c34e56..9de557b 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -12,6 +12,7 @@ glusternagiosconf_DATA = \ glusternagiosdefaultconfdir = $(sysconfdir)/nagios/gluster/default glusternagiosdefaultconf_DATA = \ glustercluster.cfg.sample \ + temp_node1.cfg \ $(NULL) glusternagiosmibsdir = /usr/share/snmp/mibs diff --git a/config/temp_node1.cfg b/config/temp_node1.cfg new file mode 100644 index 0000000..e049885 --- /dev/null +++ b/config/temp_node1.cfg @@ -0,0 +1,20 @@ +##################################################################### +# Configuration for dummy host temp_node1 with service check_ping # +# This dummy host is added to avoid nagios from erroring out before # +# auto-discovery script is run, This file will be renamed by auto- # +# discovery script to remove this configuration. # +##################################################################### + +define host{ + use linux-server + host_name temp_node1 + alias localhost + address 127.0.0.1 +} + +define service{ + use local-service + host_name temp_node1 + service_description PING + check_command check_ping!100.0,20%!500.0,60% +} diff --git a/nagios-server-addons.spec.in b/nagios-server-addons.spec.in index 9a51759..23149d3 100644 --- a/nagios-server-addons.spec.in +++ b/nagios-server-addons.spec.in @@ -126,33 +126,6 @@ rm -rf %{buildroot} NagiosCFGFile="/etc/nagios/nagios.cfg" sed -i '/etc\/nagios\/objects\/localhost.cfg/d' $NagiosCFGFile - -if [ "$1" -eq 1 ]; then -LocalhostCfgFile="%{_sysconfdir}/nagios/gluster/default/temp_node1.cfg" -cat > $LocalhostCfgFile << EOF -##################################################################### -# Configuration for dummy host temp_node1 with service check_ping # -# This dummy host is added to avoid nagios from erroring out before # -# auto-discovery script is run, This file will be renamed by auto- # -# discovery script to remove this configuration. # -##################################################################### - -define host{ - use linux-server - host_name temp_node1 - alias localhost - address 127.0.0.1 -} - -define service{ - use local-service - host_name temp_node1 - service_description PING - check_command check_ping!100.0,20%!500.0,60% -} -EOF -fi - if grep -q "#process_performance_data=0" $NagiosCFGFile; then sed -i -e 's/#process_performance_data=0/process_performance_data=1/g' $NagiosCFGFile elif grep -q "process_performance_data=0" $NagiosCFGFile ; then -- cgit