From a668d78e21b770fc3438cb0948d7dbc998d8411e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 18 Feb 2017 15:36:07 +0000 Subject: [PATCH] Remove nagios mirrorlist check Signed-off-by: Patrick Uiterwijk --- roles/nagios/client/tasks/main.yml | 1 - roles/nagios/server/files/nrpe.cfg | 1 - roles/nagios_client/tasks/main.yml | 1 - .../files/nagios/services/haproxy_mirrorlist.cfg | 6 ------ roles/nagios_server/files/nrpe/nrpe.cfg | 1 - 5 files changed, 10 deletions(-) delete mode 100644 roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg diff --git a/roles/nagios/client/tasks/main.yml b/roles/nagios/client/tasks/main.yml index 08b56846eb..ddeb74b5c3 100644 --- a/roles/nagios/client/tasks/main.yml +++ b/roles/nagios/client/tasks/main.yml @@ -41,7 +41,6 @@ copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios with_items: - check_haproxy_conns.py - - check_haproxy_mirrorlist.py - check_postfix_queue - check_raid.py - check_lock diff --git a/roles/nagios/server/files/nrpe.cfg b/roles/nagios/server/files/nrpe.cfg index fa6cbb9bd1..02060de6ad 100644 --- a/roles/nagios/server/files/nrpe.cfg +++ b/roles/nagios/server/files/nrpe.cfg @@ -237,7 +237,6 @@ command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C command[check_fedmsg_masher_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub' -u apache command[check_supybot_fedmsg_plugin]=/usr/lib64/nagios/plugins/check_supybot_plugin -t fedmsg command[check_haproxy_conns]=/usr/lib64/nagios/plugins/check_haproxy_conns.py -command[check_haproxy_mirrorlist]=/usr/lib64/nagios/plugins/check_haproxy_mirrorlist.py command[check_redis_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'redis-server' -u redis command[check_autocloud_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'python' -a 'autocloud_job.py' -u root command[check_openvpn_link]=/usr/lib64/nagios/plugins/check_ping -H 192.168.1.41 -w 375.0,20% -c 500,60% diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index b5011aa41e..e1b8ff1f7b 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -41,7 +41,6 @@ copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios with_items: - check_haproxy_conns.py - - check_haproxy_mirrorlist.py - check_postfix_queue - check_raid.py - check_lock diff --git a/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg b/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg deleted file mode 100644 index 041f3d4722..0000000000 --- a/roles/nagios_server/files/nagios/services/haproxy_mirrorlist.cfg +++ /dev/null @@ -1,6 +0,0 @@ -define service { - hostgroup_name proxies - service_description Check proxy04 for DOWN mirrorlist servers - check_command check_by_nrpe!check_haproxy_mirrorlist - use defaulttemplate -} diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index 96fcd9094a..1734281bec 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -237,7 +237,6 @@ command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C command[check_fedmsg_masher_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub' -u apache command[check_supybot_fedmsg_plugin]=/usr/lib64/nagios/plugins/check_supybot_plugin -t fedmsg command[check_haproxy_conns]=/usr/lib64/nagios/plugins/check_haproxy_conns.py -command[check_haproxy_mirrorlist]=/usr/lib64/nagios/plugins/check_haproxy_mirrorlist.py command[check_redis_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'redis-server' -u redis command[check_autocloud_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'python' -a 'autocloud_job.py' -u root command[check_openvpn_link]=/usr/lib64/nagios/plugins/check_ping -H 192.168.1.41 -w 375.0,20% -c 500,60%