X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor%2Fdatabase%2Fzabbixapi%2FemailZabbix.py;h=ba69c5833d1899f6041b2e2ec5d9c7a4ee87ab9d;hb=c9b6e5bc35cc3d64455d68583244fcaf17a8c83b;hp=9f41da358e0a66fff19f5ba7bf485c0bcb0b44b7;hpb=24d4dc20f0af32c72d36f122560fb993ce0317ad;p=monitor.git

diff --git a/monitor/database/zabbixapi/emailZabbix.py b/monitor/database/zabbixapi/emailZabbix.py
index 9f41da3..ba69c58 100644
--- 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 a new host!"""
 	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)
 """