Module: check_mk
Branch: master
Commit: 92dc53a3be2632524ebb8536e626790b3e2a90bc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92dc53a3be2632…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Dec 9 16:22:45 2014 +0100
Updated bug entries #2275
---
.bugs/2275 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.bugs/2275 b/.bugs/2275
new file mode 100644
index 0000000..84fa109
--- /dev/null
+++ b/.bugs/2275
@@ -0,0 +1,8 @@
+Title: Filters are missing after adding a view to a dashboard
+Component: multisite
+State: open
+Date: 2014-12-09 16:21:48
+Targetversion: 1.2.5i1
+Class: bug
+
+After adding a new view to a dashboard, the list of filters in the view are empty.
Module: check_mk
Branch: master
Commit: 94bf2708088d10857a92ba2afdc8a32d8f790630
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94bf2708088d10…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 9 16:07:32 2014 +0100
#1749 Allow title of notifiation script to be in third line if second line is encoding: utf-8
This allows to write Python script with non-ASCII characters as notification scripts:
F+:mynotify
#!/usr/bin/python
# encoding: utf-8
# Notify With Föbäz
F-:
---
.werks/1749 | 15 +++++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 ++
3 files changed, 18 insertions(+)
diff --git a/.werks/1749 b/.werks/1749
new file mode 100644
index 0000000..3e73821
--- /dev/null
+++ b/.werks/1749
@@ -0,0 +1,15 @@
+Title: Allow title of notifiation script to be in third line if second line is encoding: utf-8
+Level: 1
+Component: notifications
+Compatible: compat
+Version: 1.2.5i7
+Date: 1418137567
+Class: feature
+
+This allows to write Python script with non-ASCII characters as notification scripts:
+
+F+:mynotify
+#!/usr/bin/python
+# encoding: utf-8
+# Notify With Föbäz
+F-:
diff --git a/ChangeLog b/ChangeLog
index 47e6f17..b2bae67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -262,6 +262,7 @@
Notifications:
* 1512 Bulk notification can now be grouped according to custom macro values...
* 1650 Enabled rule based notifications by default (for new installations)...
+ * 1749 Allow title of notifiation script to be in third line if second line is encoding: utf-8...
* 1168 FIX: HTML mails can now be configured to display graphs among each other...
* 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core...
* 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 9315159..4867850 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11408,6 +11408,8 @@ def load_notification_scripts_from(adir):
lines = file(path)
lines.next()
line = lines.next().strip()
+ if line.startswith("#") and "encoding:" in line:
+ line = lines.next().strip()
if line.startswith("#"):
info["title"] = line.lstrip("#").strip().split("#", 1)[0]
while True:
Module: check_mk
Branch: master
Commit: 15f93b3f21faaa515da44d7a8d30bffc293bb384
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f93b3f21faaa…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 9 15:46:41 2014 +0100
Cleaned up import
---
agents/plugins/mk_sap | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap
index 55adffe..dfd1ef9 100755
--- a/agents/plugins/mk_sap
+++ b/agents/plugins/mk_sap
@@ -38,7 +38,7 @@
#
# During development the "CCMS_Doku.pdf" was really helpful.
-import os, sys
+import os, sys, fcntl
import time, datetime
# sapnwrfc needs to know where the libs are located. During
@@ -486,7 +486,6 @@ try:
# Only write the state file once per run. And only when it has been changed
if state_file_changed:
- import fcntl
new_file = STATE_FILE + '.new'
fd = os.open(new_file, os.O_WRONLY | os.o_CREAT)
fcntl.flock(fd, fcntl.LOCK_EX)
Module: check_mk
Branch: master
Commit: 5eebb4b2080dc2cd5544f5a19a9340331063ce13
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eebb4b2080dc2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 9 14:15:29 2014 +0100
Updated bug entries #2211
---
.bugs/2211 | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/.bugs/2211 b/.bugs/2211
new file mode 100644
index 0000000..5d66c5e
--- /dev/null
+++ b/.bugs/2211
@@ -0,0 +1,39 @@
+Title: Make mailq check monitor different queues individually
+Component: checks
+State: open
+Date: 2014-12-09 14:04:59
+Targetversion: future
+Class: feature
+
+I am currently migrating from using NRPE/nagios-statd to check_mk and I
+have some checks that I have written for monitoring postfix mail queues.
+
+I found the check_mk postfix_mailq check but it seems to only provide
+the total mailq number. The check I had been using was a nagios plugin
+running via NRPE that just counted the files directly in the various
+spool directories. It just takes the queue name as an option.
+
+On my production mail servers it is very useful to be able to set
+limits for each queue.
+
+For example:
+* deferred is normally higher on busy servers due to undelivable mail,
+ bounces, remote server problems, etc. (thousands)
+* active should usually be pretty low when the server is functioning
+ correctly (<20 on relays, <150 on machine receiving mail and
+ doing spam processing)
+* maildrop might have spikes if services are injecting a lot of mail
+ but should clear quickly if the server is functioning well
+* hold should almost always be zero unless an admin is doing things
+ or postfix is configured to automatically put certain things on
+ hold (in which case you probably want to know about it). This
+ is handy for reminding me to take things back off hold when I
+ forget
+* corrupt should probably always be zero
+
+I can continue to use my local check via MRPE, but it would be much
+nicer if check_mk's native check could support this. (and if it does,
+checking the spool dirs directly is probably lighter weight than
+running mailq).
+
+Oh and the separate perfdata would be interesting too.
Module: check_mk
Branch: master
Commit: 7c3d0dc7784f5eb71bab9184c787dd6f7e20cf0a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c3d0dc7784f5e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 9 15:25:54 2014 +0100
#1736 FIX lparstat_aix: Trying to deal with more kind of lparstat output
Depending on versions the output of the lparstat command seems to be
different. Reworked the check, trying to handle more cases.
---
.werks/1736 | 10 ++++++++++
ChangeLog | 1 +
2 files changed, 11 insertions(+)
diff --git a/.werks/1736 b/.werks/1736
new file mode 100644
index 0000000..dba598c
--- /dev/null
+++ b/.werks/1736
@@ -0,0 +1,10 @@
+Title: lparstat_aix: Trying to deal with more kind of lparstat output
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i7
+Date: 1418135108
+Class: fix
+
+Depending on versions the output of the lparstat command seems to be
+different. Reworked the check, trying to handle more cases.
diff --git a/ChangeLog b/ChangeLog
index 4a30051..1572a3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,7 @@
* 1659 FIX: windows agent: fixed output of 64 bit performance counters...
* 1748 FIX: win_dhcp_pools: fix naming of WATO rules and informal WARN/CRIT levels in performance data
* 1735 FIX: oracle_instance: Inventory function deals better with old bogus agent output
+ * 1736 FIX: lparstat_aix: Trying to deal with more kind of lparstat output...
Multisite:
* 1508 Allow input of plugin output and perfdata when faking check results...