Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

drop hosted03 from nagios and various other places

Browse source
This commit is contained in:
Kevin Fenzi 2017-04-11 18:01:34 +00:00
parent 6aa07ec754
commit e8f50d9336
13 changed files with 38 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/basset
View file

@ -12,8 +12,6 @@ custom_rules: [
# wiki01, wiki02 # 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.63 --dport 80 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 10.5.126.73 --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 fas_client_groups: sysadmin-main

7
inventory/host_vars/db-fas01.phx2.fedoraproject.org
View file

@ -43,12 +43,7 @@ custom_rules: [
# sundries ??? but this is noc01? # 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.41 --dport 5432 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 10.5.126.241 --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. # Large updates pushes cause lots of db threads doing the tag moves, so up this from default.
# #

6
playbooks/run_fasClient.yml
View file

@ -14,8 +14,8 @@
ignore_errors: true ignore_errors: true
when: inventory_hostname_short.startswith('bastion0') 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 - 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:hosted03.fedoraproject.org hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org
user: root user: root
gather_facts: False gather_facts: False
@ -25,7 +25,7 @@
ignore_errors: true ignore_errors: true
- name: run fasClient -i on the rest of hosts which only affects sysadmins - 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 user: root
gather_facts: False gather_facts: False

4
playbooks/run_fasClient_simple.yml
View file

@ -13,8 +13,8 @@
when: inventory_hostname_short.startswith('bastion0') when: inventory_hostname_short.startswith('bastion0')
ignore_errors: true ignore_errors: true
- name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated - 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:hosted03.fedoraproject.org hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org
user: root user: root
gather_facts: False gather_facts: False

1
roles/base/files/syncHttpLogs.sh
View file

@ -81,7 +81,6 @@ syncHttpLogs blockerbugs02.phx2.fedoraproject.org
syncHttpLogs blockerbugs01.stg.phx2.fedoraproject.org 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 people02.vpn.fedoraproject.org old syncHttpLogs people02.vpn.fedoraproject.org old
syncHttpLogs noc01.phx2.fedoraproject.org syncHttpLogs noc01.phx2.fedoraproject.org
syncHttpLogs download01.phx2.fedoraproject.org syncHttpLogs download01.phx2.fedoraproject.org

10
roles/nagios/server/files/nagios/hostgroups/hosted.cfg
View file

@ -1,5 +1,5 @@
define hostgroup { #define hostgroup {
hostgroup_name hosted # hostgroup_name hosted
alias Hosted Servers # alias Hosted Servers
members hosted03 # members hosted03
} #}

2
roles/nagios/server/files/nagios/hostgroups/nomail.cfg
View file

@ -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-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
} }

2
roles/nagios/server/files/nagios/hostgroups/vpnclients.cfg
View file

@ -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,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
} }

14
roles/nagios/server/files/nagios/hosts/hosted03.cfg
View file

@ -1,7 +1,7 @@
define host { #define host {
host_name hosted03 # host_name hosted03
alias hosted03.fedoraproject.org # alias hosted03.fedoraproject.org
use defaulttemplate # use defaulttemplate
address 140.211.169.199 # address 140.211.169.199
parents osuosl03 # parents osuosl03
} #}

16
roles/nagios/server/files/nagios/servicedeps/nrpe.cfg
View file

@ -1,11 +1,11 @@
define servicedependency { #define servicedependency {
host_name hosted03 # host_name hosted03
service_description nrpe # service_description nrpe
dependent_host_name hosted03 # dependent_host_name hosted03
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 hosted04 # host_name hosted04

2
roles/nagios/server/files/nagios/services/nrpe.cfg
View file

@ -1,5 +1,5 @@
define service { 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 service_description nrpe
check_command test_nrpe check_command test_nrpe
max_check_attempts 2 max_check_attempts 2

16
roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
View file

@ -1,11 +1,11 @@
define servicedependency { #define servicedependency {
host_name hosted03 # host_name hosted03
service_description nrpe # service_description nrpe
dependent_host_name hosted03 # dependent_host_name hosted03
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 hosted04 # host_name hosted04

2
roles/nagios_server/files/nagios/services/nrpe.cfg
View file

@ -1,5 +1,5 @@
define service { 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 service_description nrpe
check_command test_nrpe check_command test_nrpe
max_check_attempts 2 max_check_attempts 2