Module: check_mk
Branch: master
Commit: ac0a7cd365f8cf53bf364e2a53f1cf215268f96c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac0a7cd365f8cf…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 14:07:39 2014 +0100
Updated bug entries #2263
---
.bugs/2263 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.bugs/2263 b/.bugs/2263
new file mode 100644
index 0000000..6f5f706
--- /dev/null
+++ b/.bugs/2263
@@ -0,0 +1,11 @@
+Title: Cannot configure SNMPv3 directly as host attribute
+Component: wato
+State: open
+Date: 2014-12-04 14:06:33
+Targetversion: future
+Class: nastiness
+
+If you have a community entered in a folder then you cannot override single hosts
+in that folder to use v3. We need the SNMP configuration for v3 also in the host
+attributes - the complete ValueSpec for SNMP credentials and not only the community
+string.
Module: check_mk
Branch: master
Commit: e5c9b4be36fe0788987092fc594640622abeb786
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5c9b4be36fe07…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 4 13:53:57 2014 +0100
#1644 FIX Fixed matching dynamic number of regex match groups
Regexes and rewrites like this here lead into an exception when matching:
Regex: foo(bar|baz(abc|xyz)) (stuff to match and reference)
Rewrite: Service foo\1 said: \3
LogLine: foobar asasdsadxxxxx
---
.werks/1644 | 13 +++++++++++++
ChangeLog | 1 +
mkeventd/bin/mkeventd | 7 ++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/.werks/1644 b/.werks/1644
new file mode 100644
index 0000000..949d0e8
--- /dev/null
+++ b/.werks/1644
@@ -0,0 +1,13 @@
+Title: Fixed matching dynamic number of regex match groups
+Level: 1
+Component: ec
+Compatible: compat
+Version: 1.2.5i7
+Date: 1417697483
+Class: fix
+
+Regexes and rewrites like this here lead into an exception when matching:
+
+Regex: foo(bar|baz(abc|xyz)) (stuff to match and reference)
+Rewrite: Service foo\1 said: \3
+LogLine: foobar asasdsadxxxxx
diff --git a/ChangeLog b/ChangeLog
index c97f8b2..cafe1e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -193,6 +193,7 @@
* 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events
* 1610 FIX: Hostname translation now also works for incoming SNMP traps
* 1643 FIX: Improved error handling of exceptions when processing log lines
+ * 1644 FIX: Fixed matching dynamic number of regex match groups...
Livestatus:
* 1613 FIX: Fixed invalid json format in Stats query with requested heaeders...
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 1850ece..2d13f05 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -199,7 +199,12 @@ def match(pattern, text, complete = True):
# Assume compiled regex
m = pattern.search(text)
if m:
- return m.groups()
+ groups = m.groups()
+ if None in groups:
+ # Remove None from result tuples and replace it with empty strings
+ return tuple([g != None and g or '' for g in groups])
+ else:
+ return groups
else:
return False
Module: check_mk
Branch: master
Commit: 2a17bf4af965b72f2d9760b2cb4c54913e893dc1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a17bf4af965b7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 13:39:15 2014 +0100
#1631 juniper_bgp_state: check now detects and supports more differen device models
It would only detect MX5, but now works also for other devices. Thanks to Konstantin Orlov.
---
.werks/1631 | 9 +++++++++
ChangeLog | 1 +
checks/juniper_bgp_state | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/1631 b/.werks/1631
new file mode 100644
index 0000000..8591a72
--- /dev/null
+++ b/.werks/1631
@@ -0,0 +1,9 @@
+Title: juniper_bgp_state: check now detects and supports more differen device models
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i7
+Date: 1417696679
+Class: feature
+
+It would only detect MX5, but now works also for other devices. Thanks to Konstantin Orlov.
diff --git a/ChangeLog b/ChangeLog
index 5dee200..1491ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@
* 1627 megaraid_ldisks: Warn if current cache or write policy differs from logical drive default policy...
* 1629 check_mk_agent.freebsd: several new features and improvements, now only use statgrab...
* 1630 smart: update in plugin that also outputs information about disks attached to a MegaRAID controller...
+ * 1631 juniper_bgp_state: check now detects and supports more differen device models...
* 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization...
* 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it...
* 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices...
diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state
index a6f4fce..4c6d030 100644
--- a/checks/juniper_bgp_state
+++ b/checks/juniper_bgp_state
@@ -77,6 +77,6 @@ check_info["juniper_bgp_state"] = {
2, # jnxBgpM2PeerState
3 ]), # jnxBgpM2PeerStatus
# (like operational status)
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2.90"),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"),
"has_perfdata" : False,
}
Module: check_mk
Branch: master
Commit: f81d20bdd188e5048c90d96356877833f7cdb5a0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f81d20bdd188e5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 13:26:03 2014 +0100
Remove bug path of postconf in check_mk_agent.linux
---
agents/check_mk_agent.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 73f103a..d381007 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -501,7 +501,7 @@ fi
# Only handle the last 6 lines (includes the summary line at the bottom and
# the last message in the queue. The last message is not used at the moment
# but it could be used to get the timestamp of the last message.
-if type postconf ; then
+if type postconf >/dev/null ; then
echo '<<<postfix_mailq>>>'
postfix_queue_dir=$(postconf -h queue_directory)
postfix_count=$(find $postfix_queue_dir/deferred -type f | wc -l)