From ae95b25910336d94b8aa0e36386d089e1ba28389 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 24 Jun 2021 11:50:38 -0400
Subject: [PATCH] Cleaning up monitors, switching to cron file, adding
 hostname.

---
 ansible/roles/celery_task/tasks/main.yml | 14 ++++++++++----
 utils/monitor_newsletter_delivery.py     |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/celery_task/tasks/main.yml b/ansible/roles/celery_task/tasks/main.yml
index 4f4de5a26..00d4621c7 100644
--- a/ansible/roles/celery_task/tasks/main.yml
+++ b/ansible/roles/celery_task/tasks/main.yml
@@ -105,10 +105,12 @@
   become: yes
   cron:
     name: feeds_fetched_sanity_checker
-    special_time: hourly
+    user: root
+    cron_file: /etc/cron.hourly/feeds_fetched_sanity_checker
     job: docker pull newsblur/newsblur_python3:latest;
       docker run --rm -it
       -v /srv/newsblur/:/srv/newsblur
+      -h `cat /etc/hostname`
       --network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_task_fetches.py
   when: "'task-work' in inventory_hostname"
   tags:
@@ -118,10 +120,12 @@
   become: yes
   cron:
     name: newsletter_sanity_checker
-    special_time: hourly
+    user: root
+    cron_file: /etc/cron.hourly/newsletter_sanity_checker
     job: docker pull newsblur/newsblur_python3:latest;
       docker run --rm -it
       -v /srv/newsblur/:/srv/newsblur
+      -h `cat /etc/hostname`
       --network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_newsletter_delivery.py
   when: "'task-work' in inventory_hostname"
   tags:
@@ -131,11 +135,13 @@
   become: yes
   cron:
     name: work_queue_sanity_checker
-    special_time: hourly
+    user: root
+    cron_file: /etc/cron.hourly/work_queue_sanity_checker
     job: docker pull newsblur/newsblur_python3:latest;
       docker run --rm
       -v /srv/newsblur/:/srv/newsblur
-      --network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_work_queue.py
+       -h `cat /etc/hostname`
+     --network=newsblurnet newsblur/newsblur_python3 /srv/newsblur/utils/monitor_work_queue.py
   when: "'task-work' in inventory_hostname"
   tags:
     - sanity-checker
diff --git a/utils/monitor_newsletter_delivery.py b/utils/monitor_newsletter_delivery.py
index 658cc7ebc..af042b734 100755
--- a/utils/monitor_newsletter_delivery.py
+++ b/utils/monitor_newsletter_delivery.py
@@ -27,7 +27,7 @@ def main():
                 auth=("api", settings.MAILGUN_ACCESS_KEY),
                 data={"from": "NewsBlur Newsletter Monitor: %s <admin@%s.newsblur.com>" % (hostname, hostname),
                       "to": [admin_email],
-                      "subject": "%s newsletters bounced: %s > %s > %s" % (hostname, accepted, delivered, bounced),
+                      "subject": "%s newsletters bounced: %s/%s accepted/delivered -> %s bounced" % (hostname, accepted, delivered, bounced),
                       "text": "Newsletters are not being delivered! %s delivered, %s bounced" % (delivered, bounced)})
         print(" ---> %s newsletters bounced: %s > %s > %s" % (hostname, accepted, delivered, bounced))
     else: