diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index a01f90567f..17cfe4f705 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -30,7 +30,6 @@ - "85.236.55.6" - "[2001:4178:2:1269::fed2]" - "80.239.156.215" - - "152.19.134.146" - "[2610:28:3090:3001:dead:beef:cafe:fed4]" - "140.211.169.197" - "213.175.193.206" @@ -49,7 +48,6 @@ - "[2001:4178:2:1269::fed2]" - "66.35.62.162" - "80.239.156.215" - - "152.19.134.146" - "[2610:28:3090:3001:dead:beef:cafe:fed4]" - "140.211.169.197" - "213.175.193.206" diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index b3274cae6d..548158dad8 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -23,8 +23,6 @@ NameVirtualHost 66.35.62.162:443 # proxy04 NameVirtualHost 152.19.134.142:80 NameVirtualHost 152.19.134.142:443 -NameVirtualHost 152.19.134.146:80 -NameVirtualhost 152.19.134.146:443 NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:80 NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443 NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed4]:80 diff --git a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg index e25b7fc263..f18aebc022 100644 --- a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg @@ -48,10 +48,10 @@ define host { # define host { - host_name 152.19.134.146-ibiblio - alias 152.19.134.146-ibiblio + host_name 152.19.134.142-ibiblio + alias 152.19.134.142-ibiblio use defaulttemplate - address 152.19.134.146 + address 152.19.134.142 parents proxy04.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg index d8e275d34b..e59e0d2424 100644 --- a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg @@ -18,9 +18,9 @@ define servicedependency { } define servicedependency { - host_name 152.19.134.146-ibiblio + host_name 152.19.134.142-ibiblio service_description https - dependent_host_name 152.19.134.146-ibiblio + dependent_host_name 152.19.134.142-ibiblio dependent_service_description bodhi, pkgdb, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c execution_failure_criteria w,c diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index 08d0877671..67d4515d59 100644 --- a/roles/nagios_server/files/nagios-external/services/websites.cfg +++ b/roles/nagios_server/files/nagios-external/services/websites.cfg @@ -3,7 +3,7 @@ # define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description https max_check_attempts 2 normal_check_interval 2 @@ -13,7 +13,7 @@ define service { define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description bodhi max_check_attempts 8 check_command check_website_ssl!admin.fedoraproject.org!/updates/!Latest @@ -21,14 +21,14 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description pkgdb check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description packages max_check_attempts 8 check_command check_website_ssl!apps.fedoraproject.org!/packages/!Packages @@ -36,7 +36,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description elections check_command check_website_ssl!admin.fedoraproject.org!/voting/!Last 5 elections use websitetemplate @@ -50,35 +50,35 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description ask check_command check_website_ssl!ask.fedoraproject.org!/en/questions/!RSS use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description blockerbugs check_command check_website_ssl!qa.fedoraproject.org!/blockerbugs/!Currently Active Milestones use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description fedocal check_command check_website_ssl!apps.fedoraproject.org!/calendar/list/infrastructure-outages/!Description use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_taskmaster max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/taskmaster/ @@ -86,7 +86,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_resultsdb max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/resultsdb/ @@ -94,7 +94,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_resultsdb_api max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/resultsdb_api/ @@ -129,21 +129,21 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description docs.fedoraproject.org check_command check_website!docs.fedoraproject.org!/en-US/index.html!Fedora Documentation use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description mirrors.fedoraproject.org - mirrorlist check_command check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.146-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description mirrors.fedoraproject.org - publiclist check_command check_website!mirrors.fedoraproject.org!/publiclist/Fedora/!Fedora Public Active Mirrors use websitetemplate diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index d8f0601c38..a2ee755070 100644 --- a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg @@ -1,5 +1,5 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, !bastion01, !bastion02, !bastion-vpn, !backup03, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost04.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!tape02.mgmt.fedoraproject.org,!virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost04.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!autoqa01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org,!proxy09-fpo, !proxy09-wildcard, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 + members *, !bastion01, !bastion02, !bastion-vpn, !backup03, !db02.stg, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !releng01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-coloamer01, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!bvirthost04.mgmt.fedoraproject.org,!bvirthost07.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!tape02.mgmt.fedoraproject.org,!virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost04.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!autoqa01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org,!proxy09-fpo, !proxy09-wildcard, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 } diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index 1e4f168ecb..94f668986d 100644 --- a/roles/nagios_server/files/nagios/hostgroups/servers.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/servers.cfg @@ -5,6 +5,6 @@ define hostgroup { hostgroup_name servers alias All Servers - members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!tape02.mgmt.fedoraproject.org,!bvirthost04.mgmt.fedoraproject.org, !bvirthost07.mgmt.fedoraproject.org, !virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost04.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !autoqa01, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org,!proxy09-fpo,!proxy09-wildcard, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 + members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !fwsm01-gw, !backup03.mgmt.fedoraproject.org,!bc02.mgmt.fedoraproject.org,!download01.mgmt.fedoraproject.org,!download02.mgmt.fedoraproject.org,!download03.mgmt.fedoraproject.org,!download04.mgmt.fedoraproject.org,!download05.mgmt.fedoraproject.org,!qa01.mgmt.fedoraproject.org,!qa02.mgmt.fedoraproject.org,!qa03.mgmt.fedoraproject.org,!qa04.mgmt.fedoraproject.org,!qa05.mgmt.fedoraproject.org,!qa06.mgmt.fedoraproject.org,!qa07.mgmt.fedoraproject.org,!qa08.mgmt.fedoraproject.org,!qa09.mgmt.fedoraproject.org,!qa10.mgmt.fedoraproject.org,!qa11.mgmt.fedoraproject.org,!qa12.mgmt.fedoraproject.org,!qa13.mgmt.fedoraproject.org,!qa14.mgmt.fedoraproject.org,!tape02.mgmt.fedoraproject.org,!bvirthost04.mgmt.fedoraproject.org, !bvirthost07.mgmt.fedoraproject.org, !virthost-comm01.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost04.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost08.mgmt.fedoraproject.org,!virthost09.mgmt.fedoraproject.org,!virthost10.mgmt.fedoraproject.org,!atomic01.mgmt.fedoraproject.org, !virthost12.mgmt.fedoraproject.org, !virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org, !autoqa01, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org,!proxy09-fpo,!proxy09-wildcard, !arm01-releng00, !arm01-retrace01, !arm01-builder02, !arm01-builder03, !arm01-builder04, !arm01-builder05, !arm01-builder06, !arm01-builder07, !arm01-builder08, !arm01-builder09, !arm01-builder10, !arm01-builder11, !arm01-builder12, !arm01-builder13, !arm01-builder14, !arm01-builder15, !arm01-builder16, !arm01-builder17, !arm01-builder18, !arm01-builder19, !arm01-builder20, !arm01-builder21, !arm01-builder22, !arm01-builder23, !arm02-builder00, !arm02-builder01, !arm02-builder02, !arm02-builder03, !arm02-builder04, !arm02-builder05, !arm02-builder06, !arm02-builder07, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder14, !arm02-builder15, !arm02-builder16, !arm02-builder17, !arm02-builder18, !arm02-builder19, !arm02-builder20, !arm02-builder21, !arm02-builder22, !arm02-builder23, !buildvm-01, !buildvm-02, !buildvm-03, !buildvm-04, !buildvm-05, !buildvm-06, !buildvm-07, !buildvm-08, !buildvm-09, !buildvm-10, !buildvm-11, !buildvm-12, !buildvm-13, !buildvm-14, !buildvm-15, !buildvm-16, !buildvm-17, !buildvm-18, !buildvm-19, !buildvm-20, !buildvm-21, !buildvm-22, !buildvm-23, !buildvm-24, !buildvm-25, !buildvm-26, !buildvm-27, !buildvmhost-10, !buildvmhost-11, !buildvmhost-12 } diff --git a/roles/nagios_server/files/nagios/hosts/proxy04-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy04-wildcard.cfg index a32d2a12c3..efcf8fd40f 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy04-wildcard.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy04-wildcard.cfg @@ -1,7 +1,7 @@ -define host { - host_name proxy04-wildcard - alias proxy04-wildcard.fedoraproject.org - use defaulttemplate - address 152.19.134.146 - parents proxy04 -} +#define host { +# host_name proxy04-wildcard +# alias proxy04-wildcard.fedoraproject.org +# use defaulttemplate +# address 152.19.134.146 +# parents proxy04 +#} diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg index 1b8c2e3b4b..51ca9cffee 100644 --- a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-wildcard,bodhi,proxy06-wildcard,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy09-wildcard,bodhi,bodhi01,bodhi-internal,bodhi02,bodhi-internal + members proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-wildcard,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy09-wildcard,bodhi,bodhi01,bodhi-internal,bodhi02,bodhi-internal } diff --git a/roles/nagios_server/files/nagios/servicegroups/fas.cfg b/roles/nagios_server/files/nagios/servicegroups/fas.cfg index 7633c088e7..c9d8a1b53d 100644 --- a/roles/nagios_server/files/nagios/servicegroups/fas.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/fas.cfg @@ -1,5 +1,5 @@ define servicegroup { servicegroup_name fas alias Fedora Account System - members proxy01-wildcard,accounts,proxy02-wildcard,accounts,proxy03-fpo,accounts,proxy04-wildcard,accounts,proxy08-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy09-wildcard,accounts + members proxy01-wildcard,accounts,proxy02-wildcard,accounts,proxy03-fpo,accounts,proxy04-fpo,accounts,proxy08-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy09-wildcard,accounts } diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg index 180b4ad35b..f379cafb1d 100644 --- a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mirrorlist alias Mirrorlist - members proxy01-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy02-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy03-fpo,mirrors.fedoraproject.org - mirrorlist,proxy04-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy06-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist + members proxy01-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy02-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy03-fpo,mirrors.fedoraproject.org - mirrorlist,proxy04-fpo,mirrors.fedoraproject.org - mirrorlist,proxy06-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist } diff --git a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg index ba61d9a964..a8a61938ad 100644 --- a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name pkgdb alias Package Database - members proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-wildcard,pkgdb-external,proxy08-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,Check PackageDB DB,proxy09-wildcard,pkgdb-external + members proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-fpo,pkgdb-external,proxy08-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,Check PackageDB DB,proxy09-wildcard,pkgdb-external } diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 5af8779afd..1ed76af203 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -1,5 +1,5 @@ define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description admin.fedoraproject.org SSL Cert check_command check_ssl_cert!admin.fedoraproject.org!60 use defaulttemplate @@ -13,7 +13,7 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description translate.fedoraproject.org SSL Cert check_command check_ssl_cert!translate.fedoraproject.org!60 use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index dbe0cf406c..0278ae6261 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -22,14 +22,14 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description mirrors.fedoraproject.org - mirrorlist check_command check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development use websitetemplate } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description pkgdb-external check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate @@ -44,14 +44,14 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description start.fedoraproject.org check_command check_website!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate @@ -65,7 +65,7 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description bodhi check_command check_website_ssl!admin.fedoraproject.org!/updates/!Latest max_check_attempts 8