From 28d323bfcf46196655a1984cff2f5eff9c62e332 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 27 Aug 2018 21:44:14 +0000 Subject: [PATCH] try to make nomail better --- inventory/group_vars/bastion | 2 ++ inventory/host_vars/download-rdu01.fedoraproject.org | 4 ++++ inventory/host_vars/osbs-control01.phx2.fedoraproject.org | 3 +++ inventory/host_vars/virthost-rdu01.fedoraproject.org | 3 +++ .../nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 | 5 +++-- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index f005363510..3d150c111e 100644 --- a/inventory/group_vars/bastion +++ b/inventory/group_vars/bastion @@ -55,3 +55,5 @@ csi_relationship: | - All incoming SMTP from phx2 and VPN, as well as outgoing SMTP, pass or are filtered here. - Bastion does not accept any mail outside phx2/vpn. +nagios_Check_Services: + nrpe: false diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org index 9cb0cbe8a4..aaa4f83e02 100644 --- a/inventory/host_vars/download-rdu01.fedoraproject.org +++ b/inventory/host_vars/download-rdu01.fedoraproject.org @@ -13,3 +13,7 @@ eth1_ip: 172.31.1.1 eth1_nm: 255.255.255.0 public_ip: 209.132.190.4 + +nagios_Check_Services: + nrpe: false + ping: true diff --git a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.phx2.fedoraproject.org index c9788e04e7..87afbeea9a 100644 --- a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-control01.phx2.fedoraproject.org @@ -13,3 +13,6 @@ datacenter: phx2 mem_size: 4096 max_mem_size: 4096 + +nagios_Check_Services: + nrpe: false diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org index 70bf538d09..2334323bd0 100644 --- a/inventory/host_vars/virthost-rdu01.fedoraproject.org +++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org @@ -13,3 +13,6 @@ br1_nm: 255.255.255.0 vpn: true public_ip: 209.132.190.11 + +nagios_Check_Services: + nrpe: false diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index 881b950617..0fc9323c61 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 @@ -1,6 +1,7 @@ define hostgroup { hostgroup_name nomail - alias No Mail - members *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion']|sort %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm']|sort %}!{{host}}, {% endfor %} {% for host in groups['builders']|sort %}!{{host}},{% endfor %} {% for host in groups['builders-stg']|sort %}!{{host}},{% endfor %} {% for host in groups['cloud']|sort %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited']|sort %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts']|sort %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + alias Detect For 0 Mail In Queue +# members *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion']|sort %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm']|sort %}!{{host}}, {% endfor %} {% for host in groups['builders']|sort %}!{{host}},{% endfor %} {% for host in groups['builders-stg']|sort %}!{{host}},{% endfor %} {% for host in groups['cloud']|sort %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited']|sort %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts']|sort %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} + members {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}{{host}}, {% endif %}{% endfor %} }