From 848371bec2e1a9b0115ba3a351a1efe6d351c10d Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 26 Jan 2016 12:40:03 +0000 Subject: [PATCH] Add nagios more taskotron nagios checks --- roles/nagios_client/templates/check_disk.cfg.j2 | 2 ++ .../files/nagios/services/disk.cfg | 17 ++++++++++++++++- .../files/nagios/services/testcloud.cfg | 2 +- roles/nagios_server/files/nrpe.cfg | 2 ++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/roles/nagios_client/templates/check_disk.cfg.j2 b/roles/nagios_client/templates/check_disk.cfg.j2 index 9791b79fd4..eea8f29477 100644 --- a/roles/nagios_client/templates/check_disk.cfg.j2 +++ b/roles/nagios_client/templates/check_disk.cfg.j2 @@ -2,3 +2,5 @@ command[check_disk_/]={{ libdir }}/nagios/plugins/check_disk -w 15% -c 10% -p / command[check_disk_/boot]={{ libdir }}/nagios/plugins/check_disk -w 15% -c 10% -p /boot command[check_disk_/srv/cache/lookaside]={{ libdir }}/nagios/plugins/check_disk -w 20% -c 10% -p /srv/cache/lookaside command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/diskimages +command[check_disk_/srv/buildmaster]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/buildmaster +command[check_disk_/srv/taskotron]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/taskotron diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index dd827d848e..211b82b5ba 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -28,12 +28,27 @@ define service { } define service { - host_name qa11.qa + host_name qa10.qa, qa11.qa, qa12.qa, qa13.qa service_description Disk Space /srv/diskimages check_command check_by_nrpe!check_disk_/srv/diskimages use disktemplate } +define service { + host_name qa10.qa, qa11.qa, qa12.qa, qa13.qa + service_description Disk Space /srv/buildmaster + check_command check_by_nrpe!check_disk_/srv/buildmaster + use disktemplate +} + +define service { + host_name qa10.qa, qa11.qa, qa12.qa, qa13.qa + service_description Disk Space /srv/taskotron + check_command check_by_nrpe!check_disk_/srv/taskotron + use disktemplate +} + + #define service { # host_name hosted04 # service_description Disk Space /srv diff --git a/roles/nagios_server/files/nagios/services/testcloud.cfg b/roles/nagios_server/files/nagios/services/testcloud.cfg index 276a18b6c3..164a65f1ed 100644 --- a/roles/nagios_server/files/nagios/services/testcloud.cfg +++ b/roles/nagios_server/files/nagios/services/testcloud.cfg @@ -1,5 +1,5 @@ define service { - host_name qa11.qa + host_name qa10.qa, qa11.qa, qa12.qa, qa13.qa service_description Check Testcloud check_command check_testcloud max_check_attempts 5 diff --git a/roles/nagios_server/files/nrpe.cfg b/roles/nagios_server/files/nrpe.cfg index 3c2f40bde3..e20a3acb99 100644 --- a/roles/nagios_server/files/nrpe.cfg +++ b/roles/nagios_server/files/nrpe.cfg @@ -202,6 +202,8 @@ command[check_disk_/git]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p / command[check_disk_/postgreslogs]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /postgreslogs command[check_disk_/srv]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/diskimages +command[check_disk_/srv/buildmaster]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/buildmaster +command[check_disk_/srv/taskotron]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/taskotron 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 command[check_disk_/srv/cache/lookaside]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/cache/lookaside