From 9ef75bdb24f56ddd26f263ea145963e1c6ea155e Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 6 Nov 2019 13:22:59 +0100 Subject: [PATCH] ODCS: check for odcs_celery_backend instead of fedmsg-hub-3 in nagios Signed-off-by: Clement Verna --- roles/nagios_client/tasks/main.yml | 2 +- roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 | 1 - roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 | 1 + roles/nagios_server/files/nagios/services/fedmsg.cfg | 2 +- roles/nagios_server/files/nrpe/nrpe.cfg | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 create mode 100644 roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index f4aacd5379..aa87687850 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -145,7 +145,7 @@ - check_mirrorlist_docker_proxy.cfg - check_mirrorlist_cache.cfg - check_celery_redis_queue.cfg - - check_fedmsg_hub_3_proc.cfg + - check_odcs_celery_proc.cfg - check_proxies.cfg notify: - restart nrpe diff --git a/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 deleted file mode 100644 index 5df1b0e791..0000000000 --- a/roles/nagios_client/templates/check_fedmsg_hub_3_proc.cfg.j2 +++ /dev/null @@ -1 +0,0 @@ -command[check_fedmsg_hub_3_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u fedmsg diff --git a/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 b/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 new file mode 100644 index 0000000000..86504f055f --- /dev/null +++ b/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 @@ -0,0 +1 @@ +command[check_odcs_celery_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'odcs-celery-backend ' -u odcs diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index bd589ae7a3..6490c38495 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -130,7 +130,7 @@ define service { define service { host_name odcs-backend01.phx2.fedoraproject.org service_description Check for fedmsg-hub-3 proc - check_command check_by_nrpe!check_fedmsg_hub_3_proc + check_command check_by_nrpe!check_odcs_celery_proc use defaulttemplate } diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index 14b67e75cd..54a1a7ea84 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -331,7 +331,7 @@ command[check_fedmsg_gateway_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 command[check_fedmsg_irc_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-irc' -u fedmsg command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-tweet' -u fedmsg command[check_fedmsg_composer_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u apache -command[check_fedmsg_hub_3_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u fedmsg +command[check_fedmsg_odcs_celery_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'odcs-celery-backend ' -u odcs command[check_repospanner_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'repospanner' -u repoSpanner 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