Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

additional fix for new status.dat location in nagios

Browse source
This commit is contained in:
Kevin Fenzi 2017-03-14 16:00:37 +00:00
parent 233811ef32
commit fc15d5bf36
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nagios/server/files/nrpe.cfg
View file

@ -220,7 +220,7 @@ command[check_puppetmaster]=/usr/lib64/nagios/plugins/check_procs -c 8:8 -a '/us
command[check_supervisor]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -a '/usr/bin/python /usr/bin/supervisord' -u root
command[check_lock]=/usr/lib64/nagios/plugins/check_lock
command[check_lock_file_age]=/usr/lib64/nagios/plugins/check_lock_file_age -w 1 -c 5 -f /var/lock/fedora-ca/lock
command[check_nagios]=/usr/lib64/nagios/plugins/check_nagios -e 5 -F /var/log/nagios/status.dat -C /usr/sbin/nagios
command[check_nagios]=/usr/lib64/nagios/plugins/check_nagios -e 5 -F /var/spool/nagios/status.dat -C /usr/sbin/nagios
command[check_auditd]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'auditd' -u root
command[check_cron]=/usr/lib64/nagios/plugins/check_procs -c 1:10 -C 'crond' -u root
command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u nobody

2
roles/nagios/server/templates/config.inc.php
View file

@ -6,7 +6,7 @@ $cfg['cgi_base_url']='/{{nagios_srcdir}}/cgi-bin/';
// FILE LOCATION DEFAULTS
$cfg['main_config_file']='/etc/nagios/nagios.cfg'; // default location of the main Nagios config file
$cfg['status_file']='/var/log/nagios/status.dat'; // default location of Nagios status file
$cfg['status_file']='/var/spool/nagios/status.dat'; // default location of Nagios status file
$cfg['state_retention_file']='/var/log/nagios/retention.dat'; // default location of Nagios retention file
// utilities

2
roles/nagios_server/files/nagios/scripts/check_nagios_notifications.py
View file

@ -17,7 +17,7 @@ debug = 0
EMAIL_FROM="nagios@fedoraproject.org"
EMAIL_TO="sysadmin-noc-members@fedoraproject.org"
#EMAIL_TO="athmane@fedoraproject.org"
nagios_status_file = '/var/log/nagios/status.dat'
nagios_status_file = '/var/spool/nagios/status.dat'
class NagiosStatus:
def __init__(self, filename):

2
roles/nagios_server/files/nrpe/nrpe.cfg
View file

@ -315,7 +315,7 @@ command[check_puppetmaster]=/usr/lib64/nagios/plugins/check_procs -c 8:8 -a '/us
command[check_supervisor]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -a '/usr/bin/python /usr/bin/supervisord' -u root
command[check_lock]=/usr/lib64/nagios/plugins/check_lock
command[check_lock_file_age]=/usr/lib64/nagios/plugins/check_lock_file_age -w 1 -c 5 -f /var/lock/fedora-ca/lock
command[check_nagios]=/usr/lib64/nagios/plugins/check_nagios -e 5 -F /var/log/nagios/status.dat -C /usr/sbin/nagios
command[check_nagios]=/usr/lib64/nagios/plugins/check_nagios -e 5 -F /var/spool/nagios/status.dat -C /usr/sbin/nagios
command[check_auditd]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'auditd' -u root
command[check_cron]=/usr/lib64/nagios/plugins/check_procs -c 1:10 -C 'crond' -u root
command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u nobody