diff --git a/roles/nagios_server/files/nagios/configs/minimal.cfg b/roles/nagios_server/files/nagios/configs/minimal.cfg index 9bbb1a1fb0..54c69ae62d 100644 --- a/roles/nagios_server/files/nagios/configs/minimal.cfg +++ b/roles/nagios_server/files/nagios/configs/minimal.cfg @@ -265,7 +265,7 @@ define service{ check_period 24x7 max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 contact_groups admins notification_options w,u,c,r notification_interval 960 @@ -286,7 +286,7 @@ define service{ check_period 24x7 max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 contact_groups admins notification_options w,u,c,r notification_interval 960 @@ -308,7 +308,7 @@ define service{ check_period 24x7 max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 contact_groups admins notification_options w,u,c,r notification_interval 960 @@ -329,7 +329,7 @@ define service{ check_period 24x7 max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 contact_groups admins notification_options w,u,c,r notification_interval 960 @@ -349,7 +349,7 @@ define service{ check_period 24x7 max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 contact_groups admins notification_options w,u,c,r notification_interval 960 diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg index bfe75ae706..ad8228db4a 100644 --- a/roles/nagios_server/files/nagios/services/disk.cfg +++ b/roles/nagios_server/files/nagios/services/disk.cfg @@ -1,12 +1,12 @@ define service { - hostgroup_name all,!cloud,!mincheckgrp + hostgroup_name all, !cloud, !mincheckgrp service_description Disk_Space_/ check_command check_by_nrpe!check_disk_/ use disktemplate } define service { - hostgroup_name all,!cloud,!mincheckgrp + hostgroup_name all, !cloud, !mincheckgrp service_description Disk Space /boot check_command check_by_nrpe!check_disk_/boot use disktemplate @@ -34,7 +34,7 @@ define service { } define service { - host_name log01.phx2.fedoraproject.org + host_name log01.phx2.fedoraproject.org service_description Disk space /var/log check_command check_by_nrpe!check_disk_/var/log use disktemplate diff --git a/roles/nagios_server/files/nagios/services/raid.cfg b/roles/nagios_server/files/nagios/services/raid.cfg index aca0562340..ec6f1cbea2 100644 --- a/roles/nagios_server/files/nagios/services/raid.cfg +++ b/roles/nagios_server/files/nagios/services/raid.cfg @@ -10,7 +10,7 @@ define service { # service_description Check Raid # check_command check_by_nrpe!check_raid # use lighttemplate -# retry_check_interval 5 +# retry_interval 5 # max_check_attempts 12 #} diff --git a/roles/nagios_server/files/nagios/services/ssh.cfg b/roles/nagios_server/files/nagios/services/ssh.cfg index ea46ff56bf..55f70819df 100644 --- a/roles/nagios_server/files/nagios/services/ssh.cfg +++ b/roles/nagios_server/files/nagios/services/ssh.cfg @@ -17,7 +17,7 @@ define service { # service_description SSH # check_command check_ssh # use defaulttemplate -# retry_check_interval 5 +# retry_interval 5 # max_check_attempts 12 #} diff --git a/roles/nagios_server/files/nagios/services/templates.cfg b/roles/nagios_server/files/nagios/services/templates.cfg index d6922a59cc..eefed1cf29 100644 --- a/roles/nagios_server/files/nagios/services/templates.cfg +++ b/roles/nagios_server/files/nagios/services/templates.cfg @@ -25,7 +25,7 @@ define service{ check_period 24x7 ; The service can be checked at any time of the day max_check_attempts 3 ; Re-check the service up to 3 times in order to determine its final (hard) state check_interval 10 ; Check the service every 10 minutes under normal conditions - retry_check_interval 2 ; Re-check the service every two minutes until a hard state can be determined + retry_interval 2 ; Re-check the service every two minutes until a hard state can be determined contact_groups admins ; Notifications get sent out to everyone in the 'admins' group notification_options w,u,c,r ; Send notifications about warning, unknown, critical, and recovery events notification_interval 60 ; Re-notify about service problems every hour @@ -41,7 +41,7 @@ define service{ use generic-service ; Inherit default values from the generic-service definition max_check_attempts 4 ; Re-check the service up to 4 times in order to determine its final (hard) state check_interval 5 ; Check the service every 5 minutes under normal conditions - retry_check_interval 1 ; Re-check the service every minute until a hard state can be determined + retry_interval 1 ; Re-check the service every minute until a hard state can be determined register 0 ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE! } @@ -51,7 +51,7 @@ define service { name criticaltemplate max_check_attempts 4 check_interval 5 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 @@ -66,7 +66,7 @@ define service { name defaulttemplate max_check_attempts 3 check_interval 10 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 @@ -80,7 +80,7 @@ define service { name disktemplate max_check_attempts 3 check_interval 30 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 40 notification_period 24x7 @@ -94,7 +94,7 @@ define service { name builderdisktemplate max_check_attempts 12 check_interval 30 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 40 notification_period 24x7 @@ -108,7 +108,7 @@ define service { name lighttemplate max_check_attempts 3 check_interval 480 - retry_check_interval 5 + retry_interval 5 check_period 16x7 notification_interval 490 notification_period 16x7 @@ -122,7 +122,7 @@ define service { name websitetemplate max_check_attempts 3 check_interval 5 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 @@ -136,7 +136,7 @@ define service { name internalwebsitetemplate max_check_attempts 3 check_interval 5 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 @@ -162,7 +162,7 @@ define service { name ppc-secondarytemplate max_check_attempts 3 check_interval 10 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 @@ -176,7 +176,7 @@ define service { name retracetemplate max_check_attempts 3 check_interval 10 - retry_check_interval 1 + retry_interval 1 check_period 24x7 notification_interval 15 notification_period 24x7 diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index 08558b05ab..049d490045 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -22,6 +22,13 @@ define hostgroup{ } +define hostgroup{ + hostgroup_name routers + alias routers + members phx2-gw, ibiblio-gw, cloud-gw, bodhost-gw, coloamer-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, tummy-gw +} + + ## ## Management hardware define hostgroup {