From 449c7c76496035f5bbeca5848cdb868cfa84ce2c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 9 Oct 2015 22:55:29 +0000 Subject: [PATCH] Try to add proxy09 and proxy12 --- .../hosts/admin.fedoraproject.org.cfg | 15 ++++++++ .../hosts/fedoraproject.org.cfg | 8 ++++ .../servicedeps/websitedeps.cfg | 18 +++++++++ .../nagios-external/services/websites.cfg | 38 +++++++++---------- .../files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/proxies.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hostgroups/web.cfg | 2 +- .../files/nagios/hosts/proxy09-fpo.cfg | 14 +++---- .../files/nagios/hosts/proxy09.cfg | 14 +++---- .../files/nagios/hosts/proxy12-fpo.cfg | 7 ++++ .../files/nagios/hosts/proxy12.cfg | 7 ++++ .../files/nagios/servicegroups/bodhi.cfg | 2 +- .../files/nagios/servicegroups/fas.cfg | 2 +- .../files/nagios/servicegroups/fp-wiki.cfg | 2 +- .../files/nagios/servicegroups/mirrorlist.cfg | 2 +- .../files/nagios/servicegroups/pkgdb.cfg | 2 +- .../files/nagios/services/fedmsg.cfg | 8 ++-- .../files/nagios/services/ssl.cfg | 6 +-- .../files/nagios/services/websites.cfg | 18 ++++----- 21 files changed, 114 insertions(+), 59 deletions(-) create mode 100644 roles/nagios_server/files/nagios/hosts/proxy12-fpo.cfg create mode 100644 roles/nagios_server/files/nagios/hosts/proxy12.cfg 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 d80e18522e..8934493147 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 @@ -63,6 +63,14 @@ define host { parents ibiblio02.fedoraproject.org } +define host { + host_name proxy12.fedoraproject.org + alias proxy12.fedoraproject.org + use defaulttemplate + address 152.19.134.198 + parents ibiblio05.fedoraproject.org +} + define host { host_name ibiblio02.fedoraproject.org alias ibiblio02.fedoraproject.org @@ -70,6 +78,13 @@ define host { address 152.19.134.169 } +define host { + host_name ibiblio05.fedoraproject.org + alias ibiblio05.fedoraproject.org + use defaulttemplate + address 152.19.134.137 +} + # # ibiblio ipv6 # diff --git a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg index ecd7fd36d4..7d28e783b0 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg @@ -30,6 +30,14 @@ define host { parents proxy04.fedoraproject.org } +define host { + host_name 152.19.134.198-ibiblio + alias 152.19.134.198-ibiblio + use defaulttemplate + address 152.19.134.198 + parents proxy12.fedoraproject.org +} + # define host { # host_name fpo-ipv6-ibiblio # alias fpo-ipv6-ibiblio diff --git a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg index 608867b319..a526b17710 100644 --- a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg @@ -26,6 +26,15 @@ define servicedependency { execution_failure_criteria w,c } +define servicedependency { + host_name 152.19.134.198-ibiblio + service_description https + dependent_host_name 152.19.134.198-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 +} + define servicedependency { host_name 85.236.55.6-internetx service_description https @@ -62,6 +71,15 @@ define servicedependency { execution_failure_criteria w,c } +define servicedependency { + host_name 152.19.134.198-ibiblio + service_description http + dependent_host_name 152.19.134.198-ibiblio + dependent_service_description fedoraproject.org, fedoraproject.org - wiki, start.fedoraproject.org + notification_failure_criteria w,c + execution_failure_criteria w,c +} + define servicedependency { host_name 85.236.55.6-internetx service_description http diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index d659a34551..fe30c81a13 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description bodhi max_check_attempts 8 check_command check_website_ssl!bodhi.fedoraproject.org!/!Fedora @@ -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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description taskotron_resultsdb_api max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/resultsdb_api/ @@ -106,7 +106,7 @@ define service { # define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description http max_check_attempts 2 normal_check_interval 2 @@ -115,42 +115,42 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description fedoraproject.org check_command check_website_ssl!fedoraproject.org!/!getfedora.org use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description fedoraproject.org - wiki check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description docs.fedoraproject.org check_command check_website_ssl!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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica 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.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description mirrors.fedoraproject.org - publiclist check_command check_website_ssl!admin.fedoraproject.org!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org!admins use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 152.19.134.198-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica service_description start.fedoraproject.org check_command check_website_ssl!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index 29517ddf7f..ea1d11f00d 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, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-osuosl01, !hosted03, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost09.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,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !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, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-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, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org + members *, !bastion01, !bastion02, !bastion-vpn, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-osuosl01, !hosted03, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy09-fpo, !proxy10-fpo, !proxy11-fpo, !proxy12-fpo, !bc02.mgmt.fedoraproject.org, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bc02.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,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost09.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,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.mgmt.fedoraproject.org,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !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, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-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, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hostgroups/proxies.cfg b/roles/nagios_server/files/nagios/hostgroups/proxies.cfg index 626b17bdb8..a544a7e1d6 100644 --- a/roles/nagios_server/files/nagios/hostgroups/proxies.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/proxies.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name proxies alias proxies - members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy10, proxy11 + members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, proxy12 } diff --git a/roles/nagios_server/files/nagios/hostgroups/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index 38bf1c4688..ae005dc038 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, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy10-fpo, !proxy11-fpo, !fwsm01-gw, !backup01.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,!bvirthost07.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost09.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, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !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, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-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, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org + members *, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !proxy12-fpo, !proxy12-wildcard, !proxy10-fpo, !proxy11-fpo, !proxy12-fpo, !fwsm01-gw, !backup01.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,!bvirthost07.mgmt.fedoraproject.org,!virthost01.mgmt.fedoraproject.org,!virthost02.mgmt.fedoraproject.org,!virthost11.mgmt.fedoraproject.org,!virthost03.mgmt.fedoraproject.org,!virthost05.mgmt.fedoraproject.org,!virthost06.mgmt.fedoraproject.org,!virthost07.mgmt.fedoraproject.org,!virthost09.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, !virthost19.mgmt.fedoraproject.org, !virthost20.mgmt.fedoraproject.org, !virthost21.mgmt.fedoraproject.org, !virthost22.mgmt.fedoraproject.org, !ibiblio-gw, !status-fedora2, !virthost-comm02.mgmt.fedoraproject.org, !virthost-comm03.mgmt.fedoraproject.org, !virthost-comm04.mgmt.fedoraproject.org, !ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-releng00, !arm01-retrace01, !arm01-releng02, !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, !arm04-builder00, !arm04-builder01, !arm04-builder02, !arm04-builder03, !arm04-builder04, !arm04-builder05, !arm04-builder06, !arm04-builder07, !arm04-builder08, !arm04-builder09, !arm04-builder10, !arm04-builder11, !arm04-builder12, !arm04-builder13, !arm04-builder14, !arm04-builder15, !arm04-builder16, !arm04-builder17, !arm04-builder18, !arm04-builder19, !arm04-builder20, !arm04-builder21, !arm04-builder22, !arm04-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, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !fed-cloud09.mgmt.fedoraproject.org, !fed-cloud10.mgmt.fedoraproject.org, !fed-cloud11.mgmt.fedoraproject.org, !fed-cloud12.mgmt.fedoraproject.org, !fed-cloud13.mgmt.fedoraproject.org, !fed-cloud14.mgmt.fedoraproject.org, !fed-cloud15.mgmt.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 9114b23e58..4fb8098df8 100644 --- a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients - members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,proxy11 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,proxy09,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,proxy11,proxy12 } diff --git a/roles/nagios_server/files/nagios/hostgroups/web.cfg b/roles/nagios_server/files/nagios/hostgroups/web.cfg index 1484c1b8cc..6e0647e1b7 100644 --- a/roles/nagios_server/files/nagios/hostgroups/web.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/web.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name webservers alias webservers - members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy10, proxy11, fas01, fas02, fas03, status-fedora2, ipsilon01, ipsilon02, + members proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, proxy12, fas01, fas02, fas03, status-fedora2, ipsilon01, ipsilon02, } diff --git a/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg index 7eb48c5aba..ae64425584 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg @@ -1,7 +1,7 @@ -# define host { -# host_name proxy09-fpo -# alias proxy09-fpo.fedoraproject.org -# use defaulttemplate -# address 66.135.62.187 -# parents proxy09 -# } +define host { + host_name proxy09-fpo + alias proxy09-fpo.fedoraproject.org + use defaulttemplate + address 140.211.169.206 + parents proxy09 +} diff --git a/roles/nagios_server/files/nagios/hosts/proxy09.cfg b/roles/nagios_server/files/nagios/hosts/proxy09.cfg index 23fe32534a..820f9c4f6e 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy09.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy09.cfg @@ -1,7 +1,7 @@ -# define host { -# host_name proxy09 -# alias proxy09.fedoraproject.org -# use defaulttemplate -# address proxy09.fedoraproject.org -# parents serverbeach07 -# } +define host { + host_name proxy09 + alias proxy09.fedoraproject.org + use defaulttemplate + address proxy09.fedoraproject.org + parents osuosl02 +} diff --git a/roles/nagios_server/files/nagios/hosts/proxy12-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy12-fpo.cfg new file mode 100644 index 0000000000..7c81521b2d --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/proxy12-fpo.cfg @@ -0,0 +1,7 @@ +define host { + host_name proxy12-fpo + alias proxy12-fpo.fedoraproject.org + use defaulttemplate + address 152.19.134.198 + parents proxy12 +} diff --git a/roles/nagios_server/files/nagios/hosts/proxy12.cfg b/roles/nagios_server/files/nagios/hosts/proxy12.cfg new file mode 100644 index 0000000000..b9a6bef6c2 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/proxy12.cfg @@ -0,0 +1,7 @@ +define host { + host_name proxy12 + alias proxy12.fedoraproject.org + use defaulttemplate + address proxy12.fedoraproject.org + parents ibiblio05 +} diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg index 4ffedb04a1..d8b3584cff 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-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal + members proxy01-wildcard,bodhi,proxy02-wildcard,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-wildcard,bodhi,proxy08-wildcard,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,proxy12-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal } diff --git a/roles/nagios_server/files/nagios/servicegroups/fas.cfg b/roles/nagios_server/files/nagios/servicegroups/fas.cfg index 9bae97e39e..85a8f5822a 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-fpo,accounts,proxy08-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,accounts,proxy06-fpo,accounts + members proxy01-wildcard,accounts,proxy02-wildcard,accounts,proxy03-fpo,accounts,proxy04-fpo,accounts,proxy08-wildcard,proxy12-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,proxy12-fpo,accounts,proxy06-fpo,accounts } diff --git a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg index 6d4bad7884..7616db7bf7 100644 --- a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg +++ b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name fp-wiki alias Fedora Project Wiki - members proxy01-fpo,fedoraproject.org - wiki - non-cached,proxy02-fpo,fedoraproject.org - wiki - non-cached,proxy03-fpo,fedoraproject.org - wiki - non-cached,proxy04-fpo,fedoraproject.org - wiki - non-cached,proxy06-fpo,fedoraproject.org - wiki - non-cached,proxy07-fpo,fedoraproject.org - wiki - non-cached,proxy08-fpo,fedoraproject.org - wiki - non-cached,proxy01-fpo,fedoraproject.org - wiki,proxy02-fpo,fedoraproject.org - wiki,proxy03-fpo,fedoraproject.org - wiki,proxy04-fpo,fedoraproject.org - wiki,proxy06-fpo,fedoraproject.org - wiki,proxy07-fpo,fedoraproject.org - wiki,proxy08-fpo,fedoraproject.org - wiki,proxy05-fpo,fedoraproject.org - wiki,proxy10-fpo,fedoraproject.org - wiki,proxy11-fpo,fedoraproject.org - wiki + members proxy01-fpo,fedoraproject.org - wiki - non-cached,proxy02-fpo,fedoraproject.org - wiki - non-cached,proxy03-fpo,fedoraproject.org - wiki - non-cached,proxy04-fpo,fedoraproject.org - wiki - non-cached,proxy06-fpo,fedoraproject.org - wiki - non-cached,proxy07-fpo,fedoraproject.org - wiki - non-cached,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki - non-cached,proxy01-fpo,fedoraproject.org - wiki,proxy02-fpo,fedoraproject.org - wiki,proxy03-fpo,fedoraproject.org - wiki,proxy04-fpo,fedoraproject.org - wiki,proxy06-fpo,fedoraproject.org - wiki,proxy07-fpo,fedoraproject.org - wiki,proxy08-fpo,proxy09-fpo,fedoraproject.org - wiki,proxy05-fpo,fedoraproject.org - wiki,proxy10-fpo,fedoraproject.org - wiki,proxy11-fpo,proxy12-fpo,fedoraproject.org - wiki } diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg index 8af14fa3ba..4f52f062b8 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-fpo,mirrors.fedoraproject.org - mirrorlist,proxy06-fpo,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,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-fpo,mirrors.fedoraproject.org - mirrorlist,proxy07-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy08-wildcard,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,proxy12-fpo,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 d55e281256..056bbdfc29 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-fpo,pkgdb-external,proxy08-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,Check PackageDB DB + members proxy01-wildcard,pkgdb-external,proxy02-wildcard,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-fpo,pkgdb-external,proxy08-wildcard,proxy09-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11-fpo,proxy12-fpo,Check PackageDB DB } diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index f01bfe9989..5370dc6ac0 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -32,7 +32,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy05,proxy06,proxy07,proxy08,proxy10,proxy11 + host_name proxy01,proxy02,proxy03,proxy04,proxy05,proxy06,proxy07,proxy08,proxy09,proxy10,proxy11,proxy12 service_description Check for existence fedmsg-gateway proc check_command check_by_nrpe!check_fedmsg_gateway_proc use defaulttemplate @@ -323,7 +323,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy10,proxy11 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg consumers and producers gateway check_command check_by_nrpe!check_fedmsg_cp_busgateway_gateway use defaulttemplate @@ -437,7 +437,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy10,proxy11 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg-gateway consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_busgateway_gateway use defaulttemplate @@ -551,7 +551,7 @@ define service { } define service { - host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy10,proxy11 + host_name proxy01,proxy02,proxy03,proxy04,proxy06,proxy07,proxy08,proxy05,proxy09,proxy10,proxy11,proxy12 service_description Check fedmsg-gateway consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_busgateway_gateway use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 9efcfa2f42..bb7ccc1cb2 100644 --- a/roles/nagios_server/files/nagios/services/ssl.cfg +++ b/roles/nagios_server/files/nagios/services/ssl.cfg @@ -1,19 +1,19 @@ define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description admin.fedoraproject.org SSL Cert check_command check_ssl_cert!admin.fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description fedoraproject.org SSL Cert check_command check_ssl_cert!fedoraproject.org!60 use defaulttemplate } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo 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 f40e079b2f..bffaf72e7f 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -1,12 +1,12 @@ define service { - host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description fedoraproject.org check_command check_website!fedoraproject.org!/!getfedora.org use websitetemplate } define service { - host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description fedoraproject.org - wiki check_command check_website!fedoraproject.org!/wiki/Fedora_Project_Wiki!Fedora Marketing max_check_attempts 10 @@ -14,7 +14,7 @@ define service { } define service { - host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-fpo, proxy02-fpo, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-fpo, proxy08-fpo, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description fedoraproject.org - wiki - non-cached check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software max_check_attempts 10 @@ -22,14 +22,14 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo 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-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description pkgdb-external check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate @@ -51,14 +51,14 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description start.fedoraproject.org check_command check_website_ssl!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate @@ -72,7 +72,7 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description bodhi check_command check_website_ssl!bodhi.fedoraproject.org!/!Fedora max_check_attempts 8 @@ -88,7 +88,7 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-fpo service_description bodhi2 check_command check_website_ssl!bodhi.fedoraproject.org!/!top testers max_check_attempts 8