Module: check_mk
Branch: master
Commit: b6561bf25a404ec7ade72544ded5ee1f58ca8e0b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6561bf25a404e…
Author: Sebastian Herbord <sh(a)mathias-kettner.de>
Date: Thu Aug 20 08:35:12 2015 +0200
ups_modulys_battery: bugfix
---
checks/ups_modulys_battery | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery
index 10b68e1..f054996 100644
--- a/checks/ups_modulys_battery
+++ b/checks/ups_modulys_battery
@@ -43,6 +43,14 @@ def check_ups_modulys_battery(item, params, info):
if elapsed_sec == 0:
# not on battery so the it will not run out
remainig_min = sys.maxint
+ elif not remaining_min:
+ # The "remaining_min" value isn't always reported and we don't know why.
+ # One theory is that it will be reported if on battery but we have no data to verify.
+ #
+ # If the theory holds true, this branch is never taken. If it doesn't then its likely
+ # the information is only available on some variants of the device or in some
+ # configurations. We can still report useful data based on "capacity"
+ remainig_min = sys.maxint
else:
remaining_min = int(remaining_min)
@@ -63,6 +71,10 @@ def check_ups_modulys_battery(item, params, info):
status = 2
elif remaining_min < warn_left or capacity < warn_perc:
status = 1
+ else:
+ status = 0
+
+ infotext = ""
if remaining_min < warn_left:
infotext = "%d minutes remaining (warn/crit at %d/%d min)" %\
Module: check_mk
Branch: master
Commit: bb1d308ab8104f7a7d591c37a650b600b1a9e883
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb1d308ab8104f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Aug 19 16:56:13 2015 +0200
#2420 mk_db2.aix: now able to monitor partitioned databases
The check db2_logsizes, db2_counters and db2_bp_hitratios are now able to
process data from partitioned databases (DBF mode). Previously, the checks ran into
an exception because the mk_db2.aix plugin reported incorrect formatted data.
Please note that you have to update the mk_db2.aix plugin on your db2 hosts
if you want to monitor databases in DBF mode. However, there is no need to do this.
The new checks are also able to work with the old mk_db2.aix plugin.
---
.werks/2420 | 15 ++++++++++++
ChangeLog | 1 +
agents/plugins/mk_db2.aix | 25 ++++++++++---------
checks/db2.include | 14 +++++------
checks/db2_bp_hitratios | 37 +++++++++++++++++++++++++---
checks/db2_counters | 48 +++++++++++++++++++++++++++++++-----
checks/db2_logsizes | 60 +++++++++++++++++++++++++++++++++++----------
7 files changed, 159 insertions(+), 41 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb1d308ab8…
Module: check_mk
Branch: master
Commit: 2eed82d7fadc8b276e084cf33a165c32c82551c9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eed82d7fadc8b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 19 16:51:07 2015 +0200
Updated bug entries #2304
---
.bugs/2304 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/2304 b/.bugs/2304
index bac8b78..ff2c1e7 100644
--- a/.bugs/2304
+++ b/.bugs/2304
@@ -1,9 +1,12 @@
Title: Process piggyback data even if "no agent" is selected
Component: core
-State: open
+Class: bug
+State: done
Date: 2015-02-24 10:18:14
Targetversion: 1.2.6
-Class: bug
If you just get Piggy data for a host you must be able to select 'no agent'. But
in that case the piggy data is not being processed - at least not by the inventory.
+
+2015-08-19 16:51:05: changed state open -> done
+Fixed.
Module: check_mk
Branch: master
Commit: 2909e259405009094df5c386bd7839705a492ee4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2909e259405009…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 19 16:26:35 2015 +0200
#2540 FIX Process piggy backed data even if host is set to "No Agent"
You need this fix for monitoring a VM just via ESX with no agent in the VM
itself. You can set this now to <i>No Agent</i> and the services shipped
from the ESX host or vCenter via piggy back are anyway correctly added to
the host. Before this fix the host would just get a PING check.
---
.werks/2540 | 13 +++++++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/2540 b/.werks/2540
new file mode 100644
index 0000000..0cd0e2f
--- /dev/null
+++ b/.werks/2540
@@ -0,0 +1,13 @@
+Title: Process piggy backed data even if host is set to "No Agent"
+Level: 1
+Component: core
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i3
+Date: 1439994260
+
+You need this fix for monitoring a VM just via ESX with no agent in the VM
+itself. You can set this now to <i>No Agent</i> and the services shipped
+from the ESX host or vCenter via piggy back are anyway correctly added to
+the host. Before this fix the host would just get a PING check.
diff --git a/ChangeLog b/ChangeLog
index ee1d393..e33460b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* 2465 FIX: Fixed broken Check_MK Discovery checks (check reports "(null)")
* 2502 FIX: Fixed removing autochecks when a host is configured to be ping only...
* 2526 FIX: Fixed crash in filesystem checks in case mountpoint contains non-ascii characters
+ * 2540 FIX: Process piggy backed data even if host is set to "No Agent"...
Checks & Agents:
* 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats, emc_vplex_if, emc_vplex_volumes...
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 45ba754..0aadd50 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -562,7 +562,7 @@ def is_tcp_host(hostname):
return in_binary_hostlist(hostname, tcp_hosts)
def is_ping_host(hostname):
- return not is_snmp_host(hostname) and not is_tcp_host(hostname)
+ return not is_snmp_host(hostname) and not is_tcp_host(hostname) and not has_piggyback_info(hostname)
def is_dual_host(hostname):
return is_tcp_host(hostname) and is_snmp_host(hostname)
Module: check_mk
Branch: master
Commit: 97982d2a2de1be63780321872a9861f5984f376c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97982d2a2de1be…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 19 16:23:42 2015 +0200
Updated bug entries #2295
---
.bugs/2295 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.bugs/2295 b/.bugs/2295
index 740fefe..3f8fd04 100644
--- a/.bugs/2295
+++ b/.bugs/2295
@@ -38,3 +38,6 @@ verursacht bei uns das Problem:
> parameters or error in implementation of check logwatch.ec. Please
> enable "Log exceptions in check plugins" for further information.
+
+MK 2015-08-19: Think we can drop the work-around now because the agent
+removes the BOM itself. Needs to be done and tested, though.