Module: check_mk
Branch: master
Commit: a138f5f8042406465d5a0a41ea0e42ff69112e74
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a138f5f8042406…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 18 10:57:00 2013 +0100
Avoid Livestatus connections on pages that do not need them
In many pages in Multisite and especially WATO Livestatus connections
are not neccessary. In previous versions the connection was built
up anyway. Now this is done only when needed. That cuts down the total
rate of Livestatus connections and also speeds up installations with
many sites.
---
.bugs/626 | 6 +-
.werks/352 | 14 +++++
ChangeLog | 1 +
web/htdocs/html_mod_python.py | 127 +++++++++++++++++++++++++++++++++++++++++
web/htdocs/index.py | 114 +-----------------------------------
web/htdocs/lib.py | 1 +
web/htdocs/wato.py | 2 -
7 files changed, 148 insertions(+), 117 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a138f5f804…
Module: check_mk
Branch: master
Commit: 3c99f32846a95c498198de989868600ba6092f37
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c99f32846a95c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Dec 18 10:37:38 2013 +0100
Updated bug entries #2096
---
.bugs/2096 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/2096 b/.bugs/2096
index 88d5428..bb4466f 100644
--- a/.bugs/2096
+++ b/.bugs/2096
@@ -1,9 +1,9 @@
Title: Activate Changes on Global Settings page: confusing for mkeventd settings
Component: wato
-State: open
+Class: nastiness
+State: done
Date: 2013-12-10 15:47:14
Targetversion: 1.2.3i6
-Class: nastiness
When changing mkeventd related options via global settings dialog, the dialog does not show
the activate changes button. But the changes are only applied when switching the page to
@@ -12,3 +12,6 @@ activating the changes. This is very unfriendly.
This should be changed! maybe this way: Add multiple possible "activate changes" buttons,
one for the general settings and one for the mkeventd.
+
+2013-12-18 10:37:22: changed state open -> done
+Has just been implemented.
Module: check_mk
Branch: master
Commit: c300be1d0a0494a6f37f532201c84c9a6420d140
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c300be1d0a0494…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Dec 18 10:28:18 2013 +0100
Moved Event Console related settings to own settings page
The event console global settings configuration has been moved to
its own configuration page to clearify which settings need a reload
of the event console daemon and which ones need a restart of the
monitoring core.
---
.werks/388 | 13 ++
ChangeLog | 1 +
mkeventd/web/plugins/wato/mkeventd.py | 233 ++++++++++++++++++++++++++++-----
web/htdocs/wato.py | 39 ++++--
4 files changed, 242 insertions(+), 44 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c300be1d0a…
Module: check_mk
Branch: master
Commit: f1cc2b97f19574aa32e510003cb6ac56cd08949d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1cc2b97f19574…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Dec 18 10:29:26 2013 +0100
FIX Showing LDAP settings on site specific global settings page now
The site specific global settings page should show all configuration
options. Independent of the fact that they are related to LDAP or
the event console. This has been fixed now.
---
.werks/389 | 12 ++++++++++++
ChangeLog | 1 +
2 files changed, 13 insertions(+)
diff --git a/.werks/389 b/.werks/389
new file mode 100644
index 0000000..0235f0b
--- /dev/null
+++ b/.werks/389
@@ -0,0 +1,12 @@
+Title: Showing LDAP settings on site specific global settings page now
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387358901
+Targetversion: future
+
+The site specific global settings page should show all configuration
+options. Independent of the fact that they are related to LDAP or
+the event console. This has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index 45b8c99..be82bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@
* 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now
* 0346 FIX: Fix folder visibility in WATO for unpriviledged users...
* 0385 FIX: Better error handling for invalid service regex in rule conditions...
+ * 0389 FIX: Showing LDAP settings on site specific global settings page now...
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
Module: check_mk
Branch: master
Commit: 80ababab5685f3a863fc8425f03638ea1c709e80
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80ababab5685f3…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Wed Dec 18 10:06:53 2013 +0100
Updated bug entries #1003
---
.bugs/1003 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/1003 b/.bugs/1003
new file mode 100644
index 0000000..0a319e8
--- /dev/null
+++ b/.bugs/1003
@@ -0,0 +1,10 @@
+Title: ps: unable to set custom limits for clustered ps checks
+Component: checks
+State: open
+Date: 2013-12-16 17:36:45
+Targetversion: 1.2.4
+Class: bug
+
+If we configure a process inventory check for a process, and configure the
+corresponding service as a cluster service, it is not possible to configure
+limits for this cluster check.
Module: check_mk
Branch: master
Commit: 8fade9938a3f02ca8d46b1f2587009fb55de9e5d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fade9938a3f02…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Dec 17 20:23:38 2013 +0100
apc_humidity: Added pnp template.
---
pnp-templates/check_mk-apc_humidity.php | 38 +++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/pnp-templates/check_mk-apc_humidity.php b/pnp-templates/check_mk-apc_humidity.php
new file mode 100644
index 0000000..aba6a03
--- /dev/null
+++ b/pnp-templates/check_mk-apc_humidity.php
@@ -0,0 +1,38 @@
+<?php
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+$opt[1] = "--vertical-label \"Percent\" --title \"$servicedesc\" ";
+
+$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ";
+$def[1] .= "LINE2:var1#2080ff:\"Humidity\:\" ";
+$def[1] .= "GPRINT:var1:LAST:\"%2.0lf%%\" ";
+$def[1] .= "GPRINT:var1:AVERAGE:\"(Avg\: %2.0lf%%,\" ";
+$def[1] .= "GPRINT:var1:MIN:\"Min\: %2.0lf%%,\" ";
+$def[1] .= "GPRINT:var1:MAX:\"Max\: %2.0lf%%)\" ";
+$def[1] .= "HRULE:$CRIT[1]#FFFF00 ";
+$def[1] .= "HRULE:$WARN[1]#FF0000 ";
+$def[1] .= "HRULE:$MIN[1]#FFFF00 ";
+$def[1] .= "HRULE:$MAX[1]#FF0000 ";
+?>
Module: check_mk
Branch: master
Commit: 778aaf7e4b1859d329e6fe3811c96634258b8f2f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=778aaf7e4b1859…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 17 19:20:55 2013 +0100
FIX local: Catch invalid state codes and map to 3 (UNKNOWN)
If the the state of a line of the <tt>local</tt> section is
not in the allowed range (from <tt>0</tt> to <tt>3</tt>) then
we now assume <tt>3</tt>. Up to now Check_MK ran into an exception.
---
.werks/351 | 12 ++++++++++++
ChangeLog | 1 +
checks/local | 3 +++
3 files changed, 16 insertions(+)
diff --git a/.werks/351 b/.werks/351
new file mode 100644
index 0000000..7f435f8
--- /dev/null
+++ b/.werks/351
@@ -0,0 +1,12 @@
+Title: local: Catch invalid state codes and map to 3 (UNKNOWN)
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387304385
+Targetversion: future
+
+If the the state of a line of the <tt>local</tt> section is
+not in the allowed range (from <tt>0</tt> to <tt>3</tt>) then
+we now assume <tt>3</tt>. Up to now Check_MK ran into an exception.
diff --git a/ChangeLog b/ChangeLog
index 56b1574..4d07915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,7 @@
* 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs
* 0350 FIX: nfsmounts: correctly handle mount points with spaces...
* 0387 FIX: df*: Negative filesystem space levels get a more clear text in check output...
+ * 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/local b/checks/local
index 605bd9a..0d910c5 100644
--- a/checks/local
+++ b/checks/local
@@ -116,6 +116,9 @@ def check_local(item, params, info):
output = ", ".join(texts)
else:
state = int(statechar)
+ if state not in range(0, 4):
+ output += ", local check has sent invalid state %d" % state
+ state = 3
return (state, output, perfdata)
return (3, "Check output not found in local checks")
Module: check_mk
Branch: master
Commit: 81be907ddae09c4084fc4f8bbd1bb609d5ebfe9a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81be907ddae09c…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 19:18:01 2013 +0100
Updated bug entries #0891
---
.bugs/891 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/891 b/.bugs/891
index 942daaa..f862549 100644
--- a/.bugs/891
+++ b/.bugs/891
@@ -1,10 +1,13 @@
Title: Optical representation of regex field
Component: wato
-State: open
+Class: nastiness
+State: wontfix
Date: 2013-06-03 14:23:08
Targetversion: 1.4.0
-Class: nastiness
I think we should hilite regex inputs fields optically and
maybe also validate them. This can prevent regex errors
deeply in the Check_MK code generation.
+
+2013-12-17 19:17:54: changed state open -> wontfix
+We have no idea how to highlight this in an intuitive way.