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

Merge branch 'master' of ssh://pagure.io/fedora-infra/ansible

Browse source
This commit is contained in:
Mark O'Brien 2020-06-09 15:45:46 +01:00
commit c61b0c3c96
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg
View file

@ -9,9 +9,9 @@ define servicedependency {
} }
define servicedependency { define servicedependency {
host_name 209.132.181.16-phx2 host_name 38.145.60.20-iad2
service_description https service_description https
dependent_host_name 209.132.181.16-phx2 dependent_host_name 38.145.60.20-iad2
dependent_service_description bodhi, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki dependent_service_description bodhi, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki
notification_failure_criteria w,c notification_failure_criteria w,c
execution_failure_criteria w,c execution_failure_criteria w,c

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

@ -1,5 +1,5 @@
define service { define service {
host_name bastion02.iad2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org host_name bastion01.iad2.fedoraproject.org, sundries01.iad2.fedoraproject.org, wiki01.iad2.fedoraproject.org
service_description nrpe service_description nrpe
check_command test_nrpe check_command test_nrpe
max_check_attempts 2 max_check_attempts 2

8
roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
View file

@ -140,12 +140,10 @@ define host {
alias iad2 cage gateway alias iad2 cage gateway
use mincheck use mincheck
check_command check-host-alive4 check_command check-host-alive4
address 209.132.185.254 {% if vars['nagios_location'] == 'iad2_internal' %}
{% if vars['nagios_location'] == 'phx2_internal' %} address 10.3.163.254
parents phx2-gw
{% elif vars['nagios_location'] == 'iad2_internal' %}
parents iad2-gw
{% else %} {% else %}
address 209.132.185.254
parents ibiblio-gw parents ibiblio-gw
{% endif %} {% endif %}