Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: Fix crash in WATO module for check plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 58ec38e47ad960f257be26cb431b5a13dd56e93c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58ec38e47ad960… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 12:15:47 2015 +0200 Fix crash in WATO module for check plugins --- checkman/kentix_amp_sensors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/kentix_amp_sensors b/checkman/kentix_amp_sensors index 2747d28..78b734e 100644 --- a/checkman/kentix_amp_sensors +++ b/checkman/kentix_amp_sensors @@ -1,6 +1,6 @@ title: Kentix Alarmmanager Pro: Temperature agents: snmp -catalog: hw/environment +catalog: hw/environment/kentix license: GPL distribution: check_mk description:

8 years, 10 months

Check_MK Git: check_mk: check_ldap: fix fatal bug if new hostname is *not* specified

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a7b1750b16044b7195660bff7ab1e2b0bafcf4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a7b1750b16044… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 11:40:33 2015 +0200 check_ldap: fix fatal bug if new hostname is *not* specified --- checks/check_ldap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/check_ldap b/checks/check_ldap index 346a489..7a7f354 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -30,7 +30,7 @@ def check_ldap_arguments(params): if "hostname" in settings: args = ' -H %s' % quote_shell_string(settings["hostname"]) else: - args = ' -H $HOSTADDRESS' + args = ' -H $HOSTADDRESS$' args += ' -b %s' % quote_shell_string(basedn)

8 years, 10 months

Check_MK Git: check_mk: #2533 Allow inverted match in Event Console rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 87fe34c5048cc0bee2f54809cea3d228b413f92c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87fe34c5048cc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 10:42:07 2015 +0200 #2533 Allow inverted match in Event Console rules --- .werks/2533 | 9 ++ ChangeLog | 1 + mkeventd/bin/mkeventd | 157 ++++++++++++++++++--------------- mkeventd/web/htdocs/mkeventd.py | 11 +++ mkeventd/web/plugins/wato/mkeventd.py | 17 +++- 5 files changed, 122 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=87fe34c504…

8 years, 10 months

Check_MK Git: check_mk: #2534 FIX Fixed implementation of skipping rule packs

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e30758eea86d4db02c6be264569cdc6e392b718 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e30758eea86d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 10:43:00 2015 +0200 #2534 FIX Fixed implementation of skipping rule packs --- .werks/2534 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/2534 b/.werks/2534 new file mode 100644 index 0000000..2ffe4bc --- /dev/null +++ b/.werks/2534 @@ -0,0 +1,10 @@ +Title: Fixed implementation of skipping rule packs +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1439282560 + + diff --git a/ChangeLog b/ChangeLog index ab4f8d3..d97e7b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ * 2533 Allow inverted match in Event Console rules * 2322 FIX: mkeventd: MIBs are now only loaded if SNMP Traps translation is activated... * 2460 FIX: Slightly more robust SNMP trap translation... + * 2534 FIX: Fixed implementation of skipping rule packs Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 11edaff..c01e81b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1874,15 +1874,17 @@ class EventServer: skip_pack = None for rule in rule_candidates: - if skip_pack and rule["pack"] != skip_pack: + if skip_pack and rule["pack"] == skip_pack: continue # still in the rule pack that we want to skip skip_pack = None # new pack, reset skipping try: result = self.event_rule_matches(rule, event) + except Exception: log(' Exception during matching:\n%s' % format_exception()) result = False + if result: g_perfcounters.count("rule_hits") cancelling, groups = result @@ -1900,7 +1902,8 @@ class EventServer: if rule["drop"] == "skip_pack": skip_pack = rule["pack"] if g_config["debug_rules"]: - log(" skipping this rule pack") + log(" skipping this rule pack (%s)" % skip_pack) + continue else: g_perfcounters.count("drops") return

8 years, 10 months

Check_MK Git: check_mk: Added missing new EC icon for rule inverting

by Mathias Kettner

Module: check_mk Branch: master Commit: e0b6d3713ed51407964ba94b65481772c47571cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0b6d3713ed514… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 10:43:32 2015 +0200 Added missing new EC icon for rule inverting --- mkeventd/web/htdocs/images/icon_inverted.png | Bin 0 -> 2653 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mkeventd/web/htdocs/images/icon_inverted.png b/mkeventd/web/htdocs/images/icon_inverted.png new file mode 100644 index 0000000..5cbf37d Binary files /dev/null and b/mkeventd/web/htdocs/images/icon_inverted.png differ

8 years, 10 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: a5bddaffff7c4db4c0e578a5ab5e06341c05185e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5bddaffff7c4d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 10:41:27 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 96633c9..fe534ad 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2533 +2543

8 years, 10 months

Check_MK Git: check_mk: #2492 FIX check_mk_agent.linux: avoid problems with crashing waitmax after Ubuntu update

by Mathias Kettner

Module: check_mk Branch: master Commit: f37145e2dc88f8faff05dfe646f99a5e9bdc0247 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f37145e2dc88f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 11 09:23:54 2015 +0200 #2492 FIX check_mk_agent.linux: avoid problems with crashing waitmax after Ubuntu update Some users have reported that after an update of their Ubuntu target hosts, the command <tt>/usr/bin/waitmax</tt>, which is shipped with the Check_MK Agent, actually segfaults the program being run with it. This could be related to the fact that <tt>waitmax</tt> is statically linked in order to be independent of 32/64 bits and of the libc in use. The agent now looks if <tt>/usr/bin/timeout</tt> exists and prefers that over <tt>waitmax</tt>. <tt>timeout</tt> has been introduced in the coreutils version 8+. It is missing e.g. on RedHat 5.X, so <tt>waitmax</tt> is still needed for a couple of years... --- .werks/2492 | 16 ++++++++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 13 +++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.werks/2492 b/.werks/2492 new file mode 100644 index 0000000..aed5b51 --- /dev/null +++ b/.werks/2492 @@ -0,0 +1,16 @@ +Title: check_mk_agent.linux: avoid problems with crashing waitmax after Ubuntu update +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439277549 +Class: fix + +Some users have reported that after an update of their Ubuntu target hosts, the command +<tt>/usr/bin/waitmax</tt>, which is shipped with the Check_MK Agent, actually segfaults +the program being run with it. This could be related to the fact that <tt>waitmax</tt> +is statically linked in order to be independent of 32/64 bits and of the libc in use. + +The agent now looks if <tt>/usr/bin/timeout</tt> exists and prefers that over <tt>waitmax</tt>. +<tt>timeout</tt> has been introduced in the coreutils version 8+. It is missing e.g. +on RedHat 5.X, so <tt>waitmax</tt> is still needed for a couple of years... diff --git a/ChangeLog b/ChangeLog index 9beb2d7..7364270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 2504 FIX: cups_queues: Fixed wrong queue discovery on hosts running apcupsd * 2506 FIX: Diskstat summary: Ignoring stats from LVM devices * 2455 FIX: raritan_pdu_inlet: Fixed scaling... + * 2492 FIX: check_mk_agent.linux: avoid problems with crashing waitmax after Ubuntu update... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 8302fb4..3889213 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -64,6 +64,17 @@ else exec </dev/null 2>/dev/null fi +# Prefer (relatively) new /usr/bin/timeout from coreutils against +# our shipped waitmax. waitmax is statically linked and crashes on +# some Ubuntu versions recently. +if type timeout >/dev/null 2>&1 ; then + function waitmax () { + timeout "$@" + } + export -f waitmax +fi + + # Runs a command asynchronous by use of a cache file. Usage: # run_cached [-s] NAME MAXAGE # -s creates the section header <<<$NAME>>> @@ -254,8 +265,6 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -# waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' -# New implementation: netstat is very slow for large TCP tables cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' # Linux Multipathing

8 years, 10 months

Check_MK Git: check_mk: Made discovery of bosch cameras a bit more specific ( fix discovery on cisco devices)

by Lars Michelsen

Module: check_mk Branch: master Commit: a2137d7d9cae4dd636911683a203b558180683d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2137d7d9cae4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 11 09:06:07 2015 +0200 Made discovery of bosch cameras a bit more specific (fix discovery on cisco devices) --- checks/bvip.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/bvip.include b/checks/bvip.include index c8e3c4b..1d5b705 100644 --- a/checks/bvip.include +++ b/checks/bvip.include @@ -26,7 +26,7 @@ def bvip_scan_function(oid): sysinfo = oid(".1.3.6.1.2.1.1.1.0") - for what in ["FLEXIDOME", "VIP", 'DINION', 'AUTODOME']: + for what in ["FLEXIDOME", "VIP-X", 'DINION', 'AUTODOME']: if what in sysinfo.upper(): return True return False

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0853

by Bastian Kuhn

Module: check_mk Branch: master Commit: bb61b5e530c6490cef040f1a29a362486d3f809e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb61b5e530c649… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 15:42:46 2015 +0200 Updated bug entries #0853 --- .bugs/853 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/853 b/.bugs/853 new file mode 100644 index 0000000..5b24245 --- /dev/null +++ b/.bugs/853 @@ -0,0 +1,8 @@ +Title: Wato Distributed Setup: Liveproxy +Component: wato +State: open +Date: 2015-08-10 15:41:06 +Targetversion: 1.2.7 +Class: nastiness + +The Liveproxy has lot of settings who the most of the useres never change. This settings should be hidded per default

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0852

by Bastian Kuhn

Module: check_mk Branch: master Commit: f90f9053f0871814ffdeff8673ef89de8fae4150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90f9053f08718… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 10 15:41:00 2015 +0200 Updated bug entries #0852 --- .bugs/852 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/852 b/.bugs/852 new file mode 100644 index 0000000..ee5561c --- /dev/null +++ b/.bugs/852 @@ -0,0 +1,8 @@ +Title: It is not possible to delete the "Status Host" in "Edit site connection" +Component: wato +State: open +Date: 2015-08-10 15:39:15 +Targetversion: 1.2.6 +Class: bug + +In Wato -> Distributed Monitoring -> Edit site conenction it is not possible to delete a statushost later

8 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015