From bb24183f46c74ed16c31648dda8bad08ee3c6a7f Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Thu, 30 May 2019 20:06:18 +0200 Subject: [PATCH] oci-registry: Update nagios to monitor the correct directory for disk space Signed-off-by: Clement Verna --- roles/nagios_client/templates/check_disk.cfg.j2 | 2 +- roles/nagios_server/files/nagios/services/disk.cfg | 6 +++--- roles/nagios_server/files/nrpe/nrpe.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/nagios_client/templates/check_disk.cfg.j2 b/roles/nagios_client/templates/check_disk.cfg.j2 index cc8e8b7a10..2df06ec110 100644 --- a/roles/nagios_client/templates/check_disk.cfg.j2 +++ b/roles/nagios_client/templates/check_disk.cfg.j2 @@ -15,6 +15,6 @@ command[check_disk_/srv/taskotron]=/usr/lib64/nagios/plugins/check_disk -w 20% - command[check_disk_/srv]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv command[check_disk_huge_/srv]=/usr/lib64/nagios/plugins/check_disk -w 5% -c 1% -p /srv command[check_disk_/u01]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /u01 -command[check_disk_/var/lib/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/registry +command[check_disk_/srv/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/registry command[check_disk_/var/lib64/mock]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/mock command[check_disk_/var/log]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /var/log diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index 4f80fc6995..a8d56a3037 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -83,8 +83,8 @@ define service { } define service { - hostgroup_name moby_registry - service_description Disk space /var/lib/registry - check_command check_by_nrpe!check_disk_/var/lib/registry + hostgroup_name oci_registry + service_description Disk space /srv/registry + check_command check_by_nrpe!check_disk_/srv/registry use disktemplate } diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index 8c10dd9519..ad1033dde0 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -303,7 +303,7 @@ command[check_disk_/var/lib64/mock]=/usr/lib64/nagios/plugins/check_disk -w 20% command[check_disk_/var/log]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /var/log command[check_disk_/srv/cache/lookaside]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/cache/lookaside command[check_disk_/project/]=/usr/lib64/nagios/plugins/check_disk -w 5% -c 1% -p /project/ -command[check_disk_/var/lib/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/registry +command[check_disk_/srv/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/registry command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 15 -c 25 -s Z 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%