diff --git a/utils/monitor_disk_usage.py b/utils/monitor_disk_usage.py index bd3d75fd9..89d8d80cd 100755 --- a/utils/monitor_disk_usage.py +++ b/utils/monitor_disk_usage.py @@ -20,7 +20,7 @@ def main(): requests.post( "https://api.mailgun.net/v2/%s/messages" % settings.MAILGUN_SERVER_NAME, auth=("api", settings.MAILGUN_ACCESS_KEY), - data={"from": "NewsBlur Monitor: %s <%s>" % (hostname, admin_email), + data={"from": "NewsBlur Disk Monitor: %s " % (hostname, hostname), "to": [admin_email], "subject": "%s hit %s%% disk usage!" % (hostname, percent), "text": "Usage on %s: %s" % (hostname, output)}) diff --git a/utils/monitor_newsletter_delivery.py b/utils/monitor_newsletter_delivery.py index 070b5db24..65d348926 100755 --- a/utils/monitor_newsletter_delivery.py +++ b/utils/monitor_newsletter_delivery.py @@ -28,7 +28,7 @@ def main(): requests.post( "https://api.mailgun.net/v2/%s/messages" % settings.MAILGUN_SERVER_NAME, auth=("api", settings.MAILGUN_ACCESS_KEY), - data={"from": "NewsBlur Monitor: %s <%s>" % (hostname, admin_email), + data={"from": "NewsBlur Newsletter Monitor: %s " % (hostname, hostname), "to": [admin_email], "subject": "%s newsletters bounced: %s > %s > %s" % (hostname, accepted, delivered, bounced), "text": "Newsletters are not being delivered! %s delivered, %s bounced" % (delivered, bounced)}) diff --git a/utils/monitor_task_fetches.py b/utils/monitor_task_fetches.py index 81dd97fa2..e28c42b75 100755 --- a/utils/monitor_task_fetches.py +++ b/utils/monitor_task_fetches.py @@ -32,7 +32,7 @@ def main(): requests.post( "https://api.mailgun.net/v2/%s/messages" % settings.MAILGUN_SERVER_NAME, auth=("api", settings.MAILGUN_ACCESS_KEY), - data={"from": "NewsBlur Monitor: %s <%s>" % (hostname, admin_email), + data={"from": "NewsBlur Task Monitor: %s " % (hostname, hostname), "to": [admin_email], "subject": "%s feeds fetched falling: %s" % (hostname, feeds_fetched), "text": "Feed fetches are falling (%s): %s" % (hostname, feeds_fetched, failed)})