From 36d2fb9ac1b5e382807ff7913c5aeb42dae60d19 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 12 Nov 2019 07:48:23 +0100 Subject: [PATCH] Tell nagios to check for .proto instead of .pkl With the switch to the new protobuf based mirrorlist servers it is necessary to switch nagios to check for .proto files instead of .pkl. The .pkl files will soon go away. Signed-off-by: Adrian Reber --- roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 | 4 ++-- roles/nagios_server/files/nrpe/nrpe.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 b/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 index f19eab9534..d282b7fa90 100644 --- a/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 +++ b/roles/nagios_client/templates/check_mirrorlist_cache.cfg.j2 @@ -1,2 +1,2 @@ -command[check_mirrorlist1_cache]={{ libdir }}/nagios/plugins/check_file_age -w 14400 -c 129600 -f /srv/mirrorlist/data/mirrorlist1/mirrorlist_cache.pkl -command[check_mirrorlist2_cache]={{ libdir }}/nagios/plugins/check_file_age -w 14400 -c 129600 -f /srv/mirrorlist/data/mirrorlist2/mirrorlist_cache.pkl +command[check_mirrorlist1_cache]={{ libdir }}/nagios/plugins/check_file_age -w 14400 -c 129600 -f /srv/mirrorlist/data/mirrorlist1/mirrorlist_cache.proto +command[check_mirrorlist2_cache]={{ libdir }}/nagios/plugins/check_file_age -w 14400 -c 129600 -f /srv/mirrorlist/data/mirrorlist2/mirrorlist_cache.proto diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index b7a1dcb155..97121da098 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -309,7 +309,7 @@ command[check_total_procs]=/usr/lib64/nagios/plugins/check_procs -w 900 -c 1000 command[check_swap]=/usr/lib64/nagios/plugins/check_swap -w 15% -c 10% command[check_temp]=/usr/lib64/nagios/plugins/check_ipmi -t command[check_fans]=/usr/lib64/nagios/plugins/check_ipmi -f -command[check_mirrorlist_cache]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /var/lib/mirrormanager/mirrorlist_cache.pkl +command[check_mirrorlist_cache]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /var/lib/mirrormanager/mirrorlist_cache.proto command[check_mysql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/fpo-mediawiki.xz command[check_pgsql_backup]=/usr/lib64/nagios/plugins/check_file_age -w 86400 -c 129600 -f /backups/db-fas01.phx2.fedoraproject.org/fas2.db command[check_puppetmaster]=/usr/lib64/nagios/plugins/check_procs -c 8:8 -a '/usr/bin/ruby /usr/sbin/puppetmasterd' -u puppet