Module: check_mk
Branch: master
Commit: 5b71ed3455dcce023fe8a784c3bf41ff70c56989
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b71ed3455dcce…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Jul 31 17:06:19 2015 +0200
further update of #2413: prevents errors with certain ESX datasource configurations
---
agents/special/agent_vsphere | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 5597595..2c7c455 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -846,16 +846,16 @@ if not error:
###########################
# Datastores
###########################
- datastores = {} # We also need the datastore info later in the virtualmachines section
- if "datastore" in query_objects:
- reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"])
- elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response)
- for datastore, content in elements:
- entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content)
- datastores[datastore] = {}
- for name, value in entries:
- datastores[datastore][name] = value
+ datastores = {} # We need the datastore info later on in the virtualmachines and counter sections
+ reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"])
+ elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response)
+ for datastore, content in elements:
+ entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content)
+ datastores[datastore] = {}
+ for name, value in entries:
+ datastores[datastore][name] = value
+ if "datastore" in query_objects:
output("<<<esx_vsphere_datastores:sep(9)>>>")
for key in sorted(datastores.keys()):
data = datastores[key]
Module: check_mk
Branch: master
Commit: 1a8120a9675361c32560980ab9b146771033ce69
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8120a9675361…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Jul 31 10:35:20 2015 +0200
#2414 FIX logwatch: now really ignores ignored logwatch lines
When a logwatch line is set to ignored through a logwatch pattern
it is now correctly removed from the status file of the logwatch check.
---
.werks/2414 | 11 +++++++++++
ChangeLog | 1 +
checks/logwatch | 3 +++
3 files changed, 15 insertions(+)
diff --git a/.werks/2414 b/.werks/2414
new file mode 100644
index 0000000..5edf420
--- /dev/null
+++ b/.werks/2414
@@ -0,0 +1,11 @@
+Title: logwatch: now really ignores ignored logwatch lines
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1438331344
+Class: fix
+
+When a logwatch line is set to ignored through a logwatch pattern
+it is now correctly removed from the status file of the logwatch check.
+
diff --git a/ChangeLog b/ChangeLog
index 2c6a82c..bb78549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@
* 2500 FIX: qlogic_fcport: Can now deal with missing port status information...
* 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values
* 2490 FIX: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later
+ * 2414 FIX: logwatch: now really ignores ignored logwatch lines...
Multisite:
* 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions...
diff --git a/checks/logwatch b/checks/logwatch
index 5cc609a..8ea1e32 100644
--- a/checks/logwatch
+++ b/checks/logwatch
@@ -475,6 +475,9 @@ def check_logwatch_generic(item, params, loglines, found, groups=False):
except KeyError:
state_counts[level] = 1
+ if level == "I":
+ continue
+
block_lines.append(level + ' ' + text)
# The last section is finished here. Add it to the list of reclassified lines if the
Module: check_mk
Branch: master
Commit: dfdce5b36a359fb193ba83ae21557f027d1465c0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfdce5b36a359f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jul 30 17:26:43 2015 +0200
Updated bug entries #2339
---
.bugs/2339 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/.bugs/2339 b/.bugs/2339
new file mode 100644
index 0000000..8284d17
--- /dev/null
+++ b/.bugs/2339
@@ -0,0 +1,14 @@
+Title: waitmax (32 Bit) und 64 Bit Ubuntu Multiarch segfaults
+Component: checks
+State: open
+Date: 2015-07-30 17:25:38
+Targetversion: future
+Class: bug
+
+Solution could be: use /usr/bin/timeout where available. This should nowadays
+always be available. And only fall back to waitmax if missing. This could
+be done by an alias in the agent itself.
+
+if which timeout ; then
+ alias waitmax='timeout'
+fi
Module: check_mk
Branch: master
Commit: 4f36d64822a445523643d3fbf295f61ee7758234
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f36d64822a445…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jul 30 17:20:06 2015 +0200
Fix exception in WATO when activating changes while an error occurs
---
modules/automation.py | 1 +
web/htdocs/wato.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/automation.py b/modules/automation.py
index 9051ed5..4349118 100644
--- a/modules/automation.py
+++ b/modules/automation.py
@@ -455,6 +455,7 @@ def automation_delete_host(args):
os.system("rm -rf '%s'" % path)
def automation_restart(job = "restart", use_rushd = True):
+
# make sure, Nagios does not inherit any open
# filedescriptors. This really happens, e.g. if
# check_mk is called by WATO via Apache. Nagios inherits
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 5c32900..127efb3 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11739,7 +11739,7 @@ def ajax_replication():
# Pre 1.2.7i3 sites return True on success and a string on error.
# 1.2.7i3 and later return a ist of warning messages on success.
# [] means OK and no warnings. The error handling is unchanged
- if result == True:
+ if result == True or result == None:
result = []
if type(result) == list: