Module: check_mk
Branch: master
Commit: 676ea5ad54854e733d9cfcad701812e2604f6dc8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=676ea5ad54854e…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Tue Mar 3 13:59:37 2015 +0100
#1893 cisco_power: Now discovers all power supplies, not only redundant ones
The check previously ignored non-redundant power supplies. Now, all are inventorized.
---
.werks/1893 | 9 +++++++++
ChangeLog | 1 +
checkman/cisco_power | 2 +-
checks/cisco_power | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/1893 b/.werks/1893
new file mode 100644
index 0000000..fb4677a
--- /dev/null
+++ b/.werks/1893
@@ -0,0 +1,9 @@
+Title: cisco_power: Now discovers all power supplies, not only redundant ones
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i1
+Date: 1425387426
+Class: feature
+
+The check previously ignored non-redundant power supplies. Now, all are inventorized.
diff --git a/ChangeLog b/ChangeLog
index 47f18ca..7b93eda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,7 @@
NOTE: Please refer to the migration notes!
* 1952 check_mk_agent.linux: integrated runas plugin into check_mk_agent.linux...
* 2083 Added Siemens PLC (SPS) monitoring...
+ * 1893 cisco_power: Now discovers all power supplies, not only redundant ones...
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
diff --git a/checkman/cisco_power b/checkman/cisco_power
index 87c59ba..7d0214b 100644
--- a/checkman/cisco_power
+++ b/checkman/cisco_power
@@ -4,7 +4,7 @@ catalog: hw/network/cisco
license: GPL
distribution: check_mk
description:
- This check monitors the health of redundant power supplies in
+ This check monitors the health of power supplies in
Cisco switches. If one of the two power supplies fails, the
check returns {CRIT}.
diff --git a/checks/cisco_power b/checks/cisco_power
index 7dc3e81..b16a74d 100644
--- a/checks/cisco_power
+++ b/checks/cisco_power
@@ -56,7 +56,7 @@ def inventory_cisco_power(info):
# by appending a "/4" for ID 4 if the name is not unique
discovered = {}
for sid, textinfo, state, source in info:
- if 'RPS NotExist' not in textinfo and state != '5':
+ if state != '5':
name = cisco_sensor_item(textinfo, sid)
discovered.setdefault(name, []).append(sid)
Module: check_mk
Branch: master
Commit: dbee4153c0441d24497158a25d9834ac8df5e556
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbee4153c0441d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Mar 3 13:20:21 2015 +0100
#2087 FIX netapp_api_temp: Fixed exception when dealing with old discovered checks
When services have been discovered with old versions, the discovered parameters
were None, which lead to an exception with the current check during checking.
Handling this kind of data now for compatiblity reasons.
---
.werks/2087 | 12 ++++++++++++
ChangeLog | 1 +
werk | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/2087 b/.werks/2087
new file mode 100644
index 0000000..b09ac1f
--- /dev/null
+++ b/.werks/2087
@@ -0,0 +1,12 @@
+Title: netapp_api_temp: Fixed exception when dealing with old discovered checks
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425385145
+
+When services have been discovered with old versions, the discovered parameters
+were None, which lead to an exception with the current check during checking.
+Handling this kind of data now for compatiblity reasons.
diff --git a/ChangeLog b/ChangeLog
index 26f5198..2cd6e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -217,6 +217,7 @@
* 2049 FIX: window agents: prevent errors with invalid plugin output...
* 2050 FIX: netapp_api_if: Fixed invalid speed warning for virtual interface groups...
* 2086 FIX: apc_ats_status: Fixed exception when source different than selected source
+ * 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered checks...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/werk b/werk
index 0865e04..4225adc 100755
--- a/werk
+++ b/werk
@@ -109,7 +109,7 @@ def parse_changelog():
global g_current_version
ch = file("../ChangeLog")
version = ch.readline().strip().rstrip(":")
- if len(version) not in [ 6, 7, 8, 9, 10 ] or \
+ if len(version) not in [ 5, 6, 7, 8, 9, 10 ] or \
not version[0].isdigit() or \
version[1] != '.':
bail_out("Invalid version number '%s' in ChangeLog" % version)
Module: check_mk
Branch: master
Commit: 2af16afd57b62a30fe804336ac643f6b51c5c82d
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2af16afd57b62a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Mar 3 12:12:36 2015 +0100
#2050 FIX netapp_api_if: Fixed invalid speed warning for virtual interface groups
The check incorrectly reported "Interfaces do not have the same speed" when
multiple virtual interfaces shared the same MAC address.
---
.werks/2050 | 12 ++++++++++++
ChangeLog | 1 +
checks/netapp_api_if | 13 +++++++------
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/.werks/2050 b/.werks/2050
new file mode 100644
index 0000000..744574d
--- /dev/null
+++ b/.werks/2050
@@ -0,0 +1,12 @@
+Title: netapp_api_if: Fixed invalid speed warning for virtual interface groups
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425381040
+
+The check incorrectly reported "Interfaces do not have the same speed" when
+multiple virtual interfaces shared the same MAC address.
+
diff --git a/ChangeLog b/ChangeLog
index 165f7d4..47f18ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -215,6 +215,7 @@
* 2079 FIX: freebsd agent: Was unable to find ntpq command with FreeBSD10...
* 2082 FIX: jolokia_metrics.mem: Fixed levels on total memory usage
* 2049 FIX: window agents: prevent errors with invalid plugin output...
+ * 2050 FIX: netapp_api_if: Fixed invalid speed warning for virtual interface groups...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/checks/netapp_api_if b/checks/netapp_api_if
index e6de141..a267db2 100644
--- a/checks/netapp_api_if
+++ b/checks/netapp_api_if
@@ -100,8 +100,6 @@ def netapp_convert_to_if64(info):
# speed as the virtual speed. Note: Depending on the configuration this behaviour might
# differ, e.g. the speed of all interfaces might get accumulated..
# Additionally, we check if not all interfaces of the virtual group share the same connection speed
- max_speed = 0
- min_speed = 0
if not speed:
if "mac-address" in values:
mac_list = if_mac_list[values["mac-address"]]
@@ -109,13 +107,16 @@ def netapp_convert_to_if64(info):
extra_info.setdefault(nic_name, {})
extra_info[nic_name]["grouped_if"] = [ x for x in mac_list if x not in vif_list ]
+ max_speed = 0
+ min_speed = 1024**5
for tmp_if in mac_list:
- if tmp_if == nic_name:
+ if tmp_if == nic_name or "speed" not in interfaces[tmp_if]:
continue
- max_speed = max(max_speed, interfaces[tmp_if].get("speed", 0))
- min_speed = min(max_speed, interfaces[tmp_if].get("speed", 0))
+ check_speed = interfaces[tmp_if]["speed"]
+ max_speed = max(max_speed, check_speed)
+ min_speed = min(min_speed, check_speed)
if max_speed != min_speed:
- extra_info[nic_name]["speed_differs"] = True
+ extra_info[nic_name]["speed_differs"] = (max_speed, min_speed)
speed = max_speed
# Virtual interfaces is "Up" if at least one physical interface is up
Module: check_mk
Branch: master
Commit: 086a13b64c9b8e342f6c8c7811c51bb479327716
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=086a13b64c9b8e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Mar 3 10:35:49 2015 +0100
Updated bug entries #2307, #2270
---
.bugs/2270 | 6 ++++--
.bugs/2307 | 26 ++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/.bugs/2270 b/.bugs/2270
index e0c5f5f..d7d6214 100644
--- a/.bugs/2270
+++ b/.bugs/2270
@@ -1,8 +1,10 @@
Title: Fix many WATO rules where above needs to be replaced with at
Component: checks
-State: open
+Class: bug
+State: done
Date: 2015-01-22 14:45:46
Targetversion: 1.2.6
-Class: bug
There is a commit (0470292ef?) that needs to be reverted.
+
+2015-03-02 14:32:52: changed state open -> done
diff --git a/.bugs/2307 b/.bugs/2307
new file mode 100644
index 0000000..f21a485
--- /dev/null
+++ b/.bugs/2307
@@ -0,0 +1,26 @@
+Title: Automatic removal of duplicate services SNMP vs. Agent can fail
+Component: core
+State: open
+Date: 2015-03-03 10:32:56
+Targetversion: 1.2.6
+Class: bug
+
+Situtation:
+
+Host is declared TCP + SNMP
+Discovery is done -> df and hr_fs checks for the same filesystems
+Duplicates are correctly removed
+
+Later the host is redeclared as TCP-only
+Checks hr_fs remain in autochecks
+
+get_check_table() now does *not* remove the duplicates since host_is_dual()
+does not hold anymore.
+Config generation runs into an exception because of duplicate checks.
+
+Proposed resolution: If a is is *not* snmp, get_check_table should
+remove *all* SNMP checks. Same holds for TCP.
+
+Note: This does change the semantics a bit but is more clean. A
+host cannot try to access an agent anymore if it is not tagged
+SNMP or TCP resp.
Module: check_mk
Branch: master
Commit: fb8e6c775388cfa400181ff468c06619fe4da416
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb8e6c775388cf…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Mar 3 08:45:03 2015 +0100
#2085 FIX Host search for child nodes can now filter child nodes by tags or patterns
Rules in Check_MK BI can be configured to iterate over the childs of parent
nodes for a long time now. But it was not possible to filter the found child
hosts by tags or patterns. The tags which could be configured were only affecting
the parent host. Now it possible to filter the childs by tags or regex patterns.
---
.werks/2085 | 12 +++++++
ChangeLog | 1 +
web/htdocs/bi.py | 66 ++++++++++++++++++++---------------
web/htdocs/config.py | 1 +
web/htdocs/wato.py | 93 ++++++++++++++++++++++++++++++++++++--------------
5 files changed, 120 insertions(+), 53 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fb8e6c7753…
Module: check_mk
Branch: master
Commit: 2d776e608b660bcaafbd2c0d620b3ad7edcc14bd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d776e608b660b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 2 15:11:39 2015 +0100
Updated bug entries #2305
---
.bugs/2305 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/2305 b/.bugs/2305
index aefec22..053a63c 100644
--- a/.bugs/2305
+++ b/.bugs/2305
@@ -1,9 +1,9 @@
Title: User setting Disable Notifications vanishes also for admin for permission is missing
Component: wato
-State: open
+Class: bug
+State: done
Date: 2015-02-24 11:43:13
Targetversion: 1.2.6
-Class: bug
If a user does not have the permission general.disable_notifications, then the checkbox
in his personal settings for this option is not visible. Even if the user settings are edited
@@ -19,3 +19,6 @@ Solution:
In our case the notifications were disabled but this was completely hidden and only
visible in users.mk.
+
+2015-03-02 15:11:35: changed state open -> done
+Fixed