Drop hosted04 and collab04.
These were warm spares we haven't used in the last 2.5 years even once. Backups used to use them, but now backup from the main/prod instances. Also sort our parents on ibiblio hosts for vms we have moved.
This commit is contained in:
parent
81e5e399da
commit
aaaca2101c
14 changed files with 30 additions and 37 deletions
|
@ -1,4 +0,0 @@
|
||||||
---
|
|
||||||
host_backup_targets: ['/srv']
|
|
||||||
|
|
||||||
fedmsg_fqdn: hosted04.vpn.fedoraproject.org
|
|
|
@ -186,7 +186,6 @@ mailman01.stg.phx2.fedoraproject.org
|
||||||
|
|
||||||
[collab]
|
[collab]
|
||||||
collab03.fedoraproject.org
|
collab03.fedoraproject.org
|
||||||
collab04.fedoraproject.org
|
|
||||||
|
|
||||||
[releng]
|
[releng]
|
||||||
releng04.phx2.fedoraproject.org
|
releng04.phx2.fedoraproject.org
|
||||||
|
@ -284,7 +283,6 @@ lists-dev.cloud.fedoraproject.org
|
||||||
|
|
||||||
[hosted]
|
[hosted]
|
||||||
hosted03.fedoraproject.org
|
hosted03.fedoraproject.org
|
||||||
hosted04.fedoraproject.org
|
|
||||||
hosted-lists01.fedoraproject.org
|
hosted-lists01.fedoraproject.org
|
||||||
|
|
||||||
[hotness]
|
[hotness]
|
||||||
|
|
|
@ -83,7 +83,6 @@ syncHttpLogs blockerbugs01.stg.phx2.fedoraproject.org
|
||||||
syncHttpLogs value01.phx2.fedoraproject.org
|
syncHttpLogs value01.phx2.fedoraproject.org
|
||||||
syncHttpLogs secondary01
|
syncHttpLogs secondary01
|
||||||
syncHttpLogs hosted03.vpn.fedoraproject.org old
|
syncHttpLogs hosted03.vpn.fedoraproject.org old
|
||||||
syncHttpLogs hosted04.vpn.fedoraproject.org old
|
|
||||||
syncHttpLogs people01.vpn.fedoraproject.org old
|
syncHttpLogs people01.vpn.fedoraproject.org old
|
||||||
syncHttpLogs noc01.phx2.fedoraproject.org
|
syncHttpLogs noc01.phx2.fedoraproject.org
|
||||||
syncHttpLogs download01.phx2.fedoraproject.org
|
syncHttpLogs download01.phx2.fedoraproject.org
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
define hostgroup {
|
define hostgroup {
|
||||||
hostgroup_name hosted
|
hostgroup_name hosted
|
||||||
alias Hosted Servers
|
alias Hosted Servers
|
||||||
members hosted03,hosted04
|
members hosted03
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
define hostgroup {
|
define hostgroup {
|
||||||
hostgroup_name nomail
|
hostgroup_name nomail
|
||||||
alias No Mail
|
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-coloamer01, !hosted03, !hosted04, !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, !proxy09-wildcard, !proxy10-fpo, !proxy11-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,!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,!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-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-coloamer01, !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, !proxy09-wildcard, !proxy10-fpo, !proxy11-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,!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,!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-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
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,5 +5,5 @@
|
||||||
define hostgroup {
|
define hostgroup {
|
||||||
hostgroup_name vpnclients
|
hostgroup_name vpnclients
|
||||||
alias 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,torrent01,ibiblio03,ibiblio04,people01,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,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,proxy09,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
define host {
|
#define host {
|
||||||
host_name collab04
|
# host_name collab04
|
||||||
alias collab04.fedoraproject.org
|
# alias collab04.fedoraproject.org
|
||||||
use defaulttemplate
|
# use defaulttemplate
|
||||||
address 152.19.134.193
|
# address 152.19.134.193
|
||||||
parents ibiblio02
|
# parents ibiblio02
|
||||||
}
|
#}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
define host {
|
#define host {
|
||||||
host_name hosted04
|
# host_name hosted04
|
||||||
alias hosted04.fedoraproject.org
|
# alias hosted04.fedoraproject.org
|
||||||
use defaulttemplate
|
# use defaulttemplate
|
||||||
address 152.19.134.149
|
# address 152.19.134.149
|
||||||
parents ibiblio02
|
# parents ibiblio02
|
||||||
}
|
#}
|
||||||
|
|
|
@ -3,5 +3,5 @@ define host {
|
||||||
alias ns02.fedoraproject.org
|
alias ns02.fedoraproject.org
|
||||||
use defaulttemplate
|
use defaulttemplate
|
||||||
address ns02.fedoraproject.org
|
address ns02.fedoraproject.org
|
||||||
parents ibiblio02
|
parents ibiblio03
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,5 +3,5 @@ define host {
|
||||||
alias proxy04.fedoraproject.org
|
alias proxy04.fedoraproject.org
|
||||||
use defaulttemplate
|
use defaulttemplate
|
||||||
address proxy04.fedoraproject.org
|
address proxy04.fedoraproject.org
|
||||||
parents ibiblio02
|
parents ibiblio01
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,5 +3,5 @@ define host {
|
||||||
alias smtp-mm-ib01.fedoraproject.org
|
alias smtp-mm-ib01.fedoraproject.org
|
||||||
use defaulttemplate
|
use defaulttemplate
|
||||||
address smtp-mm-ib01.fedoraproject.org
|
address smtp-mm-ib01.fedoraproject.org
|
||||||
parents ibiblio02
|
parents ibiblio03
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,14 +7,14 @@ define servicedependency {
|
||||||
execution_failure_criteria w,c
|
execution_failure_criteria w,c
|
||||||
}
|
}
|
||||||
|
|
||||||
define servicedependency {
|
#define servicedependency {
|
||||||
host_name hosted04
|
# host_name hosted04
|
||||||
service_description nrpe
|
# service_description nrpe
|
||||||
dependent_host_name hosted04
|
# dependent_host_name hosted04
|
||||||
dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap
|
# dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap
|
||||||
notification_failure_criteria w,c
|
# notification_failure_criteria w,c
|
||||||
execution_failure_criteria w,c
|
# execution_failure_criteria w,c
|
||||||
}
|
#}
|
||||||
|
|
||||||
define servicedependency {
|
define servicedependency {
|
||||||
host_name pkgdb01
|
host_name pkgdb01
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
define servicegroup {
|
define servicegroup {
|
||||||
servicegroup_name fedorahosted
|
servicegroup_name fedorahosted
|
||||||
alias Fedora Hosted
|
alias Fedora Hosted
|
||||||
members hosted03,BZR,hosted03,GIT,hosted03,bzr.fedorahosted.org,hosted03,fedorahosted.org,hosted03,git.fedorahosted.org,hosted03,hg.fedorahosted.org,hosted03,svn.fedorahosted.org,hosted04,BZR,hosted04,GIT,hosted04,bzr.fedorahosted.org,hosted04,fedorahosted.org,hosted04,git.fedorahosted.org,hosted04,hg.fedorahosted.org,hosted04,svn.fedorahosted.org
|
members hosted03,BZR,hosted03,GIT,hosted03,bzr.fedorahosted.org,hosted03,fedorahosted.org,hosted03,git.fedorahosted.org,hosted03,hg.fedorahosted.org,hosted03,svn.fedorahosted.org
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
define service {
|
define service {
|
||||||
host_name hosted03, hosted04, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg
|
host_name hosted03, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg
|
||||||
service_description nrpe
|
service_description nrpe
|
||||||
check_command test_nrpe
|
check_command test_nrpe
|
||||||
max_check_attempts 2
|
max_check_attempts 2
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue