From 2d7ac321c7d508dc72175e9c190db21990c92e5e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 3 Oct 2018 17:56:00 +0000 Subject: [PATCH] a few tagger stragglers --- inventory/host_vars/db01.stg.phx2.fedoraproject.org | 2 -- roles/base/files/syncHttpLogs.sh | 3 --- roles/fedmsg/irc/templates/ircbot.py | 1 - .../templates/check_datanommer_history.cfg.j2 | 1 - roles/nagios_server/files/nagios/services/fedmsg.cfg | 6 ------ roles/nagios_server/files/nrpe/nrpe.cfg | 1 - roles/releng/files/fedmsg/endpoints.py | 8 -------- roles/releng/files/fedmsg/ssl.py | 3 --- scripts/public-db-copy | 1 - 9 files changed, 26 deletions(-) diff --git a/inventory/host_vars/db01.stg.phx2.fedoraproject.org b/inventory/host_vars/db01.stg.phx2.fedoraproject.org index 6e88f983e2..4841781825 100644 --- a/inventory/host_vars/db01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db01.stg.phx2.fedoraproject.org @@ -16,8 +16,6 @@ databases: - bodhi - elections - fedocal -- fedoratagger -- fedoratagger - kerneltest - mailman - mirrormanager diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 2b92bbf6ac..88aecbf441 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -61,9 +61,6 @@ syncHttpLogs badges-web01.stg.phx2.fedoraproject.org syncHttpLogs elections01.phx2.fedoraproject.org syncHttpLogs elections02.phx2.fedoraproject.org syncHttpLogs elections01.stg.phx2.fedoraproject.org -syncHttpLogs tagger01.phx2.fedoraproject.org -syncHttpLogs tagger02.phx2.fedoraproject.org -syncHttpLogs tagger01.stg.phx2.fedoraproject.org syncHttpLogs packages03.phx2.fedoraproject.org syncHttpLogs packages04.phx2.fedoraproject.org syncHttpLogs packages03.stg.phx2.fedoraproject.org diff --git a/roles/fedmsg/irc/templates/ircbot.py b/roles/fedmsg/irc/templates/ircbot.py index bcd26fceb4..d0f1b0b8a7 100644 --- a/roles/fedmsg/irc/templates/ircbot.py +++ b/roles/fedmsg/irc/templates/ircbot.py @@ -614,7 +614,6 @@ config = dict( "fas": "light blue", "bodhi": "green", "git": "red", - "fedoratagger": "brown", "wiki": "purple", "logger": "orange", "buildsys": "yellow", diff --git a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 b/roles/nagios_client/templates/check_datanommer_history.cfg.j2 index 0da989969d..0ff46be637 100644 --- a/roles/nagios_client/templates/check_datanommer_history.cfg.j2 +++ b/roles/nagios_client/templates/check_datanommer_history.cfg.j2 @@ -21,7 +21,6 @@ command[check_datanommer_compose]={{libdir}}/nagios/plugins/check_datanommer_tim command[check_datanommer_meetbot]={{libdir}}/nagios/plugins/check_datanommer_timesince.py meetbot 604800 2628000 command[check_datanommer_fas]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fas 1814400 2628000 command[check_datanommer_pkgdb]={{libdir}}/nagios/plugins/check_datanommer_timesince.py pkgdb 1814400 2628000 -command[check_datanommer_fedoratagger]={{libdir}}/nagios/plugins/check_datanommer_timesince.py fedoratagger 2628000 7884000 command[check_datanommer_planet]={{libdir}}/nagios/plugins/check_datanommer_timesince.py planet 2628000 7884000 command[check_datanommer_copr]={{libdir}}/nagios/plugins/check_datanommer_timesince.py copr 21600 86400 command[check_datanommer_trac]={{libdir}}/nagios/plugins/check_datanommer_timesince.py trac 86400 259200 diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index e155fd8529..b0aafe4406 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -215,12 +215,6 @@ define service { check_command check_by_nrpe!check_datanommer_fas use defaulttemplate } -define service { - host_name busgateway01.phx2.fedoraproject.org - service_description Check datanommer for recent fedoratagger messages - check_command check_by_nrpe!check_datanommer_fedoratagger - use defaulttemplate -} define service { host_name busgateway01.phx2.fedoraproject.org service_description Check datanommer for recent fedoraplanet messages diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index cda38910c6..53bf773d4e 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -367,7 +367,6 @@ command[check_datanommer_compose]=/usr/lib64/nagios/plugins/check_datanommer_tim command[check_datanommer_meetbot]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py meetbot 604800 2628000 command[check_datanommer_fas]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fas 1814400 2628000 #command[check_datanommer_pkgdb]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py pkgdb 1814400 2628000 -command[check_datanommer_fedoratagger]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fedoratagger 2628000 7884000 command[check_datanommer_planet]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py planet 2628000 7884000 command[check_datanommer_copr]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py copr 21600 86400 command[check_datanommer_trac]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py trac 86400 259200 diff --git a/roles/releng/files/fedmsg/endpoints.py b/roles/releng/files/fedmsg/endpoints.py index d7729d78fa..5df570bb1d 100644 --- a/roles/releng/files/fedmsg/endpoints.py +++ b/roles/releng/files/fedmsg/endpoints.py @@ -60,14 +60,6 @@ config = dict( "tcp://fas01.%s:300%i" % (suffix, i) for i in range(8) ], - "fedoratagger.tagger01": [ - "tcp://tagger01.%s:300%i" % (suffix, i) - for i in range(8) - ], - "fedoratagger.tagger02": [ - "tcp://tagger02.%s:300%i" % (suffix, i) - for i in range(8) - ], "busmon.app01": [ "tcp://app01.%s:3008" % suffix, ], diff --git a/roles/releng/files/fedmsg/ssl.py b/roles/releng/files/fedmsg/ssl.py index 721fb2504e..381d86eb4f 100644 --- a/roles/releng/files/fedmsg/ssl.py +++ b/roles/releng/files/fedmsg/ssl.py @@ -38,9 +38,6 @@ config = dict( ] + [ ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix)) for i in range(1, 3) - ] + [ - ("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix)) - for i in range(1, 3) ] + [ ("shell.pkgs0%i" % i, "shell-pkgs0%i.%s" % (i, suffix)) for i in range(1, 2) diff --git a/scripts/public-db-copy b/scripts/public-db-copy index 3dad0f1ab1..f89e08b77d 100755 --- a/scripts/public-db-copy +++ b/scripts/public-db-copy @@ -7,7 +7,6 @@ scp db-datanommer02.phx2.fedoraproject.org:/backups/datanommer-$(date +%F).dump.xz /srv/web/infra/db-dumps/datanommer.dump.xz scp db-koji01.phx2.fedoraproject.org:/backups/koji-$(date +%F).dump.xz /srv/web/infra/db-dumps/koji.dump.xz scp db01.phx2.fedoraproject.org:/backups/pkgdb2-$(date +%F).dump.xz /srv/web/infra/db-dumps/pkgdb2.dump.xz -scp db01.phx2.fedoraproject.org:/backups/fedoratagger-$(date +%F).dump.xz /srv/web/infra/db-dumps/fedoratagger.dump.xz scp db01.phx2.fedoraproject.org:/backups/koschei-$(date +%F).dump.xz /srv/web/infra/db-dumps/koschei.dump.xz scp db01.phx2.fedoraproject.org:/backups/bodhi2-$(date +%F).dump.xz /srv/web/infra/db-dumps/bodhi2.dump.xz scp db01.phx2.fedoraproject.org:/backups/pdc-$(date +%F).dump.xz /srv/web/infra/db-dumps/pdc.dump.xz