Module: check_mk
Branch: master
Commit: a28b702651f6a4685b2b8d73d439de7e08b99ebb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28b702651f6a4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Apr 29 10:33:52 2013 +0200
FIX: HTML mails: Handle the case where plugin argument is not set
---
ChangeLog | 3 +++
notifications/mail | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 68d9a8c..bf1fd74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,9 @@
* FIX: Fixed exception during initial page rendering in python 2.6 in special cases
(Internal error: putenv() argument 2 must be string, not list)
+ Notifications:
+ * FIX: HTML mails: Handle the case where plugin argument is not set
+
WATO:
* Improved handling of valuespec validations in WATO rule editor. Displaying a
warning message when going to throw away the current settings.
diff --git a/notifications/mail b/notifications/mail
index 37d09cb..223e794 100755
--- a/notifications/mail
+++ b/notifications/mail
@@ -319,7 +319,7 @@ def fetch_pnp_data(context, params):
path = "%s/share/pnp4nagios/htdocs/index.php" %
context['OMD_ROOT']
except:
# Non-omd environment - use plugin argument 1
- path = context['PARAMETER_1']
+ path = context.get('PARAMETER_1', '')
if not os.path.exists(path):
raise GraphException('Unable to locate pnp4nagios index.php (%s)' %
path)