From aa569ea75be2dd8032d33a9570bdb317314899f6 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 18 Dec 2019 16:53:57 +0100 Subject: [PATCH] ODCS: replace the process check by a service check. Signed-off-by: Clement Verna --- inventory/group_vars/odcs_backend | 5 ++++- inventory/group_vars/odcs_backend_stg | 5 ++++- roles/nagios_client/tasks/main.yml | 1 - roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 | 1 - roles/nagios_server/files/nagios/services/fedmsg.cfg | 6 ------ 5 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 diff --git a/inventory/group_vars/odcs_backend b/inventory/group_vars/odcs_backend index 8cfce7010f..2d36834eb2 100644 --- a/inventory/group_vars/odcs_backend +++ b/inventory/group_vars/odcs_backend @@ -55,8 +55,11 @@ csi_relationship: | The process is called `odcs-backend`. This host: - + - relies on db01 for its database of activity (what composes have been requested and what state are they in?) - Uses pungi to compose repos of content. - It also *provides* an nfs share used by odcs-frontend01. + +nagios_Check_Services: + odcs-celery-backend: true diff --git a/inventory/group_vars/odcs_backend_stg b/inventory/group_vars/odcs_backend_stg index ea7a32c69e..8621e07d9d 100644 --- a/inventory/group_vars/odcs_backend_stg +++ b/inventory/group_vars/odcs_backend_stg @@ -52,8 +52,11 @@ csi_relationship: | The process is called `odcs-backend`. This host: - + - relies on db01 for its database of activity (what composes have been requested and what state are they in?) - Uses pungi to compose repos of content. - It also *provides* an nfs share used by odcs-frontend01. + +nagios_Check_Services: + odcs-celery-backend: true diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 379c91b492..bb324fb6ff 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -143,7 +143,6 @@ - check_mirrorlist_docker_proxy.cfg - check_mirrorlist_cache.cfg - check_celery_redis_queue.cfg - - check_odcs_celery_proc.cfg - check_proxies.cfg notify: - restart nrpe diff --git a/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 b/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 deleted file mode 100644 index 86504f055f..0000000000 --- a/roles/nagios_client/templates/check_odcs_celery_proc.cfg.j2 +++ /dev/null @@ -1 +0,0 @@ -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 f65c0bc6d3..897bad4906 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -92,12 +92,6 @@ define service { check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate } -define service { - host_name odcs-backend01.phx2.fedoraproject.org - service_description Check for fedmsg-hub-3 proc - check_command check_by_nrpe!check_odcs_celery_proc - use defaulttemplate -} # Odd one, check for the supybot fedmsg plugin