and this should make our mail easier to read

inventory/group_vars/all

@@ -264,7 +264,7 @@ createrepo: True
 
 # Nagios global variables
 nagios_Check_Services:
-  monitor: true
+  mail: true
   nrpe: true
   sshd: true
   named: false

inventory/group_vars/bastion

@@ -56,4 +56,5 @@ csi_relationship: |
   - Bastion does not accept any mail outside phx2/vpn.
 
 nagios_Check_Services:
-  nrpe: false
+  nrpe: true
+  mail: false

inventory/group_vars/builders

@@ -5,3 +5,4 @@
 nagios_Check_Services:
   nrpe: false
   swap: false
+  mail: false

inventory/group_vars/builders-stg

@@ -5,3 +5,4 @@
 nagios_Check_Services:
   nrpe: false
   swap: false
+  mail: false

inventory/group_vars/cloud

@@ -1,5 +1,6 @@
 ---
 nagios_Check_Services: 
+  mail: false
   nrpe: false
   swap: false
 datacenter: cloud

inventory/group_vars/faf-stg

@@ -6,6 +6,7 @@ tcp_ports: [ 80, 443 ]
 sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
 
 nagios_Check_Services:
+  mail: false
   nrpe: false
   swap: false
 

inventory/group_vars/newcloud

@@ -11,7 +11,7 @@ ansible_ifcfg_whitelist: ['eth1']
 baseiptables: false
 ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q cloud-noc01.cloud.fedoraproject.org"'
 nagios_Check_Services:
-  monitor: false
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/group_vars/os-masters

@@ -6,3 +6,4 @@ swap: false
 nagios_Check_Services:
   swap: false
   nrpe: false
+  mail: false

inventory/group_vars/os-masters-stg

@@ -6,3 +6,4 @@ os_app_url: app.os.stg.fedoraproject.org
 nagios_Check_Services:
   swap: false
   nrpe: false
+  mail: false

inventory/group_vars/os-nodes

@@ -6,3 +6,4 @@ swap: false
 nagios_Check_Services:
   swap: false
   nrpe: false
+  mail: false

inventory/group_vars/os-nodes-stg

@@ -6,3 +6,4 @@ os_app_url: app.os.stg.fedoraproject.org
 nagios_Check_Services:
   swap: false
   nrpe: false
+  mail: false

inventory/group_vars/retrace-stg

@@ -7,5 +7,6 @@ sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
 root_auth_users: msuchy
 
 nagios_Check_Services:
+  mail: false
   nrpe: false
   swap: false

inventory/group_vars/sign-vault

@@ -4,7 +4,7 @@ postfix_group: sign
 host_group: sign
 ansible_ifcfg_blacklist: true
 nagios_Check_Services:
-  monitor: false
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/group_vars/smtp-mm

@@ -14,3 +14,7 @@ fas_client_groups: sysadmin-noc,sysadmin-tools,fi-apprentice,sysadmin-veteran
 postfix_transport_filename: transports.mm-smtp
 postfix_group: smtp-mm
 vpn: true
+
+nagios_Check_Services:
+  nrpe: true
+  mail: false

inventory/host_vars/batcave13.rdu2.fedoraproject.org

@@ -26,6 +26,7 @@ postfix_group: vpn
 vpn: true
 
 nagios_Check_Services:
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/host_vars/download-rdu01.fedoraproject.org

@@ -15,5 +15,6 @@ eth1_nm: 255.255.255.0
 public_ip: 209.132.190.4
 
 nagios_Check_Services:
+  mail: false
   nrpe: false
   ping: true

inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org

@@ -12,6 +12,7 @@ vmhost: virthost04.stg.phx2.fedoraproject.org
 datacenter: phx2
 
 nagios_Check_Services: 
+  mail: false
   nrpe: false
   swap: false
 

inventory/host_vars/fed-cloud01.cloud.fedoraproject.org

@@ -1,4 +1,5 @@
 ---
 nagios_Check_Services:
+  mail: false
   nrpe: false
   swap: false

inventory/host_vars/fed-cloud02.cloud.fedoraproject.org

@@ -1,4 +1,5 @@
 ---
 nagios_Check_Services:
+  mail: false
   nrpe: false
   swap: false

inventory/host_vars/ns13.rdu2.fedoraproject.org

@@ -28,6 +28,7 @@ ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q root@bastion13.fedora
 
 nagios_Check_Services:
   nrpe: false
+  mail: false
   sshd: false
   swap: false
   ping: false

inventory/host_vars/osbs-control01.phx2.fedoraproject.org

@@ -16,3 +16,4 @@ max_mem_size: 4096
 
 nagios_Check_Services:
   nrpe: false
+  mail: false

inventory/host_vars/relay-stg.ci.centos.org

@@ -62,7 +62,7 @@ fedmsg_prefix: org.centos
 fedmsg_env: stg
 
 nagios_Check_Services:
-  monitor: false
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/host_vars/relay.ci.centos.org

@@ -62,7 +62,7 @@ fedmsg_prefix: org.centos
 fedmsg_env: prod
 
 nagios_Check_Services:
-  monitor: false
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/host_vars/undercloud02.cloud.fedoraproject.org

@@ -17,7 +17,7 @@ vmhost: cloud-noc01.cloud.fedoraproject.org
 datacenter: newcloud
 
 nagios_Check_Services:
-  monitor: false
+  mail: false
   nrpe: false
   sshd: false
   swap: false

inventory/host_vars/virthost-rdu01.fedoraproject.org

@@ -16,3 +16,4 @@ public_ip: 209.132.190.11
 
 nagios_Check_Services:
   nrpe: false
+  mail: false

roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2

@@ -1,6 +1,6 @@
 define hostgroup {
         hostgroup_name  nomail
         alias           Detect For 0 Mail In Queue
-        members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}{{host}}, {% endif %}{% endfor %}
+        members        {% for host in groups['all']|sort %}{% if hostvars[host].nagios_Check_Services['nrpe'] == true and hostvars[host].nagios_Check_Services['mail'] == true%}{{host}}, {% endif %}{% endfor %}
 
 }