From 06cc8ca030faada01b67e7340ec5da42b0ceafe3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 14 Feb 2019 21:11:50 +0000 Subject: [PATCH] and we have no bodhost --- .../files/nagios/servicedeps/nrpe.cfg | 9 --------- roles/nagios_server/tasks/main.yml | 1 - .../templates/nagios/hostgroups/all.cfg.j2 | 2 +- .../templates/nagios/hosts/gateway-hosts.cfg.j2 | 14 -------------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index 603245396c..457841a3fe 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -70,15 +70,6 @@ define servicedependency { execution_failure_criteria w,c } -#define servicedependency { -# host_name bodhost01 -# service_description nrpe -# dependent_host_name bodhost01 -# dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes -# notification_failure_criteria w,c -# execution_failure_criteria w,c -#} - define servicedependency { host_name sundries01 service_description nrpe diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index dd82d66335..5e1b4213ef 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -347,7 +347,6 @@ - name: Build out nagios host templates (production) template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root with_items: - - bodhost-hosts.cfg - cloud-hosts.cfg - coloamer-hosts.cfg - dedicatedsolutions-hosts.cfg diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index 6494642b0f..e46d6c3897 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 @@ -24,7 +24,7 @@ define hostgroup{ define hostgroup{ hostgroup_name routers alias routers - members 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 + members phx2-gw, ibiblio-gw, cloud-gw, coloamer-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, tummy-gw } diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 index 5f0312cfc8..e0bffc0107 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -44,20 +44,6 @@ define host { {% endif %} } -define host { - host_name bodhost-gw - alias bodhost gateway - use mincheck - check_command check-host-alive4 - address 174.141.234.1 -{% if vars['nagios_location'] == 'internal' %} - parents phx2-gw -{% else %} - parents ibiblio-gw -{% endif %} - -} - define host { host_name coloamer-gw alias coloamerica gateway