From e8f50d9336fa66013ab5e0382674895fcfae1496 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 11 Apr 2017 18:01:34 +0000 Subject: [PATCH] drop hosted03 from nagios and various other places --- inventory/group_vars/basset | 2 -- .../host_vars/db-fas01.phx2.fedoraproject.org | 7 +------ playbooks/run_fasClient.yml | 6 +++--- playbooks/run_fasClient_simple.yml | 4 ++-- roles/base/files/syncHttpLogs.sh | 1 - .../server/files/nagios/hostgroups/hosted.cfg | 10 +++++----- .../server/files/nagios/hostgroups/nomail.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../server/files/nagios/hosts/hosted03.cfg | 14 +++++++------- .../server/files/nagios/servicedeps/nrpe.cfg | 16 ++++++++-------- .../nagios/server/files/nagios/services/nrpe.cfg | 2 +- .../files/nagios/servicedeps/nrpe.cfg | 16 ++++++++-------- .../nagios_server/files/nagios/services/nrpe.cfg | 2 +- 13 files changed, 38 insertions(+), 46 deletions(-) diff --git a/inventory/group_vars/basset b/inventory/group_vars/basset index 2636fc7851..380cc934d8 100644 --- a/inventory/group_vars/basset +++ b/inventory/group_vars/basset @@ -12,8 +12,6 @@ custom_rules: [ # wiki01, wiki02 '-A INPUT -p tcp -m tcp -s 10.5.126.63 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.73 --dport 80 -j ACCEPT', - # hosted03.vpn - '-A INPUT -p tcp -m tcp -s 192.168.1.16 --dport 80 -j ACCEPT', ] fas_client_groups: sysadmin-main diff --git a/inventory/host_vars/db-fas01.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.phx2.fedoraproject.org index b257a1bc79..6144c05a99 100644 --- a/inventory/host_vars/db-fas01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.phx2.fedoraproject.org @@ -43,12 +43,7 @@ custom_rules: [ # sundries ??? but this is noc01? '-A INPUT -p tcp -m tcp -s 10.5.126.41 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.241 --dport 5432 -j ACCEPT', - - # hosted03 and hosted04 (over the vpn) - '-A INPUT -p tcp -m tcp -s 192.168.1.16 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 192.168.1.102 --dport 5432 -j ACCEPT', - ] - +] # # Large updates pushes cause lots of db threads doing the tag moves, so up this from default. # diff --git a/playbooks/run_fasClient.yml b/playbooks/run_fasClient.yml index 4b058305f8..4849ba78a6 100644 --- a/playbooks/run_fasClient.yml +++ b/playbooks/run_fasClient.yml @@ -14,8 +14,8 @@ ignore_errors: true when: inventory_hostname_short.startswith('bastion0') -- name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated - hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org +- name: run fasClient on people and pkgs first as these are the ones most people want updated + hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org user: root gather_facts: False @@ -25,7 +25,7 @@ ignore_errors: true - name: run fasClient -i on the rest of hosts which only affects sysadmins - hosts: all:!builders:!persistent-cloud:!jenkins-master:!jenkins-slave:!*composer*:!people*:!pkgs02*:!hosted03*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!ppc-hub*:!bkernel*:!fed-cloud01*:!fed-cloud02*:!releng-secondary:!dopr-dev.cloud.fedoraproject.org:!copr-keygen-dev.cloud.fedoraproject.org + hosts: all:!builders:!*cloud*:!*composer*:!people*:!pkgs02*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!ppc-hub*:!bkernel*:!fed-cloud01*:!fed-cloud02*:!releng-secondary user: root gather_facts: False diff --git a/playbooks/run_fasClient_simple.yml b/playbooks/run_fasClient_simple.yml index 25caafb380..8176d978b6 100644 --- a/playbooks/run_fasClient_simple.yml +++ b/playbooks/run_fasClient_simple.yml @@ -13,8 +13,8 @@ when: inventory_hostname_short.startswith('bastion0') ignore_errors: true -- name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated - hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org +- name: run fasClient on people and pkgs first as these are the ones most people want updated + hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org user: root gather_facts: False diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 10c26ef739..dc1fcdbe61 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -81,7 +81,6 @@ syncHttpLogs blockerbugs02.phx2.fedoraproject.org syncHttpLogs blockerbugs01.stg.phx2.fedoraproject.org syncHttpLogs value01.phx2.fedoraproject.org syncHttpLogs secondary01 -syncHttpLogs hosted03.vpn.fedoraproject.org old syncHttpLogs people02.vpn.fedoraproject.org old syncHttpLogs noc01.phx2.fedoraproject.org syncHttpLogs download01.phx2.fedoraproject.org diff --git a/roles/nagios/server/files/nagios/hostgroups/hosted.cfg b/roles/nagios/server/files/nagios/hostgroups/hosted.cfg index ff3a077472..cd6479ae95 100644 --- a/roles/nagios/server/files/nagios/hostgroups/hosted.cfg +++ b/roles/nagios/server/files/nagios/hostgroups/hosted.cfg @@ -1,5 +1,5 @@ -define hostgroup { - hostgroup_name hosted - alias Hosted Servers - members hosted03 -} +#define hostgroup { +# hostgroup_name hosted +# alias Hosted Servers +# members hosted03 +#} diff --git a/roles/nagios/server/files/nagios/hostgroups/nomail.cfg b/roles/nagios/server/files/nagios/hostgroups/nomail.cfg index 5eca537762..ac300642ae 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, !backup01, !fas01.stg, !koji01.stg, !pkgs01.stg, !proxy01.stg, !bodhi-backend01.stg, !value01.stg, !smtp-mm-tummy01, !smtp-mm-ib01, !smtp-mm-osuosl01, !hosted03, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bvirthost01.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,!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,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !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-osuosl01, !proxy01, !proxy01, !proxy02, !proxy02, !proxy03, !proxy04, !proxy05, !proxy06, !proxy08, !proxy08, !proxy09, !proxy10, !proxy11, !proxy12, !fwsm01-gw, !backup01.mgmt.fedoraproject.org,!bvirthost01.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,!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,!virthost12.mgmt.fedoraproject.org,!virthost14.mgmt.fedoraproject.org,!virthost15.mgmt.fedoraproject.org,!virthost16.mgmt.fedoraproject.org,!virthost17.mgmt.fedoraproject.org,!virthost18.mgmt.fedoraproject.org,!virthost19.mgmt.fedoraproject.org,!virthost20.mgmt.fedoraproject.org,!virthost21.mgmt.fedoraproject.org,!virthost22.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,!retrace01.qa,!sign-vault03,!sign-vault03.mgmt.fedoraproject.org,!sign-vault04,!sign-vault04.mgmt.fedoraproject.org, !arm01-builder00, !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-builder05, !arm02-builder06, !arm02-builder08, !arm02-builder09, !arm02-builder10, !arm02-builder11, !arm02-builder12, !arm02-builder13, !arm02-builder15, !arm02-builder16, !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-builder18, !arm04-builder19, !arm04-builder20, !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-01, !buildvmhost-02, !buildvmhost-03, !buildvmhost-04, !buildvmhost-12, !cloud-gw, !fed-cloud03.mgmt.fedoraproject.org, !fed-cloud04.mgmt.fedoraproject.org, !fed-cloud05.mgmt.fedoraproject.org, !fed-cloud06.mgmt.fedoraproject.org, !fed-cloud07.mgmt.fedoraproject.org, !fed-cloud08.mgmt.fedoraproject.org, !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 } diff --git a/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg index 1bb50d77dc..610be008a3 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,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,smtp-mm-osuosl01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 } diff --git a/roles/nagios/server/files/nagios/hosts/hosted03.cfg b/roles/nagios/server/files/nagios/hosts/hosted03.cfg index 08eb510f20..668e039c91 100644 --- a/roles/nagios/server/files/nagios/hosts/hosted03.cfg +++ b/roles/nagios/server/files/nagios/hosts/hosted03.cfg @@ -1,7 +1,7 @@ -define host { - host_name hosted03 - alias hosted03.fedoraproject.org - use defaulttemplate - address 140.211.169.199 - parents osuosl03 -} +#define host { +# host_name hosted03 +# alias hosted03.fedoraproject.org +# use defaulttemplate +# address 140.211.169.199 +# parents osuosl03 +#} diff --git a/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg index 304224f39e..1c5269db18 100644 --- a/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios/server/files/nagios/servicedeps/nrpe.cfg @@ -1,11 +1,11 @@ -define servicedependency { - host_name hosted03 - service_description nrpe - dependent_host_name hosted03 - dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap - notification_failure_criteria w,c - execution_failure_criteria w,c -} +#define servicedependency { +# host_name hosted03 +# service_description nrpe +# dependent_host_name hosted03 +# dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} #define servicedependency { # host_name hosted04 diff --git a/roles/nagios/server/files/nagios/services/nrpe.cfg b/roles/nagios/server/files/nagios/services/nrpe.cfg index 68dfce5f25..b16b7af34a 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, bastion02, bastion01, bastion-vpn, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg, magazine + host_name bastion02, bastion01, bastion-vpn, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg, magazine service_description nrpe check_command test_nrpe max_check_attempts 2 diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index 304224f39e..1c5269db18 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -1,11 +1,11 @@ -define servicedependency { - host_name hosted03 - service_description nrpe - dependent_host_name hosted03 - dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap - notification_failure_criteria w,c - execution_failure_criteria w,c -} +#define servicedependency { +# host_name hosted03 +# service_description nrpe +# dependent_host_name hosted03 +# dependent_service_description Disk Space /srv, Disk Space /, Total Processes, Zombie Processes, Cron Daemon, Check Raid, Swap +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} #define servicedependency { # host_name hosted04 diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index f7c048618a..7aead22b53 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.fedoraproject.org, bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries01.stg.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki01.stg.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org, pkgdb01.phx2.fedoraproject.org, pkgdb02.phx2.fedoraproject.org, pkgdb01.stg.phx2.fedoraproject.org, magazine.fedorainfracloud.org + host_name bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries01.stg.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki01.stg.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org, pkgdb01.phx2.fedoraproject.org, pkgdb02.phx2.fedoraproject.org, pkgdb01.stg.phx2.fedoraproject.org, magazine.fedorainfracloud.org service_description nrpe check_command test_nrpe max_check_attempts 2