From bcda2606fe9e11dce2a6df80d832a183720febb2 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 9 Jun 2020 10:45:02 -0400 Subject: [PATCH] try to make this work in iad2 --- .../files/nagios/servicedeps/websitedeps.cfg | 4 ++-- .../files/nagios/services/iad2_internal/nrpe.cfg | 2 +- .../templates/nagios/hosts/gateway-hosts.cfg.j2 | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg index 405574ab61..2f83d9670f 100644 --- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg @@ -9,9 +9,9 @@ define servicedependency { } define servicedependency { - host_name 209.132.181.16-phx2 + host_name 38.145.60.20-iad2 service_description https - dependent_host_name 209.132.181.16-phx2 + dependent_host_name 38.145.60.20-iad2 dependent_service_description bodhi, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki notification_failure_criteria w,c execution_failure_criteria w,c diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg index 735e31af5b..55e38a0dfa 100644 --- a/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/iad2_internal/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name bastion02.iad2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org + host_name bastion01.iad2.fedoraproject.org, sundries01.iad2.fedoraproject.org, wiki01.iad2.fedoraproject.org service_description nrpe check_command test_nrpe max_check_attempts 2 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 207d15b2bf..92a56c4e9b 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -140,12 +140,10 @@ define host { alias iad2 cage gateway use mincheck check_command check-host-alive4 - address 209.132.185.254 -{% if vars['nagios_location'] == 'phx2_internal' %} - parents phx2-gw -{% elif vars['nagios_location'] == 'iad2_internal' %} - parents iad2-gw +{% if vars['nagios_location'] == 'iad2_internal' %} + address 10.3.163.254 {% else %} + address 209.132.185.254 parents ibiblio-gw {% endif %}