Module: check_mk
Branch: master
Commit: b56fa06f76f3dc3902c600e3ae4f09f49f6f767e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b56fa06f76f3dc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 7 09:39:42 2014 +0100
FIX Fixed exception when handling connections from event unix socket
This issue has been introduced in december of 2013. It made the event
console terminate with an exception with a message like
<tt>AttributeError: 'tuple' object has no attribute 'close'</tt>. This
has been fixed now.
---
.werks/427 | 13 +++++++++++++
ChangeLog | 1 +
mkeventd/bin/mkeventd | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/427 b/.werks/427
new file mode 100644
index 0000000..f822ce4
--- /dev/null
+++ b/.werks/427
@@ -0,0 +1,13 @@
+Title: Fixed exception when handling connections from event unix socket
+Level: 2
+Component: ec
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1389083880
+Targetversion: future
+
+This issue has been introduced in december of 2013. It made the event
+console terminate with an exception with a message like
+<tt>AttributeError: 'tuple' object has no attribute 'close'</tt>. This
+has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index 408da54..6371a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -155,6 +155,7 @@
* 0089 FIX: CSV export of event console was broken...
* 0359 FIX: Fixed exception in event simulator when one match group did not match
* 0384 FIX: Trying to prevent problem when restarting mkeventd...
+ * 0427 FIX: Fixed exception when handling connections from event unix socket...
Livestatus:
* 0337 New header for limiting the execution time of a query...
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 1f11de9..5b87b74 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -1001,7 +1001,7 @@ class EventServer:
# Accept new connection on event unix socket
if self._eventsocket in readable:
client_socket, address = self._eventsocket.accept()
- client_sockets[client_socket.fileno()] = (self._eventsocket.accept(), address, "")
+ client_sockets[client_socket.fileno()] = (client_socket, address, "")
# Same for the TCP syslog socket
if self._syslog_tcp and self._syslog_tcp in readable:
Module: check_mk
Branch: master
Commit: ad0aacd5af32f856ebe01f898f0b8f81cf198711
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad0aacd5af32f8…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 31 14:40:45 2013 +0100
FIX Fix rule precedence in WATO-configured manual checks
When configuring rules for <i>Manual Checks</i> via WATO and
having several rules for the same combination of host, check type
and item, then the <i>last</i> of these rules would specify the
parameters of the check. This has now been fixed and the <i>first</i>
matching rule has precedence.
---
.werks/401 | 14 ++++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 14 +++++++++++++-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/.werks/401 b/.werks/401
new file mode 100644
index 0000000..957b4a6
--- /dev/null
+++ b/.werks/401
@@ -0,0 +1,14 @@
+Title: Fix rule precedence in WATO-configured manual checks
+Level: 1
+Component: core
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1388497148
+Targetversion: future
+
+When configuring rules for <i>Manual Checks</i> via WATO and
+having several rules for the same combination of host, check type
+and item, then the <i>last</i> of these rules would specify the
+parameters of the check. This has now been fixed and the <i>first</i>
+matching rule has precedence.
diff --git a/ChangeLog b/ChangeLog
index 567a1aa..bea7e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory
* 0354 FIX: Catch exception when check plugins do not return a state...
* 0398 FIX: Tolerate debug output in check plugins when using CMC...
+ * 0401 FIX: Fix rule precedence in WATO-configured manual checks...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 1b723b5..b0dd374 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -5341,9 +5341,21 @@ def read_config_files(with_autochecks=True, with_conf_d=True):
params[key] = value
static.append((taglist, hostlist, checktype, item, params))
+
+ # Note: We need to reverse the order of the static_checks. This is because
+ # users assume that earlier rules have precedence over later ones. For static
+ # checks that is important if there are two rules for a host with the same
+ # combination of check type and item. When the variable 'checks' is evaluated,
+ # *later* rules have precedence. This is not consistent with the rest, but a
+ # result of this "historic implementation".
+ static.reverse()
+
+ # Now prepend to checks. That makes that checks variable have precedence
+ # over WATO.
checks = static + checks
- # Read autochecks and append them to explicit checks
+ # Read autochecks and prepend them to explicit checks. That way autochecks
+ # will have the *least* precedence!
if with_autochecks:
read_all_autochecks()
checks = autochecks + checks
Module: check_mk
Branch: master
Commit: 9641bb4346df6a341f15570b778b01e91ee11348
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9641bb4346df6a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 31 14:50:54 2013 +0100
FIX Fix exception in case of missing agent sections of cluster-aware checks
If you configure (by mistake) an <tt>ps</tt> check on an SNMP device - which
obviously does not have that agent information - Check_MK would crash with
an exception. This has been fixed.
---
.werks/402 | 12 ++++++++++++
ChangeLog | 1 +
modules/check_mk_base.py | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/402 b/.werks/402
new file mode 100644
index 0000000..b6fe3f4
--- /dev/null
+++ b/.werks/402
@@ -0,0 +1,12 @@
+Title: Fix exception in case of missing agent sections of cluster-aware checks
+Level: 1
+Component: core
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1388497781
+Targetversion: future
+
+If you configure (by mistake) an <tt>ps</tt> check on an SNMP device - which
+obviously does not have that agent information - Check_MK would crash with
+an exception. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index bea7e32..cb41fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* 0354 FIX: Catch exception when check plugins do not return a state...
* 0398 FIX: Tolerate debug output in check plugins when using CMC...
* 0401 FIX: Fix rule precedence in WATO-configured manual checks...
+ * 0402 FIX: Fix exception in case of missing agent sections of cluster-aware checks...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index bab5a00..2c8f358 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -306,7 +306,7 @@ def get_host_info(hostname, ipaddress, checkname):
return info
else:
info = get_realhost_info(hostname, ipaddress, checkname, check_max_cachefile_age)
- if add_nodeinfo:
+ if info != None and add_nodeinfo:
return [ [ None ] + line for line in info ]
else:
return info
Module: check_mk
Branch: master
Commit: 10e08b9bf03cf57a46279323a3cef7cf9fa2d867
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10e08b9bf03cf5…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 20 18:15:49 2013 +0100
FIX Improved error handling in case of incorrect auth config in distributed WATO environments
---
.werks/424 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/js/checkmk.js | 14 ++++++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/.werks/424 b/.werks/424
new file mode 100644
index 0000000..8dedfb4
--- /dev/null
+++ b/.werks/424
@@ -0,0 +1,10 @@
+Title: Improved error handling in case of incorrect auth config in distributed WATO environments
+Level: 1
+Component: multisite
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387559719
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index d00d76d..b75a60e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@
* 0420 FIX: LDAP: Roles/Groups are now synced even if case of DNs do not match...
* 0421 FIX: UserDB: Fixed lost passwords when changing users in large user databases...
* 0423 FIX: Users are not logged out anymore during changing their own passwords...
+ * 0424 FIX: Improved error handling in case of incorrect auth config in distributed WATO environments
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js
index e08c402..c7b925f 100644
--- a/web/htdocs/js/checkmk.js
+++ b/web/htdocs/js/checkmk.js
@@ -467,8 +467,18 @@ function pnp_response_handler(data, code) {
}
response = null;
- if(!valid_response)
- fallback_graphs(data);
+ if(!valid_response) {
+ if (code.match(/_login/)) {
+ // Login failed! This usually happens when one uses a distributed
+ // multisite setup but the transparent authentication is somehow
+ // broken. Display an error message trying to assist.
+ var container = document.getElementById(data['container']);
+ container.innerHTML = '<div class="error">Unable to fetch graphs of the host. Maybe you have a '
+ + 'distributed setup and not set up the authentication correctly yet.</div>';
+ } else {
+ fallback_graphs(data);
+ }
+ }
}
// Fallback bei doofer/keiner Antwort
Module: check_mk
Branch: master
Commit: 9405efffeb3ed019fc82a22a796923c4927d283e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9405efffeb3ed0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Dec 20 17:31:49 2013 +0100
Removed werk that is obsolete on master
---
.werks/438 | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/.werks/438 b/.werks/438
deleted file mode 100644
index 020b460..0000000
--- a/.werks/438
+++ /dev/null
@@ -1,12 +0,0 @@
-Title: Remove test-code, Micro Core only worked once per host
-Level: 2
-Component: core
-Class: fix
-State: unknown
-Version: 1.2.5i1
-Date: 1387556838
-Targetversion: future
-
-Due to remaining test-code the file <tt>/tmp/dev_null</tt> was created
-instead of <tt>/dev/null</tt>. That way only the first site using
-Check_MK Micro Core was working. This has been fixed.
Module: check_mk
Branch: master
Commit: 00cb77ae95203eb3843dfedb503354e7cec414df
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00cb77ae95203e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Dec 20 17:29:28 2013 +0100
FIX Remove test-code, Micro Core only worked once per host
Due to remaining test-code the file <tt>/tmp/dev_null</tt> was created
instead of <tt>/dev/null</tt>. That way only the first site using
Check_MK Micro Core was working. This has been fixed.
---
.werks/438 | 12 ++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/438 b/.werks/438
new file mode 100644
index 0000000..020b460
--- /dev/null
+++ b/.werks/438
@@ -0,0 +1,12 @@
+Title: Remove test-code, Micro Core only worked once per host
+Level: 2
+Component: core
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387556838
+Targetversion: future
+
+Due to remaining test-code the file <tt>/tmp/dev_null</tt> was created
+instead of <tt>/dev/null</tt>. That way only the first site using
+Check_MK Micro Core was working. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index d00d76d..07de03a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
* 0354 FIX: Catch exception when check plugins do not return a state...
* 0398 FIX: Tolerate debug output in check plugins when using CMC...
* 0314 FIX: Fix CMC not executing any Check_MK checks after config reload...
+ * 0438 FIX: Remove test-code, Micro Core only worked once per host...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/modules/check_mk.py b/modules/check_mk.py
index e989a6b..bef79a1 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -5133,7 +5133,7 @@ def do_check_keepalive():
keepalive_fd = opt_keepalive_fd
else:
keepalive_fd = os.dup(1)
- devnull = os.open("/tmp/dev_null", os.O_WRONLY | os.O_CREAT)
+ devnull = os.open("/dev/null", os.O_WRONLY | os.O_CREAT)
os.dup2(devnull, 1)
os.close(devnull)