From e5a3fb3a4393d65f8b8bafd4abcc30bf8956835f Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 8 Apr 2021 16:58:49 -0400 Subject: [PATCH] Add in a 12x7 versus 16x7 and make some timeszones friendlier Signed-off-by: Stephen Smoogen --- .../files/nagios/configs/timeperiods.cfg | 43 +++++++++++++++---- .../contactgroups/fedora-sysadmin-pager.cfg | 4 +- .../files/nagios/contacts/codeblock.cfg | 4 +- .../files/nagios/contacts/smooge.cfg | 32 ++------------ 4 files changed, 41 insertions(+), 42 deletions(-) diff --git a/roles/nagios_server/files/nagios/configs/timeperiods.cfg b/roles/nagios_server/files/nagios/configs/timeperiods.cfg index f1b92112ab..b7caad14f2 100644 --- a/roles/nagios_server/files/nagios/configs/timeperiods.cfg +++ b/roles/nagios_server/files/nagios/configs/timeperiods.cfg @@ -36,17 +36,42 @@ define timeperiod{ } define timeperiod{ - timeperiod_name 16x7 - alias 15 Hours a day, 7 days a week - sunday 00:00-04:00,13:00-24:00 - monday 00:00-04:00,13:00-24:00 - tuesday 00:00-04:00,13:00-24:00 - wednesday 00:00-04:00,13:00-24:00 - thursday 00:00-04:00,13:00-24:00 - friday 00:00-04:00,13:00-24:00 - saturday 00:00-04:00,13:00-24:00 + timeperiod_name 12x7-GMT + alias 12 Hours a day, 7 days a week + sunday 08:00-20:00 + monday 08:00-20:00 + tuesday 08:00-20:00 + wednesday 08:00-20:00 + thursday 08:00-20:00 + friday 08:00-20:00 + saturday 08:00-20:00 } +define timeperiod{ + timeperiod_name 12x7-USET + alias 12 Hours a day, 7 days a week + sunday 12:00-24:00 + monday 12:00-24:00 + tuesday 12:00-24:00 + wednesday 12:00-24:00 + thursday 12:00-24:00 + friday 12:00-24:00 + saturday 12:00-24:00 + } + +define timeperiod{ + timeperiod_name 12x7-USPT + alias 12 Hours a day, 7 days a week + sunday 00:00-03:00,15:00-24:00 + monday 00:00-03:00,15:00-24:00 + tuesday 00:00-03:00,15:00-24:00 + wednesday 00:00-03:00,15:00-24:00 + thursday 00:00-03:00,15:00-24:00 + friday 00:00-03:00,15:00-24:00 + saturday 00:00-03:00,15:00-24:00 + } + + define timeperiod{ timeperiod_name 16x7-AU alias 15 Hours a day, 7 days a week diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg index c484aa41c6..d3654ef703 100644 --- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg +++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg @@ -1,11 +1,11 @@ define contactgroup{ contactgroup_name fedora-sysadmin-pager alias Fedora Sysadmin Pager Contacts - members smoogep,kevinp,codeblockp + members smooge,kevinp,codeblockp } define contactgroup{ contactgroup_name fedora-sysadmin-emergency alias Fedora Sysadmin Pager Contacts - members smooge-emergency,kevin-emergency,codeblock-emergency + members smooge,kevin-emergency,codeblock-emergency } diff --git a/roles/nagios_server/files/nagios/contacts/codeblock.cfg b/roles/nagios_server/files/nagios/contacts/codeblock.cfg index aac7d6dbe6..e22c4b5b93 100644 --- a/roles/nagios_server/files/nagios/contacts/codeblock.cfg +++ b/roles/nagios_server/files/nagios/contacts/codeblock.cfg @@ -26,8 +26,8 @@ define contact{ define contact{ contact_name codeblockp alias Rick Elrod - service_notification_period 16x7 - host_notification_period 16x7 + service_notification_period 12x7-USET + host_notification_period 12x7-USET service_notification_options w,u,c,r host_notification_options d,u,r service_notification_commands notify-by-epager diff --git a/roles/nagios_server/files/nagios/contacts/smooge.cfg b/roles/nagios_server/files/nagios/contacts/smooge.cfg index e674f5b46b..dba186f3db 100644 --- a/roles/nagios_server/files/nagios/contacts/smooge.cfg +++ b/roles/nagios_server/files/nagios/contacts/smooge.cfg @@ -1,38 +1,12 @@ define contact{ contact_name smooge alias Stephen Smoogen - service_notification_period 24x7 - host_notification_period 24x7 + service_notification_period never + host_notification_period never service_notification_options w,u,c,r host_notification_options d,u,r service_notification_commands notify-by-email host_notification_commands host-notify-by-email - email smooge+notify@gmail.com -} - -define contact{ - contact_name smooge-emergency - alias Stephen Smoogen - service_notification_period 24x7 - host_notification_period 24x7 - service_notification_options w,u,c,r - host_notification_options d,u,r - service_notification_commands notify-by-epager - host_notification_commands host-notify-by-epager - email smooge+notify@gmail.com - pager smooge@smoogespace.com -} - -define contact{ - contact_name smoogep - alias Stephen Smoogen - service_notification_period 16x7 - host_notification_period 16x7 - service_notification_options w,u,c,r - host_notification_options d,u,r - service_notification_commands notify-by-epager - host_notification_commands host-notify-by-epager - email smooge+notify@gmail.com - pager smooge@smoogespace.com + email smooge+nagios@smoogespace.com }