From 9d9d7f6c5cb498462be45317e6561ec56081ddbf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 30 Jun 2020 15:59:32 -0700 Subject: [PATCH] nagios_server: more adjustments, drop fas for now, fix gateway hosts harder Signed-off-by: Kevin Fenzi --- .../files/nagios/servicedeps/nrpe.cfg | 34 ++++++------ .../nagios/hosts/gateway-hosts.cfg.j2 | 19 +------ .../templates/nagios/services/websites.cfg.j2 | 52 +++++++++---------- 3 files changed, 44 insertions(+), 61 deletions(-) diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index b2acb9a32d..6143ecf01a 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -124,20 +124,20 @@ define servicedependency { execution_failure_criteria w,c } -define servicedependency { - host_name packages03 - service_description packages-internal - dependent_host_name packages03 - dependent_service_description packages-internal-bugstab - notification_failure_criteria w,c - execution_failure_criteria w,c -} - -define servicedependency { - host_name packages04 - service_description packages-internal - dependent_host_name packages04 - dependent_service_description packages-internal-bugstab - notification_failure_criteria w,c - execution_failure_criteria w,c -} +#define servicedependency { +# host_name packages03 +# service_description packages-internal +# dependent_host_name packages03 +# dependent_service_description packages-internal-bugstab +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} +# +#define servicedependency { +# host_name packages04 +# service_description packages-internal +# dependent_host_name packages04 +# dependent_service_description packages-internal-bugstab +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 index 09248020e8..b5694a50f2 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -2,21 +2,6 @@ # change to the nocs parent. Also hosts which aren't reachable should # be not defined on the external nagios. # -define host { - host_name iad2-gw - alias PHX2 Router - use mincheck - check_command check-host-alive4 -{% if vars['nagios_location'] == 'iad2_internal' %} - address 10.3.163.254 - parents iad2-gw -{% elif vars['nagios_location'] == 'external' %} - address 66.187.228.248 - parents ibiblio-gw -{% endif %} - -} - #'ibiblio' define host { host_name ibiblio-gw @@ -136,9 +121,7 @@ define host { alias iad2 cage gateway use mincheck check_command check-host-alive4 -{% if vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw -{% elif vars['nagios_location'] == 'external' %} +{% if vars['nagios_location'] == 'external' %} address 66.187.228.248 parents ibiblio-gw {% endif %} diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 1d85bee1a9..87afb8a57a 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -57,7 +57,7 @@ define service { service_description http-accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate - servicegroups fas +# servicegroups fas } define service { @@ -187,13 +187,13 @@ define service { use internalwebsitetemplate } -define service { - hostgroup_name fas - service_description http-accounts - check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency - use internalwebsitetemplate - servicegroups fas -} +#define service { +# hostgroup_name fas +# service_description http-accounts +# check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency +# use internalwebsitetemplate +# servicegroups fas +#} define service { hostgroup_name github2fedmsg @@ -243,24 +243,24 @@ define service { use websitetemplate } -define service { - hostgroup_name packages - service_description http-packages-internal - check_command check_website!localhost!/packages/!Packages - max_check_attempts 8 - use internalwebsitetemplate - event_handler restart_httpd -} - -define service { - hostgroup_name packages - service_description http-packages-internal-bugstab - check_command check_website!localhost!/packages/fcomm_connector/bugzilla/query/query_bugs/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%22%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows - max_check_attempts 8 - use internalwebsitetemplate - # When this thing dies, you usually just need to nuke /var/cache/fedoracommunity/bugzillacookies - #event_handler nuke_bugzillacookies_handler -} +#define service { +# hostgroup_name packages +# service_description http-packages-internal +# check_command check_website!localhost!/packages/!Packages +# max_check_attempts 8 +# use internalwebsitetemplate +# event_handler restart_httpd +#} +# +#define service { +# hostgroup_name packages +# service_description http-packages-internal-bugstab +# check_command check_website!localhost!/packages/fcomm_connector/bugzilla/query/query_bugs/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%22%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows +# max_check_attempts 8 +# use internalwebsitetemplate +# # When this thing dies, you usually just need to nuke /var/cache/fedoracommunity/bugzillacookies +# #event_handler nuke_bugzillacookies_handler +#} define service {