added sitelist option for find* scripts.

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

diff --git a/monitor/database/zabbixapi/emailZabbix.py b/monitor/database/zabbixapi/emailZabbix.py
index 9f41da3..01f1b8f 100644 (file)
--- a/monitor/database/zabbixapi/emailZabbix.py
+++ b/monitor/database/zabbixapi/emailZabbix.py
@@ -123,15 +123,17 @@ You can acknowledge this notice by visiting the link below or by letting us know
 Thank you for your help,
     -- PlanetLab Central (%(support_email)s)
 """
-       node_discovered_subject = """Discovered {HOSTNAME} and online"""
+       node_discovered_subject = """Discovered host {HOSTNAME} w/ ip {IPADDRESS} and online"""
        node_discovered = """
 Thank you for registering and installing this machine:
 
-    {HOSTNAME}
+    hostname {HOSTNAME} : ip {IPADDRESS}
 
 Our monitoring infrastructure has detected it, and in the future it will alert you in the event of unexpected downtime.
 
-       {TRIGGER.NAME}: {STATUS}
+       Discovered : Online
+       {TRIGGER.URL}
+
 Thank you for your help,
     -- PlanetLab Central (%(support_email)s)
 """