From 2547e0768f61e05b029ccc6eeaec6984bab840b3 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Mon, 23 Sep 2013 15:56:29 -0400 Subject: [PATCH] puppet: Remove rabbitmq consumer checks based on check_procs These have been superceded by checks for the existance of consumers of the relevant queues. (imported from commit 68a0e79734366411e39e9e4346b5a61bdd34144b) --- .../modules/zulip/files/nagios3/commands.cfg | 15 ---------- .../zulip/files/nagios3/conf.d/services.cfg | 29 ------------------- 2 files changed, 44 deletions(-) diff --git a/servers/puppet/modules/zulip/files/nagios3/commands.cfg b/servers/puppet/modules/zulip/files/nagios3/commands.cfg index 13345abf67..e126a87f15 100644 --- a/servers/puppet/modules/zulip/files/nagios3/commands.cfg +++ b/servers/puppet/modules/zulip/files/nagios3/commands.cfg @@ -101,21 +101,6 @@ define command{ command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres.pl --dbname=humbug --dbuser=humbug --action $ARG2$ --warning="$ARG3$" --critical="$ARG4$"' } -define command{ - command_name check_process_user_activity - command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "manage.py process_user_activity"' -} - -define command{ - command_name check_process_mailchimp_signups - command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "manage.py process_signups"' -} - -define command{ - command_name check_send_confirmation_emails - command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "manage.py send_confirmation_emails"' -} - define command{ command_name check_sync_public_streams command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "/home/humbug/humbug/bots/sync-public-streams"' diff --git a/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg b/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg index 32a51f1bd4..fab605af63 100644 --- a/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg +++ b/servers/puppet/modules/zulip/files/nagios3/conf.d/services.cfg @@ -215,35 +215,6 @@ define service { contact_groups admins } -define service { - use generic-service - service_description process_user_activity bot - check_command check_process_user_activity!22 - hostgroup_name frontends - # Activity isn't lost if this isn't running, but it is - # critical that it arrive to avoid falsely telling MIT folks - # their mirrors are down. - # This service is also responsible for active/idle - # status. - contact_groups page_admins -} - -define service { - use generic-service - service_description sync signups from zulip to mailchimp - check_command check_process_mailchimp_signups!22 - hostgroup_name frontends - contact_groups admins -} - -define service { - use generic-service - service_description send confirmation emails - check_command check_send_confirmation_emails!22 - hostgroup_name frontends - contact_groups admins -} - define service { use generic-service service_description zmirror subscriptons syncing