Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

check_rabbitmq_queue: Fix the time period when we ignore long queues. 

The commit 87d1809657 changed the time when
digests are sent by 3 hours to account for moving from the US East Coast to the
West Coast, but didn't change the time period exception in the
`check-rabbitmq-queue` script.

Closes #5415
This commit is contained in:
Puneeth Chaganti 2019-04-08 10:21:59 +05:30 committed by Tim Abbott
parent b081e6c728
commit 9876f1b14e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/files/cron.d/send-digest-emails
View File

@ -1,4 +1,6 @@
MAILTO=root
# Send digest emails once a day. Time is in UTC.
# NOTE: If the time of this cron job is changed, fix the ignore long queue time
# period in `check-rabbitmq-queue`.
0 18 * * * zulip cd /home/zulip/deployments/current && ./manage.py enqueue_digest_emails

10
scripts/nagios/check-rabbitmq-queue
View File

@ -52,12 +52,12 @@ warn_about = ", ".join(warn_queues)
now = int(time.time())
now_struct = time.gmtime(now)
# While we are sending digest emails, at 11am each weekday, the mail
# queues can get backed up; don't alert on those. Additionally,
# certain workers (slow_queries and digest_emails) have a polling
# algorithm that means it's normal for them to accumulate items.
# While we are sending digest emails, at 1800 hrs (UTC) each weekday, the mail
# queues can get backed up; don't alert on those. Additionally, certain workers
# (slow_queries and digest_emails) have a polling algorithm that means it's
# normal for them to accumulate items.
if not set(warn_queues) - set(("missedmessage_emails", "digest_emails", "slow_queries")) and \
now_struct.tm_hour == 15 and now_struct.tm_min < 25:
now_struct.tm_hour == 18 and now_struct.tm_min < 25:
status = 0
print("%s|%s|%s|processing digests, not alerting on elevated mail queues" % (
now, status, states[status]))