From e1560c0a052d1b4052eafd081c7acd24f3a64987 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 17:29:49 +0000 Subject: [PATCH] remove these warnings --- .../server/files/nagios/hosts/templates.cfg | 16 +++----- .../files/nagios/services/templates.cfg | 18 ++++----- .../contactgroups/fedora-sysadmin-email.cfg | 3 +- .../files/nagios/contacts/aditya.cfg | 11 ------ .../files/nagios/contacts/mmcgrath.cfg | 38 ------------------- .../files/nagios/contacts/nigelj.cfg | 11 ------ 6 files changed, 16 insertions(+), 81 deletions(-) delete mode 100644 roles/nagios_server/files/nagios/contacts/aditya.cfg delete mode 100644 roles/nagios_server/files/nagios/contacts/mmcgrath.cfg delete mode 100644 roles/nagios_server/files/nagios/contacts/nigelj.cfg diff --git a/roles/nagios/server/files/nagios/hosts/templates.cfg b/roles/nagios/server/files/nagios/hosts/templates.cfg index eebe47c86a..04bdd25b71 100644 --- a/roles/nagios/server/files/nagios/hosts/templates.cfg +++ b/roles/nagios/server/files/nagios/hosts/templates.cfg @@ -4,10 +4,9 @@ define host { check_command check-host-alive-nrpe max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 - notification_interval 10 + notification_interval 15 notifications_enabled 1 notification_options d,r contact_groups fedora-sysadmin-ircbot @@ -20,10 +19,9 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 - notification_interval 10 + notification_interval 15 notifications_enabled 1 notification_options d,r contact_groups fedora-sysadmin-ircbot @@ -35,7 +33,6 @@ define host { # check_command check-host-alive # max_check_attempts 8 # checks_enabled 1 -# failure_prediction_enabled 0 # retain_status_information 1 # retain_nonstatus_information 1 # notification_interval 480 @@ -50,10 +47,9 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 - notification_interval 10 + notification_interval 15 notifications_enabled 1 notification_options d,r contact_groups ppc-secondary-email @@ -65,10 +61,9 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 - notification_interval 10 + notification_interval 15 notifications_enabled 1 notification_options d,r contact_groups retrace-email @@ -79,10 +74,9 @@ define host { name defaultbuilders max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 - notification_interval 10 + notification_interval 15 notifications_enabled 1 notification_options d,r contact_groups fedora-sysadmin-ircbot diff --git a/roles/nagios/server/files/nagios/services/templates.cfg b/roles/nagios/server/files/nagios/services/templates.cfg index 63e340eb21..4a7e19e183 100644 --- a/roles/nagios/server/files/nagios/services/templates.cfg +++ b/roles/nagios/server/files/nagios/services/templates.cfg @@ -4,7 +4,7 @@ define service { normal_check_interval 5 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -19,7 +19,7 @@ define service { normal_check_interval 10 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -33,7 +33,7 @@ define service { normal_check_interval 30 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -47,7 +47,7 @@ define service { normal_check_interval 30 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -61,7 +61,7 @@ define service { normal_check_interval 480 retry_check_interval 5 check_period 16x7 - notification_interval 10 + notification_interval 15 notification_period 16x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -75,7 +75,7 @@ define service { normal_check_interval 5 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -89,7 +89,7 @@ define service { normal_check_interval 5 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -128,7 +128,7 @@ define service { normal_check_interval 10 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot @@ -142,7 +142,7 @@ define service { normal_check_interval 10 retry_check_interval 1 check_period 24x7 - notification_interval 10 + notification_interval 15 notification_period 24x7 notification_options w,u,c,r contact_groups fedora-sysadmin-ircbot diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg index bc4e5e79ff..73d62f0c3b 100644 --- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg +++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg @@ -1,6 +1,7 @@ define contactgroup{ contactgroup_name fedora-sysadmin-email alias Fedora Sysadmin Email Contacts -# members admin,kevin,puiterwijkp,smooge,ausil,jcollie,nb,rigeld2,codeblock,hvivani +# sysadmin-main: @ausil codeblock jstanley @kevin pbrobinson pingou puiterwijk ralph @smooge tflink +# members admin,ausil,codeblock,jstanley,kevin,pbrobinson,pingou,puiterwijkp,ralph,smooge,tflink members smooge } diff --git a/roles/nagios_server/files/nagios/contacts/aditya.cfg b/roles/nagios_server/files/nagios/contacts/aditya.cfg deleted file mode 100644 index d35dbb7b86..0000000000 --- a/roles/nagios_server/files/nagios/contacts/aditya.cfg +++ /dev/null @@ -1,11 +0,0 @@ -define contact{ - contact_name aditya - alias Aditya Patawari - 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-email - host_notification_commands host-notify-by-email - email adimania@fedoraproject.org -} diff --git a/roles/nagios_server/files/nagios/contacts/mmcgrath.cfg b/roles/nagios_server/files/nagios/contacts/mmcgrath.cfg deleted file mode 100644 index 3c130d4568..0000000000 --- a/roles/nagios_server/files/nagios/contacts/mmcgrath.cfg +++ /dev/null @@ -1,38 +0,0 @@ -define contact{ - contact_name mmcgrath - alias Mike McGrath - 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-email - host_notification_commands host-notify-by-email - email mmcgrath@redhat.com -} - -define contact{ - contact_name mmcgrath-emergency - alias Mike McGrath - 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 imlinux+mobile@gmail.com - pager imlinux+mobile@gmail.com -} - -define contact{ - contact_name mmcgrathp - alias Mike McGrath - 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 imlinux+mobile@gmail.com - pager imlinux+mobile@gmail.com -} - diff --git a/roles/nagios_server/files/nagios/contacts/nigelj.cfg b/roles/nagios_server/files/nagios/contacts/nigelj.cfg deleted file mode 100644 index 59a4e228b6..0000000000 --- a/roles/nagios_server/files/nagios/contacts/nigelj.cfg +++ /dev/null @@ -1,11 +0,0 @@ -define contact{ - contact_name nigelj - alias Nigel Jones - 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 dev@nigelj.com -}