diff --git a/inventory/hardware b/inventory/hardware index b487e5848f..d245370c86 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -4,8 +4,8 @@ ibiblio02.fedoraproject.org ibiblio05.fedoraproject.org # ssh often disabled #autosign02.iad2.fedoraproject.org -virthost-cc-rdu02.fedoraproject.org vmhost-x86-cc01.rdu-cc.fedoraproject.org +vmhost-x86-cc02.rdu-cc.fedoraproject.org vmhost-x86-cc03.rdu-cc.fedoraproject.org vmhost-x86-cc05.rdu-cc.fedoraproject.org vmhost-x86-cc06.rdu-cc.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index 0d5bc606c4..2dfa400408 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -74,8 +74,8 @@ ibiblio02.fedoraproject.org ibiblio05.fedoraproject.org internetx02.fedoraproject.org osuosl02.fedoraproject.org -virthost-cc-rdu02.fedoraproject.org vmhost-x86-cc01.rdu-cc.fedoraproject.org +vmhost-x86-cc02.rdu-cc.fedoraproject.org vmhost-x86-cc03.rdu-cc.fedoraproject.org vmhost-x86-cc06.rdu-cc.fedoraproject.org vmhost-x86-cc05.rdu-cc.fedoraproject.org diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index ccea18d76e..e9f5d01af6 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -2,7 +2,6 @@ LoadPlugin ping Host "vmhost-x86-cc01.rdu-cc.fedoraproject.org" - Host "virthost-cc-rdu02.fedoraproject.org" Host "osuosl02.fedoraproject.org" Host "ibiblio02.fedoraproject.org" Host "ibiblio05.fedoraproject.org" diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg index 29ef4a7093..b974a98933 100644 --- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg @@ -44,15 +44,6 @@ define servicedependency { execution_failure_criteria w,c } -define servicedependency { - host_name 8.43.85.73-virthost-cc-rdu02 - service_description http - dependent_host_name 8.43.85.73-virthost-cc-rdu02 - dependent_service_description fedoraproject.org, fedoraproject.org - wiki - notification_failure_criteria w,c - execution_failure_criteria w,c -} - define servicedependency { host_name 152.19.134.142-ibiblio service_description http