From a17efbbca987260a069816def0d4cd50307eba22 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 1 May 2017 20:37:30 +0000 Subject: [PATCH] ok lets try this with more feeling --- inventory/group_vars/nagios-new | 82 +++++++++++++++++-- .../templates/nagios/hostgroups/nomail.cfg.j2 | 2 +- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/inventory/group_vars/nagios-new b/inventory/group_vars/nagios-new index 8045eeb5c5..ce28b7ce58 100644 --- a/inventory/group_vars/nagios-new +++ b/inventory/group_vars/nagios-new @@ -28,38 +28,51 @@ csi_primary_contact: Fedora Admins - admin@fedoraproject.org csi_purpose: Monitoring system phx2_management_hosts: + - apc-rack16-a.mgmt.fedoraproject.org + - apc-rack16-b.mgmt.fedoraproject.org + - apc-rackXX-Y.mgmt.fedoraproject.org - autocloud-backend-libvirt.mgmt.fedoraproject.org - autocloud-backend-vbox.mgmt.fedoraproject.org - - autosign01.mgmt.fedoraproject.org + - autosign02.mgmt.fedoraproject.org - backup01.mgmt.fedoraproject.org - beaker-client01.mgmt.fedoraproject.org - beaker-client02.mgmt.fedoraproject.org + - bkernel01.mgmt.fedoraproject.org + - bkernel02.mgmt.fedoraproject.org - bvirthost01.mgmt.fedoraproject.org - - cosmos01.mgmt.fedoraproject.org + - bvirthost04.mgmt.fedoraproject.org + - cloud-eql02.mgmt.fedoraproject.org + - cosmos02.mgmt.fedoraproject.org - data-analysis01.mgmt.fedoraproject.org - - dell-fx01.mgmt.fedoraproject.org - dell-fx01-01.mgmt.fedoraproject.org - dell-fx01-02.mgmt.fedoraproject.org - dell-fx01-03.mgmt.fedoraproject.org - dell-fx01-04.mgmt.fedoraproject.org - dell-fx01-05.mgmt.fedoraproject.org - - dell-fx01-06.mgmt.fedoraproject.org - dell-fx01-07.mgmt.fedoraproject.org - dell-fx01-08.mgmt.fedoraproject.org - - dell-fx02.mgmt.fedoraproject.org + - dell-fx01.mgmt.fedoraproject.org - dell-fx02-01.mgmt.fedoraproject.org - dell-fx02-02.mgmt.fedoraproject.org - dell-fx02-03.mgmt.fedoraproject.org - dell-fx02-04.mgmt.fedoraproject.org - dell-fx02-05.mgmt.fedoraproject.org - dell-fx02-06.mgmt.fedoraproject.org + - dell-fx02-06.mgmt.fedoraproject.org - dell-fx02-07.mgmt.fedoraproject.org - dell-fx02-08.mgmt.fedoraproject.org + - dell-fx02.mgmt.fedoraproject.org + - dell-fxqa01-01.mgmt.fedoraproject.org + - dell-fxqa01-02.mgmt.fedoraproject.org + - dell-fxqa01-03.mgmt.fedoraproject.org + - dell-fxqa01.mgmt.fedoraproject.org - download01.mgmt.fedoraproject.org - download02.mgmt.fedoraproject.org - download03.mgmt.fedoraproject.org - download04.mgmt.fedoraproject.org - download05.mgmt.fedoraproject.org + - fed-cloud-ppc01.mgmt.fedoraproject.org + - fed-cloud-ppc02.mgmt.fedoraproject.org - fed-cloud01.mgmt.fedoraproject.org - fed-cloud02.mgmt.fedoraproject.org - fed-cloud03.mgmt.fedoraproject.org @@ -76,33 +89,86 @@ phx2_management_hosts: - fed-cloud14.mgmt.fedoraproject.org - fed-cloud15.mgmt.fedoraproject.org - kvm01.mgmt.fedoraproject.org + - moonshot01-ilo.mgmt.fedoraproject.org + - moonshot01-sw1.mgmt.fedoraproject.org + - moonshot01-sw2.mgmt.fedoraproject.org - oldbox01.mgmt.fedoraproject.org + - oldbox02.mgmt.fedoraproject.org + - oldbox03.mgmt.fedoraproject.org + - oldbox04.mgmt.fedoraproject.org + - oldbox05.mgmt.fedoraproject.org + - opengear01.mgmt.fedoraproject.org + - opengear02.mgmt.fedoraproject.org + - ppc8-01-fsp.mgmt.fedoraproject.org + - ppc8-02-fsp.mgmt.fedoraproject.org + - ppc8-03-fsp.mgmt.fedoraproject.org + - ppc8-04-fsp.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 + - rack16-pdu-a.mgmt.fedoraproject.org + - rack16-pdu-b.mgmt.fedoraproject.org + - rack17-pdu-a.mgmt.fedoraproject.org + - rack17-pdu-b.mgmt.fedoraproject.org + - rack46-pdu-a.mgmt.fedoraproject.org + - rack46-pdu-b.mgmt.fedoraproject.org + - rack46-serial.mgmt.fedoraproject.org + - rack47-pdu-a.mgmt.fedoraproject.org + - rack47-pdu-b.mgmt.fedoraproject.org - rack47-serial.mgmt.fedoraproject.org + - rack48-pdu-a.mgmt.fedoraproject.org + - rack48-pdu-b.mgmt.fedoraproject.org - rack48-serial.mgmt.fedoraproject.org + - rack49-pdu-a.mgmt.fedoraproject.org + - rack49-pdu-b.mgmt.fedoraproject.org + - rack49-serial.mgmt.fedoraproject.org + - rack50-kvm.mgmt.fedoraproject.org + - rack50-pdu-a.mgmt.fedoraproject.org + - rack50-pdu-b.mgmt.fedoraproject.org - rack50-serial.mgmt.fedoraproject.org + - rack51-bc02-sw1.mgmt.fedoraproject.org + - rack51-bc02-sw2.mgmt.fedoraproject.org + - rack51-pdu-a.mgmt.fedoraproject.org + - rack51-pdu-b.mgmt.fedoraproject.org - rack51-serial.mgmt.fedoraproject.org + - rack52-pdu-a.mgmt.fedoraproject.org + - rack52-pdu-b.mgmt.fedoraproject.org - rack52-serial.mgmt.fedoraproject.org + - rack53-pdu-a.mgmt.fedoraproject.org + - rack53-pdu-a.mgmt.fedoraproject.org + - rack53-serial.mgmt.fedoraproject.org + - rack58-pdu-a.mgmt.fedoraproject.org + - rack58-pdu-b.mgmt.fedoraproject.org - retrace01.mgmt.fedoraproject.org - retrace02.mgmt.fedoraproject.org + - rtr-mgmt-01.mgmt.fedoraproject.org + - sign-vault03.mgmt.fedoraproject.org + - sign-vault04.mgmt.fedoraproject.org - vhcloud01.mgmt.fedoraproject.org + - virthost-comm01.mgmt.fedoraproject.org + - virthost-comm02.mgmt.fedoraproject.org - virthost-comm03.mgmt.fedoraproject.org - virthost-comm04.mgmt.fedoraproject.org + - virthost-s390.mgmt.fedoraproject.org - virthost01.mgmt.fedoraproject.org - virthost02.mgmt.fedoraproject.org - virthost03.mgmt.fedoraproject.org - virthost04.mgmt.fedoraproject.org - virthost05.mgmt.fedoraproject.org - virthost06.mgmt.fedoraproject.org - - virthost07.mgmt.fedoraproject.org - - virthost09.mgmt.fedoraproject.org - - virthost10.mgmt.fedoraproject.org - virthost11.mgmt.fedoraproject.org + - virthost12.mgmt.fedoraproject.org + - virthost14.mgmt.fedoraproject.org - virthost15.mgmt.fedoraproject.org - virthost16.mgmt.fedoraproject.org - virthost17.mgmt.fedoraproject.org diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index 1cf37e7094..b40bf70ce7 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 @@ -1,6 +1,6 @@ define hostgroup { hostgroup_name nomail alias No Mail - members *, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in vars['builders'] %}!{{host}},{% endfor %} {% for host in vars['builders-stg'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members *, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} }