From 4c936e6a457d5d1ab73b4ba13a01b5fbfd53a884 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 30 Nov 2017 20:02:48 +0000 Subject: [PATCH] and voila.. a viola. [Or maybe a fix to make noc02 work] --- inventory/inventory | 8 +++++++- .../templates/nagios/hostgroups/all-external.cfg.j2 | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index 7e18e73372..b2e9d2fc52 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -673,7 +673,7 @@ loopabull01.phx2.fedoraproject.org [loopabull-stg] loopabull01.stg.phx2.fedoraproject.org -[proxies] +[proxies-external] proxy01.phx2.fedoraproject.org proxy02.fedoraproject.org proxy03.fedoraproject.org @@ -688,9 +688,15 @@ proxy11.fedoraproject.org proxy12.fedoraproject.org proxy13.fedoraproject.org proxy14.fedoraproject.org + +[proxies-internal] proxy101.phx2.fedoraproject.org proxy110.phx2.fedoraproject.org +[proxies:children] +proxies-external +proxies-internal + [proxies-stg] proxy01.stg.phx2.fedoraproject.org diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 index cb4ab02e37..deddb0c4b3 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 @@ -15,6 +15,6 @@ define hostgroup { define hostgroup { hostgroup_name proxies alias Web Servers - members {% for host in groups["proxies"] %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} + members {% for host in groups["proxies-external"] %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} }