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

fix cloud nagios

Browse source
This commit is contained in:
Stephen Smoogen 2020-03-19 16:14:55 +00:00 • committed by Pierre-Yves Chibon
parent b15745a15e
commit 8b9c9a395b
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/cloud
View file

@ -10,7 +10,6 @@ virthost-os02.fedorainfracloud.org
virthost-os03.fedorainfracloud.org
storinator01.fedorainfracloud.org
cloudvmhost-aarch64-01.fedorainfracloud.org
cloud-noc01.fedorainfracloud.org
##
## New Community Hardware
@ -18,6 +17,14 @@ cloud-noc01.fedorainfracloud.org
os-proxy01.fedorainfracloud.org
os-proxy02.fedorainfracloud.org
[cloud_phx2_guests]
cloud-noc01.fedorainfracloud.org
armv7-test01.fedorainfracloud.org
armv7-test02.fedorainfracloud.org
aarch64-test01.fedorainfracloud.org
aarch64-test02.fedorainfracloud.org
[cloud_aws]
iddev.fedorainfracloud.org
rawhide-test.fedorainfracloud.org
@ -57,3 +64,4 @@ ppc64le-test.fedorainfracloud.org
[cloud:children]
cloud_phx2
cloud_aws
cloud_phx2_guests

30
roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
View file

@ -14,7 +14,35 @@ define host {
{% if hostvars[host].eth0_ip is defined %}
address {{ hostvars[host].eth0_ip }}
{% elif hostvars[host].ansible_default_ipv4 is defined %}
{% if hostvars[host].ansible_default_ipv4.address is defined and host not in groups['cloud_phx2'] %}
{% if hostvars[host].ansible_default_ipv4.address is defined %}
address {{ hostvars[host].ansible_default_ipv4.address }}
{% endif %}
{% else %}
address {{ host }}
{% endif %}
{% if hostvars[host].datacenter is defined %}
parents cloud-gw
{% endif %}
}
{% endfor %}
{% for host in groups['cloud_phx2_guests']|sort %}
define host {
{% if hostvars[host].nagios_Check_Services['nrpe'] and vars['nagios_location'] == 'internal' %}
use defaulttemplate
{% else %}
use mincheck
{% endif %}
host_name {{ host }}
{% if hostvars[host].ansible_hostname is defined %}
alias {{ hostvars[host].ansible_hostname }}
{% else %}
alias {{ host }}
{% endif %}
{% if hostvars[host].eth0_ip is defined %}
address {{ hostvars[host].eth0_ip }}
{% elif hostvars[host].ansible_default_ipv4 is defined %}
{% if hostvars[host].ansible_default_ipv4.address is defined %}
address {{ hostvars[host].ansible_default_ipv4.address }}
{% endif %}
{% else %}