Module: check_mk
Branch: master
Commit: 62d22fea12c0b30a5e437e124b8201662b30fede
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62d22fea12c0b3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Nov 8 09:37:42 2012 +0100
Added comments into example notification script
---
notifications/debug | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/notifications/debug b/notifications/debug
index c9ee5b4..8cf29ee 100755
--- a/notifications/debug
+++ b/notifications/debug
@@ -1,6 +1,21 @@
#!/bin/bash
# Debug Notifications
-# Turn on notification logging and you will see the environment in
-# your notification logfile (var/check_mk/notify/notify.log)
+
+# This notification script is just an example and shows how the
+# script is being called:
+
+# Check_MK will call this without an command line arguments.
+# All information is passed in environment variables that begin
+# with NOTIFY_.
+
+# This debug script will fetch those variables and simply
+# write them to the standard output. If you have enabled
+# notification logging by setting notification_logging=1
+# or notification_logging=2 in main.mk (or via WATO in the
+# global settings: Notification -> Debug notifications, then
+# you will see this output in the notitifcation log file.
+# Under OMD this file is in ~/var/check_mk/notify/notify.log.
+
+# Please refer to the official documentation for more details.
env | grep NOTIFY_ | sort
Module: check_mk
Branch: master
Commit: 996755e1ce00254a187af9e4d940eaa47dec8072
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=996755e1ce0025…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Nov 8 08:59:48 2012 +0100
Fixed setting of global var to disable the dashboard title
---
web/htdocs/dashboard.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index 7aa0907..2f389d8 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -127,6 +127,7 @@ def render_dashboard(name):
if title is None:
# If the title is none, hide the header line
html.set_render_headfoot(False)
+ global header_height
header_height = 0
title = ''
Module: check_mk
Branch: master
Commit: 04c4a2236e368c1e6ab552c88ac4b72f7856ae88
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04c4a2236e368c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Nov 8 09:02:12 2012 +0100
Fixed ImportError "Cannot import name attrencode" when importing wato module (at least in some rare situations/python versions)
---
web/htdocs/valuespec.py | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 0801d6b..5da0caa 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -24,9 +24,8 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-import math, os, time, re, sre_constants, urlparse, forms
+import math, os, time, re, sre_constants, urlparse, forms, htmllib
from lib import *
-from htmllib import attrencode
# Abstract base class of all value declaration classes.
class ValueSpec:
@@ -310,7 +309,7 @@ class TextAscii(ValueSpec):
return _("none")
else:
if self._attrencode:
- return attrencode(value)
+ return htmllib.attrencode(value)
else:
return value