From b65c3b43e12beae9c4c22809986ff234db0f88b6 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Fri, 6 Feb 2015 02:18:33 +0000 Subject: [PATCH] and we do some nagios stuff I missed --- .../files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/servers.cfg | 2 +- .../files/nagios/hosts/proxy06-wildcard.cfg | 14 +++++++------- .../files/nagios/servicegroups/bodhi.cfg | 2 +- .../files/nagios/servicegroups/mirrorlist.cfg | 2 +- roles/nagios_server/files/nagios/services/ssl.cfg | 6 +++--- .../files/nagios/services/websites.cfg | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index a2ee755070..377509ac14 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, !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, !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 94f668986d..5f42a66b6e 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, !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, !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/proxy06-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg index 2c739866f4..e7894aff44 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg @@ -1,7 +1,7 @@ -define host { - host_name proxy06-wildcard - alias proxy06-wildcard.fedoraproject.org - use defaulttemplate - address 140.211.169.196 - parents proxy06 -} +# 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/servicegroups/bodhi.cfg b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg index 51ca9cffee..a6890aed35 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-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-fpo,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/mirrorlist.cfg b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg index f379cafb1d..c522800f5a 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-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-fpo,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/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg index 1ed76af203..448916ae73 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-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, 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-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description translate.fedoraproject.org SSL Cert check_command check_ssl_cert!translate.fedoraproject.org!60 use defaulttemplate @@ -41,7 +41,7 @@ define service { } #define service { -# host_name proxy01-wildcard, proxy02-wildcard, proxy03-wildcard, proxy04-wildcard, proxy06-wildcard, proxy08-wildcard +# host_name proxy01-wildcard, proxy02-wildcard, proxy03-wildcard, proxy04-wildcard, proxy06-fpo, proxy08-wildcard # 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 0278ae6261..eaa97c8ae5 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-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, 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-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, 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-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, 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-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, 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-fpo, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard + host_name proxy01-wildcard, proxy02-wildcard, proxy03-fpo, proxy04-fpo, proxy06-fpo, proxy07-wildcard, proxy08-wildcard, proxy09-wildcard service_description bodhi check_command check_website_ssl!admin.fedoraproject.org!/updates/!Latest max_check_attempts 8