diff --git a/inventory/inventory b/inventory/inventory index 519fe02aa8..ccd19e0dfb 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -49,7 +49,6 @@ ask01.stg.phx2.fedoraproject.org atomic01.qa.fedoraproject.org [backup] -backup02.fedoraproject.org backup03.phx2.fedoraproject.org [badges-backend] diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 0b1d866da0..af5227c131 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,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,osuosl03,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 } diff --git a/roles/nagios_server/files/nagios/hosts/backup02.cfg b/roles/nagios_server/files/nagios/hosts/backup02.cfg index d377b6e72f..3b3bbfb43b 100644 --- a/roles/nagios_server/files/nagios/hosts/backup02.cfg +++ b/roles/nagios_server/files/nagios/hosts/backup02.cfg @@ -1,7 +1,7 @@ -define host { - host_name backup02 - alias backup02.fedoraproject.org - use defaulttemplate - address backup02.fedoraproject.org - parents ibiblio03 -} +#define host { +# host_name backup02 +# alias backup02.fedoraproject.org +# use defaulttemplate +# address backup02.fedoraproject.org +# parents ibiblio03 +#} diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index eac7b00076..b7a30564c6 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -43,15 +43,6 @@ define servicedependency { execution_failure_criteria w,c } -define servicedependency { - host_name backup02 - service_description nrpe - dependent_host_name backup02 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - define servicedependency { host_name bapp02 service_description nrpe diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index ab88d0a515..2736ea297d 100644 --- a/roles/nagios_server/files/nagios/services/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name hosted03, hosted04, backup02, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg + host_name hosted03, hosted04, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg service_description nrpe check_command test_nrpe max_check_attempts 2