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

update nagios checks for http-accounts for ocp4 proxies only

Browse source 
Signed-off-by: Mark O Brien <markobri@redhat.com>
This commit is contained in:
Mark O Brien 2022-05-16 13:59:32 +01:00
parent b57ec0f90a
commit 28db0aa10f
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/inventory
View file

@ -534,6 +534,12 @@ proxy40.fedoraproject.org
proxy101.iad2.fedoraproject.org
proxy110.iad2.fedoraproject.org
[proxies_ocp4]
proxy01.iad2.fedoraproject.org
proxy10.iad2.fedoraproject.org
[proxies:children]
proxies_external
proxies_internal

11
roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
View file

@ -10,7 +10,7 @@ define hostgroup {
alias SMTP MailMan Servers
members {% for host in groups["smtp_mm"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %}
}
}
define hostgroup {
hostgroup_name proxies
@ -19,6 +19,13 @@ define hostgroup {
}
define hostgroup {
hostgroup_name ocp_proxies
alias OCP Web Servers
members {% for host in groups["proxies_ocp4"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %}
}
define hostgroup {
hostgroup_name unbound
alias External DNS
@ -31,7 +38,7 @@ define hostgroup {
define hostgroup{
hostgroup_name {{ key }}
alias {{ key }}
members {% for host in groups[key]|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %}
members {% for host in groups[key]|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, {% endif %}{% endfor %}
}
{% endif %}

6
roles/nagios_server/templates/nagios/services/websites.cfg.j2
View file

@ -60,7 +60,7 @@ define service {
}
define service {
hostgroup_name proxies
hostgroup_name ocp_proxies
service_description http-accounts
check_command check_website_ssl!accounts.fedoraproject.org!/healthz/ready!OK
use websitetemplate
@ -174,7 +174,7 @@ define service {
{% if vars['nagios_location'] == 'iad2_internal' %}
##
## Other Frontend Websites
## Other Frontend Websites
define service {
hostgroup_name badges_web
@ -284,7 +284,7 @@ define service {
}
## Internal services
## Internal services
define service {
hostgroup_name value