|
[-]
[+]
|
Changed |
nagios.spec
|
|
|
|
[-]
[+]
|
Deleted |
nagios.run_async_service_check.return.patch
^
|
| @@ -1,16 +0,0 @@
-https://bugzilla.novell.com/show_bug.cgi?id=395203
----
- base/checks.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/base/checks.c
-+++ b/base/checks.c
-@@ -597,7 +597,7 @@ int run_async_service_check(service *svc
- /* free check result memory */
- free_check_result(&check_result_info);
-
-- return;
-+ return ERROR;
- }
- else{
-
|
|
[-]
[+]
|
Added |
rcnagios
^
|
| @@ -0,0 +1,252 @@
+#! /bin/sh
+# Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany.
+# 2002 SuSE Linux AG Nuernberg, Germany.
+# 2007 SuSE Linux GmbH Nuernberg, Germany.
+#
+# Author: Wolfgang Rosenauer, Lars Vogdt
+#
+#
+# /etc/init.d/nagios
+#
+# and symbolic its link
+#
+# /usr/sbin/rcnagios
+#
+# System startup script for nagios
+#
+### BEGIN INIT INFO
+# Provides: nagios
+# Required-Start: $local_fs $remote_fs $syslog $network
+# Required-Stop: $local_fs $remote_fs $syslog $network
+# Should-Start: $time sendmail httpd2 xntpd $named cron ndo2db
+# Should-Stop: sendmail ndo2db
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Network monitor Nagios
+# Description: Starts and stops the Nagios monitor
+# used to provide network services status for hosts,
+# services and networks.
+### END INIT INFO
+
+. /etc/rc.status
+
+NAGIOS_BIN=/usr/sbin/nagios
+NAGIOS_CFG=/etc/nagios/nagios.cfg
+NAGIOS_SYSCONFIG=/etc/sysconfig/nagios
+NAGIOS_CFG_ERR_LOG=/var/log/nagios/config.err
+
+# Read config and log errors in logfile
+function config_check () {
+ $NAGIOS_BIN -v $NAGIOS_CFG > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ return 0
+ else
+ $NAGIOS_BIN -v $NAGIOS_CFG > $NAGIOS_CFG_ERR_LOG 2>&1
+ return 1
+ fi
+}
+
+# grab a config option
+function get_var() {
+ if [ -n "$2" ]; then
+ set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'`
+ else
+ set -- `grep ^$1 $NAGIOS_CFG | sed 's@=@ @' | tr -d '[:cntrl:]'`
+ fi
+ shift # remove first ARG => search-string
+ echo $*
+}
+
+# check some default files and directories
+function check_files() {
+ # set default access rights for files and directories
+ for file in $check_result_path $log_file $state_retention_file $status_file; do
+ if [ -e $file ]; then
+ touch $file
+ chown $nagios_user:$nagios_cmdgrp $file
+ fi
+ done
+ chmod 660 $resource_file
+ chown $nagios_user:$nagios_cmdgrp $resource_file
+ # remove some perhaps left over files
+ for file in $command_file $lock_file $status_file $temp_file /var/lock/subsys/nagios; do
+ test -f $file && rm -f $file
+ done
+}
+
+# Check for missing binaries (stale symlinks should not happen)
+# Note: Special treatment of stop for LSB conformance
+test -x $NAGIOS_BIN || { echo "$NAGIOS_BIN not installed";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 5; fi; }
+
+# Check for existence of needed config file
+test -r $NAGIOS_CFG || { echo "$NAGIOS_CFG not existing";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 6; fi; }
+
+# Check for existence of sysconfig file and read it
+test -r $NAGIOS_SYSCONFIG || { echo "$NAGIOS_SYSCONFIG not existing";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 6; fi; }
+
+. $NAGIOS_SYSCONFIG
+
+# set values for sysconfig vars
+if [ -n "$NAGIOS_NICELEVEL" ]; then
+ NICELEVEL="-n $NAGIOS_NICELEVEL"
+else
+ NICELEVEL="-n 0"
+fi
+if [ -z "$NAGIOS_TIMEOUT" ]; then
+ NAGIOS_TIMEOUT=10
+fi
+
+#
+# get variables from config file
+#
+nagios_user="$(get_var nagios_user)"
+lock_file="$(get_var lock_file)"
+status_file="$(get_var status_file)"
+log_file="$(get_var log_file)"
+temp_file="$(get_var temp_file)"
+state_retention_file="$(get_var state_retention_file)"
+command_file="$(get_var command_file)"
+resource_file="$(get_var resource_file)"
+object_cache_file="$(get_var object_cache_file)"
+check_result_path="$(get_var check_result_path)"
+
+#
+# use default values if above check doesn't work
+#
+: ${nagios_user:=nagios}
+: ${nagios_cmdgrp:=nagcmd}
+: ${resource_file:=/etc/nagios/resource.cfg}
+# check ownership files
+: ${check_result_path:=/var/spool/nagios}
+: ${log_file:=/var/log/nagios/nagios.log}
+: ${state_retention_file:=/var/log/nagios/retention.dat}
+: ${status_file:=/var/log/nagios/status.dat}
+# files to remove
+: ${command_file:=/var/spool/nagios/nagios.cmd}
+: ${lock_file:=/var/run/nagios.pid}
+: ${object_cache_file:=/var/lib/nagios/objects.cache}
+: ${temp_file:=/var/log/nagios/nagios.tmp}
+
+# Reset status of this service
+rc_reset
+
+case "$1" in
+ start)
+ echo -n "Starting nagios "
+ config_check
+ if [ $? -eq 0 ]; then
+ # check if nagios is already running
+ NAGPID=$(pidof $NAGIOS_BIN)
+ if [ -n "$NAGPID" ]; then
+ echo "- Error: looks like nagios is still running with PID $NAGPID"
+ echo -n "- trying to kill previous nagios process"
+ kill -9 $NAGPID
+ sleep 2
+ fi
+ check_files
+ startproc $NICELEVEL -p $lock_file $NAGIOS_BIN -d $NAGIOS_CFG
+ else
+ echo "- Error in configuration files"
+ echo -n "- please read $NAGIOS_CFG_ERR_LOG"
+ rc_failed
+ fi
+ rc_status -v
+ ;;
+ stop)
+ echo -n "Shutting down nagios "
+ # we have to wait for nagios to exit and remove its
+ # own Lockfile, otherwise a following "start" could
+ # happen, and then the exiting nagios will remove the
+ # new Lockfile, allowing multiple nagios daemons
+ # to (sooner or later) run - John Sellens
+
+ if checkproc $NAGIOS_BIN ; then
+ killproc -p $lock_file -TERM $NAGIOS_BIN
+ sleep 1
+ if [ -e $lock_file ]; then
+ echo "Warning - nagios did not exit in a timely manner. Waiting..."
+ while [ -e $lock_file ] && [ $NAGIOS_TIMEOUT -gt 0 ] ; do
+ sleep 1
+ NAGIOS_TIMEOUT=$[$NAGIOS_TIMEOUT-1]
+ echo -n '.'
+ [ $NAGIOS_TIMEOUT -eq 41 ] && echo
+ done
+ fi
+ if checkproc $NAGIOS_BIN ; then
+ killproc -p $lock_file -SIGKILL $NAGIOS_BIN
+ echo -n "Warning: nagios killed"
+ fi
+ else
+ echo -n "nagios not running"
+ rc_failed 7
+ fi
+ check_files
+ rc_reset
+ rc_status -v
+ ;;
+ try-restart)
+ ## Do a restart only if the service was active before.
+ ## Note: try-restart is now part of LSB (as of 1.9).
+ ## RH has a similar command named condrestart.
+ $0 status
+ if test $? = 0; then
+ $0 restart
|
|
[-]
[+]
|
Added |
suse.de-nagios
^
|
| @@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Compress old nagios logfiles in /var/log/nagios/archives/
+# once a week, if sysconfig variable is set to true
+#
+if [ -r /etc/sysconfig/nagios ]; then
+. /etc/sysconfig/nagios
+else
+ echo "/etc/sysconfig/nagios not found or not readable."
+ exit 1
+fi
+
+if [ x"$NAGIOS_COMPRESS_LOGFILES" = x"true" ]; then
+ LOGS=$(echo /var/log/nagios/archives/*.log)
+ for f in $LOGS ; do
+ if [ -e $f ] ; then
+ /usr/bin/bzip2 /var/log/nagios/archives/*.log
+ break
+ fi
+ done
+fi
|
