From 330a8e4a1dee915f6a7dbab9e96b61fad4013f1e Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 27 Aug 2018 22:44:54 +0000 Subject: [PATCH] and this should make our mail easier to read --- inventory/group_vars/all | 2 +- inventory/group_vars/bastion | 3 ++- inventory/group_vars/builders | 1 + inventory/group_vars/builders-stg | 1 + inventory/group_vars/cloud | 1 + inventory/group_vars/faf-stg | 1 + inventory/group_vars/newcloud | 2 +- inventory/group_vars/os-masters | 1 + inventory/group_vars/os-masters-stg | 1 + inventory/group_vars/os-nodes | 1 + inventory/group_vars/os-nodes-stg | 1 + inventory/group_vars/retrace-stg | 1 + inventory/group_vars/sign-vault | 2 +- inventory/group_vars/smtp-mm | 4 ++++ inventory/host_vars/batcave13.rdu2.fedoraproject.org | 1 + inventory/host_vars/download-rdu01.fedoraproject.org | 1 + inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org | 1 + inventory/host_vars/fed-cloud01.cloud.fedoraproject.org | 1 + inventory/host_vars/fed-cloud02.cloud.fedoraproject.org | 1 + inventory/host_vars/ns13.rdu2.fedoraproject.org | 1 + inventory/host_vars/osbs-control01.phx2.fedoraproject.org | 1 + inventory/host_vars/relay-stg.ci.centos.org | 2 +- inventory/host_vars/relay.ci.centos.org | 2 +- inventory/host_vars/undercloud02.cloud.fedoraproject.org | 2 +- inventory/host_vars/virthost-rdu01.fedoraproject.org | 1 + roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 | 2 +- 26 files changed, 30 insertions(+), 8 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 3388e07774..8c8d881145 100644 --- a/inventory/group_vars/all +++ b/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 diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index 3d150c111e..1e8e32c923 100644 --- a/inventory/group_vars/bastion +++ b/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 diff --git a/inventory/group_vars/builders b/inventory/group_vars/builders index c22c3870a9..f286a2fb97 100644 --- a/inventory/group_vars/builders +++ b/inventory/group_vars/builders @@ -5,3 +5,4 @@ nagios_Check_Services: nrpe: false swap: false + mail: false diff --git a/inventory/group_vars/builders-stg b/inventory/group_vars/builders-stg index c22c3870a9..f286a2fb97 100644 --- a/inventory/group_vars/builders-stg +++ b/inventory/group_vars/builders-stg @@ -5,3 +5,4 @@ nagios_Check_Services: nrpe: false swap: false + mail: false diff --git a/inventory/group_vars/cloud b/inventory/group_vars/cloud index daa307cee8..705a2186e4 100644 --- a/inventory/group_vars/cloud +++ b/inventory/group_vars/cloud @@ -1,5 +1,6 @@ --- nagios_Check_Services: + mail: false nrpe: false swap: false datacenter: cloud diff --git a/inventory/group_vars/faf-stg b/inventory/group_vars/faf-stg index fda1fc1650..8a062493c6 100644 --- a/inventory/group_vars/faf-stg +++ b/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 diff --git a/inventory/group_vars/newcloud b/inventory/group_vars/newcloud index 45b6b607b6..7c44caf35c 100644 --- a/inventory/group_vars/newcloud +++ b/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 diff --git a/inventory/group_vars/os-masters b/inventory/group_vars/os-masters index 4f9891d8ad..16298ca729 100644 --- a/inventory/group_vars/os-masters +++ b/inventory/group_vars/os-masters @@ -6,3 +6,4 @@ swap: false nagios_Check_Services: swap: false nrpe: false + mail: false diff --git a/inventory/group_vars/os-masters-stg b/inventory/group_vars/os-masters-stg index 3b850a08b4..661aafd42b 100644 --- a/inventory/group_vars/os-masters-stg +++ b/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 diff --git a/inventory/group_vars/os-nodes b/inventory/group_vars/os-nodes index 4f9891d8ad..16298ca729 100644 --- a/inventory/group_vars/os-nodes +++ b/inventory/group_vars/os-nodes @@ -6,3 +6,4 @@ swap: false nagios_Check_Services: swap: false nrpe: false + mail: false diff --git a/inventory/group_vars/os-nodes-stg b/inventory/group_vars/os-nodes-stg index 3b850a08b4..661aafd42b 100644 --- a/inventory/group_vars/os-nodes-stg +++ b/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 diff --git a/inventory/group_vars/retrace-stg b/inventory/group_vars/retrace-stg index 5701a48b07..1546b890bc 100644 --- a/inventory/group_vars/retrace-stg +++ b/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 diff --git a/inventory/group_vars/sign-vault b/inventory/group_vars/sign-vault index 59912071ee..6ca3adcbd3 100644 --- a/inventory/group_vars/sign-vault +++ b/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 diff --git a/inventory/group_vars/smtp-mm b/inventory/group_vars/smtp-mm index 5026f332f7..ac51a7938a 100644 --- a/inventory/group_vars/smtp-mm +++ b/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 diff --git a/inventory/host_vars/batcave13.rdu2.fedoraproject.org b/inventory/host_vars/batcave13.rdu2.fedoraproject.org index dcbd9c85bc..54dddc5115 100644 --- a/inventory/host_vars/batcave13.rdu2.fedoraproject.org +++ b/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 diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org index aaa4f83e02..b191d87481 100644 --- a/inventory/host_vars/download-rdu01.fedoraproject.org +++ b/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 diff --git a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org b/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org index 8ea089496d..032f6906ac 100644 --- a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org +++ b/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 diff --git a/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org b/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org index 3589a63061..ce54999840 100644 --- a/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org +++ b/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org @@ -1,4 +1,5 @@ --- nagios_Check_Services: + mail: false nrpe: false swap: false diff --git a/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org b/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org index 3589a63061..ce54999840 100644 --- a/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org +++ b/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org @@ -1,4 +1,5 @@ --- nagios_Check_Services: + mail: false nrpe: false swap: false diff --git a/inventory/host_vars/ns13.rdu2.fedoraproject.org b/inventory/host_vars/ns13.rdu2.fedoraproject.org index 42d5ae003e..db8de347ea 100644 --- a/inventory/host_vars/ns13.rdu2.fedoraproject.org +++ b/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 diff --git a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org b/inventory/host_vars/osbs-control01.phx2.fedoraproject.org index 87afbeea9a..664fdec6b3 100644 --- a/inventory/host_vars/osbs-control01.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-control01.phx2.fedoraproject.org @@ -16,3 +16,4 @@ max_mem_size: 4096 nagios_Check_Services: nrpe: false + mail: false diff --git a/inventory/host_vars/relay-stg.ci.centos.org b/inventory/host_vars/relay-stg.ci.centos.org index d24ffdb3d5..50248bcf68 100644 --- a/inventory/host_vars/relay-stg.ci.centos.org +++ b/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 diff --git a/inventory/host_vars/relay.ci.centos.org b/inventory/host_vars/relay.ci.centos.org index 8c98190eb6..2648a8d162 100644 --- a/inventory/host_vars/relay.ci.centos.org +++ b/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 diff --git a/inventory/host_vars/undercloud02.cloud.fedoraproject.org b/inventory/host_vars/undercloud02.cloud.fedoraproject.org index 7e7d3b0e27..1adcb27f86 100644 --- a/inventory/host_vars/undercloud02.cloud.fedoraproject.org +++ b/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 diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org index 2334323bd0..50b5998788 100644 --- a/inventory/host_vars/virthost-rdu01.fedoraproject.org +++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org @@ -16,3 +16,4 @@ public_ip: 209.132.190.11 nagios_Check_Services: nrpe: false + mail: false diff --git a/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2 index b6187aedbc..53df68536c 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 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 %} }