From d9e9601769b55c8095a09ee55a6f82aff99f472b Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Thu, 10 Jul 2014 23:07:55 +0000 Subject: [PATCH] sync nagios files from puppet Signed-off-by: Ricky Elrod --- roles/nagios_server/files/nagios/hostgroups/nomail.cfg | 2 +- roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg | 2 +- roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hosts/smtp-mm-coloamer01.cfg | 7 +++++++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg diff --git a/roles/nagios_server/files/nagios/hostgroups/nomail.cfg b/roles/nagios_server/files/nagios/hostgroups/nomail.cfg index 169fddaf4e..f73b6df7ee 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, !hosted03, !hosted04, !proxy01-fpo, !proxy01-wildcard, !proxy02-fpo, !proxy02-wildcard, !proxy03-fpo, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02-mgmt, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost04-mgmt,!bvirthost05-mgmt,!bvirthost07-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!atomic01-mgmt,!virthost12-mgmt,!virthost14-mgmt,!virthost15-mgmt,!autoqa01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!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, !proxy03-wildcard, !proxy04-fpo, !proxy04-wildcard, !proxy06-fpo, !proxy06-wildcard, !proxy07-fpo, !proxy07-wildcard, !proxy08-fpo, !proxy08-wildcard, !bc02-mgmt, !fwsm01-gw, !backup03-mgmt,!bc02-mgmt,!bvirthost01-mgmt,!bvirthost04-mgmt,!bvirthost05-mgmt,!bvirthost07-mgmt,!download01-mgmt,!download02-mgmt,!download03-mgmt,!download04-mgmt,!download05-mgmt,!qa01-mgmt,!qa02-mgmt,!qa03-mgmt,!qa04-mgmt,!qa05-mgmt,!qa06-mgmt,!qa07-mgmt,!qa08-mgmt,!tape02-mgmt,!virthost-comm01-mgmt,!virthost01-mgmt,!virthost02-mgmt,!virthost03-mgmt,!virthost04-mgmt,!virthost05-mgmt,!virthost06-mgmt,!virthost07-mgmt,!virthost08-mgmt,!virthost09-mgmt,!virthost10-mgmt,!atomic01-mgmt,!virthost12-mgmt,!virthost14-mgmt,!virthost15-mgmt,!autoqa01,!ibiblio-gw,!packages03,!packages04,!status-fedora2, !virthost-comm02-mgmt,!ppc-hub,!ppc-composer,!retrace01.qa,!sign-vault03,!sign-vault03-mgmt,!sign-vault04,!sign-vault04-mgmt,!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/smtp-mm.cfg b/roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg index 29982a6c46..8b3a353baf 100644 --- a/roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/smtp-mm.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name smtp-mm alias smtp-mm - members smtp-mm-ib01,smtp-mm-tummy01 + members smtp-mm-ib01,smtp-mm-tummy01,smtp-mm-coloamer01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 408bd6335f..b5f45370b2 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,telia01,unbound-telia01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,telia01,unbound-telia01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01 } diff --git a/roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg b/roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg new file mode 100644 index 0000000000..07c09db628 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/smtp-mm-coloamer01.cfg @@ -0,0 +1,7 @@ +define host { + host_name smtp-mm-coloamer01 + alias smtp-mm-coloamer01.fedoraproject.org + use defaulttemplate + address smtp-mm-coloamer01.fedoraproject.org + parents coloamer01 +}