From 4bc3ab0eaec434fd01b7604bea77a5aa4fb53206 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 17 May 2018 00:08:09 +0000 Subject: [PATCH] remove bodhi2 internal check. it is not working and it really just duplicates the openshift aliveness check --- .../templates/nagios/servicegroups/bodhi.cfg.j2 | 4 +--- .../templates/nagios/services/websites.cfg.j2 | 17 ----------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 index 007bae06e7..93dc77eeda 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 @@ -1,7 +1,5 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members {% for host in groups['bodhi2'] %}{{host}}, http-bodhi2-internal, {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-bodhi2 {% if not loop.last %} , {% endif %} {% endfor %} - + members {% for host in groups['proxies'] %}{{host}}, http-bodhi2 {% if not loop.last %} , {% endif %} {% endfor %} } - diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 04151e0ec7..2702f0d781 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -172,23 +172,6 @@ define service { use websitetemplate } - -define service { - hostgroup_name bodhi2 - service_description http-bodhi-internal - check_command check_website!localhost!/!Fedora - max_check_attempts 8 - use internalwebsitetemplate -} - -define service { - hostgroup_name bodhi2 - service_description http-bodhi2-internal - check_command check_website!localhost!/!top testers - max_check_attempts 8 - use internalwebsitetemplate -} - define service { hostgroup_name datagrepper service_description http-datagrepper-frontpage