From 6174e107e066c23813179f15048d704ad3c3c449 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Wed, 27 Nov 2019 20:16:12 +0000
Subject: [PATCH] time to remove the spanner in the works

---
 inventory/inventory                                    | 10 ----------
 master.yml                                             |  2 --
 roles/nagios_client/tasks/main.yml                     |  1 -
 roles/nagios_server/files/nrpe/nrpe.cfg                |  1 -
 roles/nagios_server/tasks/main.yml                     |  1 -
 .../templates/nagios/hostgroups/all.cfg.j2             |  2 +-
 6 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/inventory/inventory b/inventory/inventory
index 79959776ca..78de5ec78e 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -52,16 +52,6 @@ composer.stg.phx2.fedoraproject.org
 retrace01.qa.fedoraproject.org
 
 
-[repospanner]
-repospanner01.phx2.fedoraproject.org
-repospanner-cc-rdu01.fedoraproject.org
-repospanner-ibiblio01.fedoraproject.org
-
-[repospanner_temp]
-repospanner-temp01.fedoraproject.org
-repospanner-temp02.fedoraproject.org
-repospanner-temp03.fedoraproject.org
-
 [gdpr_delete]
 
 [certgetter]
diff --git a/master.yml b/master.yml
index dbc020a244..888277551f 100644
--- a/master.yml
+++ b/master.yml
@@ -84,8 +84,6 @@
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/rabbitmq.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/repospanner.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/repospanner-temp.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml
diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index d35f820066..b99b971187 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -131,7 +131,6 @@
   - check_fedmsg_gateway_proc.cfg
   - check_fedmsg_composer_proc.cfg
   - check_redis_proc.cfg
-  - check_repospanner_proc.cfg
   - check_autocloud_proc.cfg
   - check_fedmsg_consumers.cfg
   - check_supybot_fedmsg_plugin.cfg
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index 6bafcfcdc8..a2089ae52f 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -332,7 +332,6 @@ command[check_fedmsg_irc_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C '
 command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-tweet' -u fedmsg
 command[check_fedmsg_composer_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub-3' -u apache
 command[check_fedmsg_odcs_celery_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'odcs-celery-backend  ' -u odcs
-command[check_repospanner_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'repospanner' -u repoSpanner
 command[check_supybot_fedmsg_plugin]=/usr/lib64/nagios/plugins/check_supybot_plugin -t fedmsg
 command[check_haproxy_conns]=/usr/lib64/nagios/plugins/check_haproxy_conns.py
 command[check_redis_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'redis-server' -u redis
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 13de18b0c7..3f6dfd8b1c 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -211,7 +211,6 @@
     - procs.cfg
     - rabbitmq.cfg
     - raid.cfg
-    - repospanner.cfg
     - smtp-mm.cfg
     - ssh.cfg
     - ssl.cfg
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index f4a4b52abc..c43a1d6b26 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -3,7 +3,7 @@
 ###############
 ## {{ env }}
 {% for key, value in groups.iteritems()|sort %}
-{% if groups[key] != [] and key not in ['repospanner_temp', 'nixnagios', 'rhel8beta'] %}
+{% if groups[key] != [] and key not in ['nixnagios', 'rhel8beta'] %}
 define hostgroup{
        hostgroup_name {{ key }}
        alias          {{ key }}