From a731c777bf5e030c0c14ab48fad0b9bd594c88a3 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 10 Oct 2015 00:03:25 +0000 Subject: [PATCH] Get rid of wildcard hosts --- .../nagios_server/files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hosts/proxy01-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy02-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy06-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy07-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy08-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy09-wildcard.cfg | 7 ------- .../files/nagios/hosts/proxy12-wildcard.cfg | 7 ------- .../files/nagios/servicegroups/bodhi.cfg | 2 +- .../nagios_server/files/nagios/servicegroups/fas.cfg | 2 +- .../files/nagios/servicegroups/mirrorlist.cfg | 2 +- .../files/nagios/servicegroups/pkgdb.cfg | 2 +- roles/nagios_server/files/nagios/services/ssl.cfg | 12 ++---------- .../nagios_server/files/nagios/services/websites.cfg | 12 ++++++------ 15 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy01-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy02-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy07-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy08-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg delete mode 100644 roles/nagios_server/files/nagios/hosts/proxy12-wildcard.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index ea1d11f00d..db651e7a75 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, !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 + 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-fpo, !proxy02-fpo, !proxy02-fpo, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-fpo, !proxy08-fpo, !proxy08-fpo, !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/servers.cfg b/roles/nagios_server/files/nagios/hostgroups/servers.cfg index ae005dc038..f68a74ebb8 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, !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 + members *, !proxy01-fpo, !proxy01-fpo, !proxy02-fpo, !proxy02-fpo, !proxy03-fpo, !proxy04-fpo, !proxy05-fpo, !proxy06-fpo, !proxy07-fpo, !proxy07-fpo, !proxy08-fpo, !proxy08-fpo, !proxy12-fpo, !proxy12-fpo, !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/hosts/proxy01-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy01-wildcard.cfg deleted file mode 100644 index 7572c73acb..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy01-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define host { - host_name proxy01-wildcard - alias proxy01-2 - use defaulttemplate - address 10.5.126.52 - parents proxy01 -} diff --git a/roles/nagios_server/files/nagios/hosts/proxy02-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy02-wildcard.cfg deleted file mode 100644 index 0bf60b89cd..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy02-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define host { - host_name proxy02-wildcard - alias proxy02-wildcard.fedoraproject.org - use defaulttemplate - address 85.236.55.6 - parents proxy02 -} diff --git a/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg deleted file mode 100644 index e7894aff44..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# define host { -# host_name proxy06-wildcard -# alias proxy06-wildcard.fedoraproject.org -# use defaulttemplate -# address 140.211.169.196 -# parents proxy06 -# } diff --git a/roles/nagios_server/files/nagios/hosts/proxy07-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy07-wildcard.cfg deleted file mode 100644 index 21de80cd53..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy07-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define host { - host_name proxy07-wildcard - alias proxy07-wildcard.fedoraproject.org - use defaulttemplate - address 213.175.193.206 - parents proxy07 -} diff --git a/roles/nagios_server/files/nagios/hosts/proxy08-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy08-wildcard.cfg deleted file mode 100644 index d48de0b963..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy08-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ -define host { - host_name proxy08-wildcard - alias proxy08-wildcard.fedoraproject.org - use defaulttemplate - address 67.203.2.67 - parents proxy08 -} diff --git a/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg deleted file mode 100644 index 70a7ad04e3..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ - define host { - host_name proxy09-wildcard - alias proxy09-wildcard.fedoraproject.org - use defaulttemplate - address 140.211.169.206 - parents proxy09 - } diff --git a/roles/nagios_server/files/nagios/hosts/proxy12-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy12-wildcard.cfg deleted file mode 100644 index cb90945ff9..0000000000 --- a/roles/nagios_server/files/nagios/hosts/proxy12-wildcard.cfg +++ /dev/null @@ -1,7 +0,0 @@ - define host { - host_name proxy12-wildcard - alias proxy12-wildcard.fedoraproject.org - use defaulttemplate - address 152.19.134.198 - parents proxy12 - } diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg index 50be8f2e33..45e34da023 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,proxy09-wildcard,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,proxy12-fpo,bodhi,bodhi03,bodhi-internal,bodhi04,bodhi-internal + members proxy01-fpo,bodhi,proxy02-fpo,bodhi,proxy03-fpo,bodhi,proxy04-fpo,bodhi,proxy06-fpo,bodhi,proxy07-fpo,bodhi,proxy08-fpo,proxy09-fpo,bodhi,proxy05-fpo,bodhi,proxy10-fpo,bodhi,proxy11-fpo,bodhi,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 bf0385cd9a..02943d2d92 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,proxy12-wildcard,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,accounts,proxy12-fpo,accounts,proxy06-fpo,accounts + members proxy01-fpo,accounts,proxy02-fpo,accounts,proxy03-fpo,accounts,proxy04-fpo,accounts,proxy08-fpo,accounts,proxy12-fpo,accounts,fas01,accounts,fas02,accounts,fas03,accounts,db-fas01,Check FAS DB,proxy05-fpo,accounts,proxy10-fpo,accounts,proxy11-fpo,accounts,proxy12-fpo,accounts,proxy06-fpo,accounts } diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg index b5d27347c5..4b7e706705 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,proxy09-wildcard,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,mirrors.fedoraproject.org,proxy12-fpo,mirrors.fedoraproject.org - mirrorlist + members proxy01-fpo,mirrors.fedoraproject.org - mirrorlist,proxy02-fpo,mirrors.fedoraproject.org - mirrorlist,proxy03-fpo,mirrors.fedoraproject.org - mirrorlist,proxy04-fpo,mirrors.fedoraproject.org - mirrorlist,proxy06-fpo,mirrors.fedoraproject.org - mirrorlist,proxy07-fpo,mirrors.fedoraproject.org - mirrorlist,proxy08-fpo,proxy09-fpo,mirrors.fedoraproject.org - mirrorlist,proxy05-fpo,mirrors.fedoraproject.org - mirrorlist,proxy10-fpo,mirrors.fedoraproject.org - mirrorlist,proxy11-fpo,mirrors.fedoraproject.org,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 a75ee7a547..69de0f56ae 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,proxy09-wildcard,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11-fpo,Check PackageDB DB,proxy12-fpo,Check PackageDB DB + members proxy01-fpo,pkgdb-external,proxy02-fpo,pkgdb-external,proxy03-fpo,pkgdb-external,proxy04-fpo,pkgdb-external,proxy08-fpo,proxy09-fpo,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11-fpo,pkgdb-external,proxy12-fpo,pkgdb-external } diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index bb7ccc1cb2..72e0b36b8b 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-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-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 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-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-fpo, proxy10-fpo, proxy11-fpo, proxy12-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 translate.fedoraproject.org SSL Cert check_command check_ssl_cert!translate.fedoraproject.org!60 use defaulttemplate @@ -39,11 +39,3 @@ define service { check_command check_ssl_cert!lists.fedoraproject.org!60 use defaulttemplate } - -#define service { -# host_name proxy01-wildcard, proxy02-wildcard, proxy03-wildcard, proxy04-wildcard, proxy06-fpo, proxy08-wildcard, proxy05-fpo, proxy10-fpo, proxy11-fpo -# service_description koji.fedoraproject.org SSL Cert -# check_command check_ssl_cert!koji.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 71faa0c5fa..f5e09006a1 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-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy05-fpo, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 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, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 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, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 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, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 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, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 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, proxy09-wildcard, proxy10-fpo, proxy11-fpo, proxy12-wildcard + 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 bodhi2 check_command check_website_ssl!bodhi.fedoraproject.org!/!top testers max_check_attempts 8