moved nodecommon.py into monitor module

[monitor.git] / monitor / database / zabbixapi / emailZabbix.py

diff --git a/monitor/database/zabbixapi/emailZabbix.py b/monitor/database/zabbixapi/emailZabbix.py
index 3f61fff..740ac1e 100644 (file)
--- a/monitor/database/zabbixapi/emailZabbix.py
+++ b/monitor/database/zabbixapi/emailZabbix.py
@@ -119,6 +119,18 @@ You can acknowledge this notice by visiting the link below or by letting us know
     http://%(hostname)s/zabbix/acknow.php?eventid={EVENT.ID}
     http://%(hostname)s/zabbix/tr_events.php?triggerid={TRIGGER.ID}&eventid={EVENT.ID}
 
+Thank you for your help,
+    -- PlanetLab Central (%(support_email)s)
+"""
+       node_discovered_subject = """Discovered {HOSTNAME} and online"""
+       node_discovered = """
+Thank you for registering and installing this machine:
+
+    {HOSTNAME}
+
+Our monitoring infrastructure has detected it, and in the future it will alert you in the event of unexpected downtime.
+
+       {TRIGGER.NAME}: {STATUS}
 Thank you for your help,
     -- PlanetLab Central (%(support_email)s)
 """