From 311143b44342954bc2283c3be275e863f9d8b474 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 11 May 2020 14:54:49 -0700 Subject: [PATCH] iad2: nagios_server: Move all the iad2 hosts to a group, set nagios variables per group Right now we don't want noc01.phx2 to try and monitor hosts in iad2. So, we need to set some variables to get it to not do that. Move all the iad hosts into a seperate iad2 group and use that. Signed-off-by: Kevin Fenzi --- inventory/group_vars/iad2 | 13 +++++++++++++ inventory/group_vars/nagios | 1 + .../host_vars/bastion01.iad2.fedoraproject.org | 5 ----- .../host_vars/batcave01.iad2.fedoraproject.org | 5 ----- inventory/host_vars/log01.iad2.fedoraproject.org | 5 ----- inventory/host_vars/noc01.iad2.fedoraproject.org | 5 ----- inventory/host_vars/ns01.iad2.fedoraproject.org | 5 ----- inventory/host_vars/tang01.iad2.fedoraproject.org | 5 ----- inventory/host_vars/tang02.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-01.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-02.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-03.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-04.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-05.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-06.iad2.fedoraproject.org | 5 ----- .../host_vars/vmhost-x86-07.iad2.fedoraproject.org | 5 ----- inventory/inventory | 2 +- 17 files changed, 15 insertions(+), 71 deletions(-) create mode 100644 inventory/group_vars/iad2 diff --git a/inventory/group_vars/iad2 b/inventory/group_vars/iad2 new file mode 100644 index 0000000000..680d987649 --- /dev/null +++ b/inventory/group_vars/iad2 @@ -0,0 +1,13 @@ +--- +# group variables for all hosts in iad2 datacenter + +# for now, lets not monitor any of them from phx2. + +nagios_Can_Connect: false + +nagios_Check_Services: + mail: false + nrpe: false + sshd: false + swap: false + ping: false diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index ece4c893bd..d5dc48507d 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -140,3 +140,4 @@ exclude_hostgroups: - dbgserver_stg - virt_guest - virt_host + - iad2 diff --git a/inventory/host_vars/bastion01.iad2.fedoraproject.org b/inventory/host_vars/bastion01.iad2.fedoraproject.org index 42d1a56666..e75b1a07f3 100644 --- a/inventory/host_vars/bastion01.iad2.fedoraproject.org +++ b/inventory/host_vars/bastion01.iad2.fedoraproject.org @@ -17,8 +17,3 @@ vpn: false ssh_hostnames: - bastion.fedoraproject.org - bastion01.fedoraproject.org - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/batcave01.iad2.fedoraproject.org b/inventory/host_vars/batcave01.iad2.fedoraproject.org index 2f4d3975b1..4ebc1cd20d 100644 --- a/inventory/host_vars/batcave01.iad2.fedoraproject.org +++ b/inventory/host_vars/batcave01.iad2.fedoraproject.org @@ -28,8 +28,3 @@ sar_output_file: koji.json # SSH into batcave through VPN, like from bastion in a different DC. ssh_hostnames: - batcave01.vpn.fedoraproject.org - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/log01.iad2.fedoraproject.org b/inventory/host_vars/log01.iad2.fedoraproject.org index deca031355..7b1c26091b 100644 --- a/inventory/host_vars/log01.iad2.fedoraproject.org +++ b/inventory/host_vars/log01.iad2.fedoraproject.org @@ -23,8 +23,3 @@ num_cpus: 16 fas_client_groups: fi-apprentice,sysadmin-veteran,sysadmin-logs,sysadmin-noc,sysadmin-atomic #host_backup_targets: ['/var/log'] - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/noc01.iad2.fedoraproject.org b/inventory/host_vars/noc01.iad2.fedoraproject.org index 1aec8e3b9d..cd2b39ea13 100644 --- a/inventory/host_vars/noc01.iad2.fedoraproject.org +++ b/inventory/host_vars/noc01.iad2.fedoraproject.org @@ -25,8 +25,3 @@ custom_rules: [ nagios_srcdir: 'nagios' nagios_location: 'internal' - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/ns01.iad2.fedoraproject.org b/inventory/host_vars/ns01.iad2.fedoraproject.org index b6f764d4e1..85feaae09b 100644 --- a/inventory/host_vars/ns01.iad2.fedoraproject.org +++ b/inventory/host_vars/ns01.iad2.fedoraproject.org @@ -13,11 +13,6 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ vmhost: vmhost-x86-01.iad2.fedoraproject.org datacenter: iad2 -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false - csi_relationship: | ns01 is a master dns server. diff --git a/inventory/host_vars/tang01.iad2.fedoraproject.org b/inventory/host_vars/tang01.iad2.fedoraproject.org index fe9f39fe8f..b2154241fd 100644 --- a/inventory/host_vars/tang01.iad2.fedoraproject.org +++ b/inventory/host_vars/tang01.iad2.fedoraproject.org @@ -16,8 +16,3 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ lvm_size: 20000 mem_size: 4096 num_cpus: 2 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/tang02.iad2.fedoraproject.org b/inventory/host_vars/tang02.iad2.fedoraproject.org index a052156518..4c0b236282 100644 --- a/inventory/host_vars/tang02.iad2.fedoraproject.org +++ b/inventory/host_vars/tang02.iad2.fedoraproject.org @@ -16,8 +16,3 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/ lvm_size: 20000 mem_size: 4096 num_cpus: 2 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org index 47b93e7c2c..9b0698f425 100644 --- a/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-01.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org index b9096a424b..c1e55fde94 100644 --- a/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-02.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org index 515f85474e..2fd843b84c 100644 --- a/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-03.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org index d28e2f0bae..abe96a4d20 100644 --- a/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-04.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org index 1e8c401145..60d2cdd1e3 100644 --- a/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-05.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org index 1881b25a76..91a0664cd9 100644 --- a/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-06.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org index 8223a25f86..ad4386c48a 100644 --- a/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org +++ b/inventory/host_vars/vmhost-x86-07.iad2.fedoraproject.org @@ -7,8 +7,3 @@ br0_gw: 10.3.163.254 br0_dev: eno1 dns: 10.3.163.33 - -nagios_Can_Connect: false -nagios_Check_Services: - nrpe: false - ping: false diff --git a/inventory/inventory b/inventory/inventory index abbc59b38e..2bceecf3b7 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1281,7 +1281,7 @@ retrace01.qa.fedoraproject.org # os-proxy01.fedorainfracloud.org # os-proxy02.fedorainfracloud.org -[nixnagios] +[iad2] bastion01.iad2.fedoraproject.org batcave01.iad2.fedoraproject.org log01.iad2.fedoraproject.org