From 24d4dc20f0af32c72d36f122560fb993ce0317ad Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 20 Jan 2009 18:45:53 +0000 Subject: [PATCH] testing delays and email notice tweaks. --- monitor/database/zabbixapi/emailZabbix.py | 11 ++++++----- zabbix/zabbixsite.py | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/monitor/database/zabbixapi/emailZabbix.py b/monitor/database/zabbixapi/emailZabbix.py index 740ac1e..9f41da3 100644 --- a/monitor/database/zabbixapi/emailZabbix.py +++ b/monitor/database/zabbixapi/emailZabbix.py @@ -34,11 +34,12 @@ If you have a BootCD older than 3.0, you will need to create a new BootImage on https://www.planet-lab.org/doc/guides/bootcdsetup -There is no need to respond to this message unless there are any console messages relating to the node failure. In this case, please report them to PlanetLab support (%(support_email)s) so we can help resolve the issue. Including this message in your reply will help us coordinate our records with the actions you have taken. +There is no need to respond to this message unless there are console messages relating to the node failure. In this case, please report them to PlanetLab support (%(support_email)s) so we can help resolve the issue. Including this message in your reply will help us coordinate our records with the actions you have taken. -Finally, you can track the current status of your machines using this Google Gadget: +If after following these directions, you are still experiencing problems, then you can acknowledge this notice by visiting the links below and describing the problem: - http://fusion.google.com/add?source=atgs&moduleurl=http://%(hostname)s/monitor/sitemonitor.xml + 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) @@ -63,7 +64,7 @@ If you have a BootCD older than 3.0, you will need to create a new BootImage on https://www.planet-lab.org/doc/guides/bootcdsetup -If after following these directions, you are still experiencing problems, then you can acknowledge this notice by visiting, and letting us know what the problem is at mailto:%(support_email)s +If after following these directions, you are still experiencing problems, then you can acknowledge this notice by visiting the links below and describing the problem: http://%(hostname)s/zabbix/acknow.php?eventid={EVENT.ID} http://%(hostname)s/zabbix/tr_events.php?triggerid={TRIGGER.ID}&eventid={EVENT.ID} @@ -96,7 +97,7 @@ If you have a BootCD older than 3.0, you will need to create a new BootImage on https://www.planet-lab.org/doc/guides/bootcdsetup -If after following these directions, you are still experiencing problems, then you can acknowledge this notice by visiting, and letting us know what the problem is at mailto:%(support_email)s +If after following these directions, you are still experiencing problems, then you can acknowledge this notice by visiting the links below and describing the problem: http://%(hostname)s/zabbix/acknow.php?eventid={EVENT.ID} http://%(hostname)s/zabbix/tr_events.php?triggerid={TRIGGER.ID}&eventid={EVENT.ID} diff --git a/zabbix/zabbixsite.py b/zabbix/zabbixsite.py index d6e52cc..8c9892d 100755 --- a/zabbix/zabbixsite.py +++ b/zabbix/zabbixsite.py @@ -161,8 +161,8 @@ def setup_site(loginbase, techemail, piemail, iplist): BI_WEEKLY_ESC_PERIOD = int(60*60*24) DISCOVERY_DELAY = 3600 - BI_WEEKLY_ESC_PERIOD = int(240) # testing... - DISCOVERY_DELAY = 120 # testing + BI_WEEKLY_ESC_PERIOD = int(45*60) # testing... + DISCOVERY_DELAY = 240 # testing # User Group site_user_group = UsrGrp.find_or_create(name=USERGROUP_NAME % loginbase) -- 2.43.0