Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 23730fcb57a1d9501ed2dbf27f8ddd9869ee01ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23730fcb57a1d9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 13:24:03 2017 +0100 Fix botched merge Change-Id: I6380d6c07cd3e8b6e58c5f14b1cfae9c0ee7fed6 --- checks/jolokia_metrics | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 5879ad3..8af0feb 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -731,6 +731,7 @@ check_info["jolokia_metrics.threads"] = { "inventory_function" : lambda i: inventory_jolokia_metrics(i, "threads"), "group" : "jvm_threads", "has_perfdata" : True, +} #. # .--Uptime--------------------------------------------------------------.

7 years, 10 months

Fixed missing individual help text in RegExp() and RegExpUnicode() fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a5931428b72539d09385758ad73e93ee5a122ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a5931428b7253… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:09:25 2017 +0100 Fixed missing individual help text in RegExp() and RegExpUnicode() fields Change-Id: If8b36af8b966c2cd1a5f0d2cf1e28476111fe94e --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0eb1931..efe48bf 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -546,7 +546,7 @@ class RegExp(TextAscii): prefix = "prefix" complete = "complete" - def __init__(self, mode, help=None, **kwargs): + def __init__(self, mode, **kwargs): self._mode = mode self._case_sensitive = kwargs.get("case_sensitive", True)

7 years, 10 months

4286 SNMP MIBs of the Event Console can now be packed using MKPs

by Lars Michelsen

Module: check_mk Branch: master Commit: ad46a55d681f26a394260300a5d49a4f4febabdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad46a55d681f26… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 13:02:11 2017 +0100 4286 SNMP MIBs of the Event Console can now be packed using MKPs The MIB files stored below <tt>local/share/snmp/mibs</tt> can now be packed with MKP packages. Change-Id: I5abd84ec2b6ba8658076bf60a17038afc48e92b9 --- .werks/4286 | 10 ++++++++++ ChangeLog | 1 + cmk_base/packaging.py | 1 + lib/paths.py | 5 ++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/4286 b/.werks/4286 new file mode 100644 index 0000000..708b33a --- /dev/null +++ b/.werks/4286 @@ -0,0 +1,10 @@ +Title: SNMP MIBs of the Event Console can now be packed using MKPs +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i4 +Date: 1485345684 +Class: feature + +The MIB files stored below <tt>local/share/snmp/mibs</tt> can now +be packed with MKP packages. diff --git a/ChangeLog b/ChangeLog index cd55277..fc07451 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.4.0i4: Core & Setup: + * 4286 SNMP MIBs of the Event Console can now be packed using MKPs... * 4269 FIX: Verifying unexpected keys in check_info while loading checks... * 4281 FIX: Fixed piggyback hosts with spaces in names leading to crashes... diff --git a/cmk_base/packaging.py b/cmk_base/packaging.py index b0812f7..e0d4f21 100644 --- a/cmk_base/packaging.py +++ b/cmk_base/packaging.py @@ -73,6 +73,7 @@ package_parts = [ (part, title, perm, ldir and ldir or dir) for part, title, per ( "doc", "Documentation files", 0644, cmk.paths.doc_dir, cmk.paths.local_doc_dir ), ( "bin", "Binaries", 0755, None, cmk.paths.local_bin_dir ), ( "lib", "Libraries", 0644, None, cmk.paths.local_lib_dir), + ( "mibs", "SNMP MIBs", 0644, None, cmk.paths.local_mib_dir), ]] package_ignored_files = { diff --git a/lib/paths.py b/lib/paths.py index b84d44b..7092d45 100644 --- a/lib/paths.py +++ b/lib/paths.py @@ -85,8 +85,10 @@ mibs_dir = None web_dir = None pnp_templates_dir = None doc_dir = None +locale_dir = None bin_dir = None lib_dir = None +mib_dir = None # TODO: Add active_checks_dir and make it used in code local_share_dir = None @@ -99,10 +101,10 @@ local_mibs_dir = None local_web_dir = None local_pnp_templates_dir = None local_doc_dir = None -locale_dir = None local_locale_dir = None local_bin_dir = None local_lib_dir = None +local_mib_dir = None def _set_paths(): @@ -206,6 +208,7 @@ def _set_overridable_paths(local=False): var_prefix+"locale_dir" : os.path.join(omd_root, rel_base, "share/check_mk/locale"), var_prefix+"bin_dir" : os.path.join(omd_root, rel_base, "bin"), var_prefix+"lib_dir" : os.path.join(omd_root, rel_base, "lib"), + var_prefix+"mib_dir" : os.path.join(omd_root, rel_base, "share/snmp/mibs"), })

7 years, 10 months

4302 FIX win_wmi_software: fixed invalid data handling

by Simon Betz

Module: check_mk Branch: master Commit: d57654c0ff06f2228a77e01825ac233624fe3318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d57654c0ff06f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 12:50:32 2017 +0100 4302 FIX win_wmi_software: fixed invalid data handling Change-Id: I6df20ca80218fc402c675d3786770b3fb4387e55 --- .werks/4302 | 10 ++++++++++ ChangeLog | 1 + inventory/win_wmi_software | 13 ++++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.werks/4302 b/.werks/4302 new file mode 100644 index 0000000..f8dc676 --- /dev/null +++ b/.werks/4302 @@ -0,0 +1,10 @@ +Title: win_wmi_software: fixed invalid data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485345009 + + diff --git a/ChangeLog b/ChangeLog index 63bdde2..cd55277 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 4299 FIX: df: fixed missing filesystem type handling * 4300 FIX: job: fixed missing information handling * 4301 FIX: winperf_tcp_conn: fixed missing data handling + * 4302 FIX: win_wmi_software: fixed invalid data handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index 00a778b..3365111 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -37,17 +37,20 @@ def inv_win_wmi_software(info): paclist = inv_tree_list("software.packages:") for line in info: - pacname, vendor, version = line[0:3] + if len(line) < 3: + continue + + pacname, vendor, version = line[:3] dat = line[3] install_date = None if len(dat) == 8 and re.match("^20", dat): install_date = int(time.mktime(time.strptime(dat, "%Y%m%d"))) - # contains language as well - if len(line) == 5: - language = line[4] - else: + # contains language as well + if len(line) == 5: + language = line[4] + else: language = "" entry = {

7 years, 10 months

4301 FIX winperf_tcp_conn: fixed missing data handling

by Simon Betz

Module: check_mk Branch: master Commit: ee2f6284439a95566b743945ab4b551caeb5000d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee2f6284439a95… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 12:15:15 2017 +0100 4301 FIX winperf_tcp_conn: fixed missing data handling Change-Id: I8232d9773ba242d508c2c9c5d21b92bc7aa949f6 --- .werks/4301 | 10 ++++++++++ ChangeLog | 1 + checks/winperf_tcp_conn | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/4301 b/.werks/4301 new file mode 100644 index 0000000..01c24b1 --- /dev/null +++ b/.werks/4301 @@ -0,0 +1,10 @@ +Title: winperf_tcp_conn: fixed missing data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485342878 + + diff --git a/ChangeLog b/ChangeLog index 514b0fc..63bdde2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 4298 FIX: omd_apache: fixed missing data handling * 4299 FIX: df: fixed missing filesystem type handling * 4300 FIX: job: fixed missing information handling + * 4301 FIX: winperf_tcp_conn: fixed missing data handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/winperf_tcp_conn b/checks/winperf_tcp_conn index 287e2c7..1d8e425 100644 --- a/checks/winperf_tcp_conn +++ b/checks/winperf_tcp_conn @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # Example output from agent: # <<<winperf_tcp_conn>>> # 1368619819.06 638 @@ -36,10 +37,16 @@ # 14 34830 counter # 16 18437 counter + def inventory_winperf_tcp_conn(info): - return [ (None, {}) ] + if len(info) > 1: + return [ (None, {}) ] + def check_winperf_tcp_conn(item, params, info): + if len(info) == 1: + raise MKCounterWrapped("Got no information from agent") + fields = [ ( 2, "Established", "ESTABLISHED" ), ] @@ -64,6 +71,7 @@ def check_winperf_tcp_conn(item, params, info): infotext = infotext[:-2] return worst_state, infotext, perfdata + check_info["winperf_tcp_conn"] = { 'check_function': check_winperf_tcp_conn, 'inventory_function': inventory_winperf_tcp_conn,

7 years, 10 months

jolokia_metrics: Sort subchecks into sections (intermediate step)

by Konstantin Büttner

Module: check_mk Branch: master Commit: a253ce2ef1b2259eb333368a23a2ff4b2c1f2ce9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a253ce2ef1b225… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 12:07:43 2017 +0100 jolokia_metrics: Sort subchecks into sections (intermediate step) Change-Id: I2bac102134a754917e4bd6b8c3212706e51a8b9a --- checks/jolokia_metrics | 646 ++++++++++++++++++++++++++++++------------------- 1 file changed, 395 insertions(+), 251 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a253ce2ef1…

7 years, 10 months

4300 FIX job: fixed missing information handling

by Simon Betz

Module: check_mk Branch: master Commit: e99e75aebba6d31d4ed1bdc8372ae9c544119167 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e99e75aebba6d3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 12:03:06 2017 +0100 4300 FIX job: fixed missing information handling Change-Id: Icd646e5c5cc6bd8ff1b004fcf3267b8b4996f46a --- .werks/4300 | 10 ++++++++++ ChangeLog | 1 + checks/job | 32 +++++++++++++++++++++----------- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.werks/4300 b/.werks/4300 new file mode 100644 index 0000000..f2dc873 --- /dev/null +++ b/.werks/4300 @@ -0,0 +1,10 @@ +Title: job: fixed missing information handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485342137 + + diff --git a/ChangeLog b/ChangeLog index ed537dd..514b0fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 4297 FIX: oracle_instance: fixed discovery function... * 4298 FIX: omd_apache: fixed missing data handling * 4299 FIX: df: fixed missing filesystem type handling + * 4300 FIX: job: fixed missing information handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/job b/checks/job index 091304c..5fbe10e 100644 --- a/checks/job +++ b/checks/job @@ -48,10 +48,12 @@ # max_res_kbytes 1984 # avg_mem_kbytes 0 + factory_settings["job_default_levels"] = { "age": (0, 0) # disabled as default } + def inventory_job(info): inventory = [] for line in info: @@ -61,6 +63,7 @@ def inventory_job(info): inventory.append( (item, {} ) ) return inventory + def job_parse_real_time(s): parts = s.split(':') min_sec, hour_sec = 0, 0 @@ -70,6 +73,7 @@ def job_parse_real_time(s): min_sec = int(parts[-2]) * 60 return float(parts[-1]) + min_sec + hour_sec + def job_parse(item, info): data = {} prefix = None @@ -107,6 +111,7 @@ def job_parse(item, info): return data + def check_job(item, params, info): warn, crit = params.get('age') job = job_parse(item, info) @@ -143,18 +148,22 @@ def check_job(item, params, info): txt += ' (!!)' output.append(txt) - for key, title, value in [ - ('start_time', 'Started', job['start_time']), - ('real_time', 'Real-Time', job['real_time']), - ('user_time', 'User-Time', job['user_time']), - ('system_time', 'System-Time', job['system_time']), - ('reads', 'Filesystem Reads', job['reads']), - ('writes', 'Filesystem Writes', job['writes']), - ('max_res_bytes', 'Max. Memory', job['max_res_bytes']), - ('avg_mem_bytes', 'Avg. Memory', job['avg_mem_bytes']), - ('vol_context_switches', 'Vol. Context Switches', job['vol_context_switches']), - ('invol_context_switches', 'Invol. Context Switches', job['invol_context_switches']), + for key, title in [ + ('start_time', 'Started'), + ('real_time', 'Real-Time'), + ('user_time', 'User-Time'), + ('system_time', 'System-Time'), + ('reads', 'Filesystem Reads'), + ('writes', 'Filesystem Writes'), + ('max_res_bytes', 'Max. Memory'), + ('avg_mem_bytes', 'Avg. Memory'), + ('vol_context_switches', 'Vol. Context Switches'), + ('invol_context_switches', 'Invol. Context Switches'), ]: + value = job.get(key) + if value is None: + continue + if key in [ 'max_res_bytes', 'avg_mem_bytes' ]: display_value = get_bytes_human_readable(value, 1000) elif key in [ 'real_time', 'user_time', 'system_time' ]: @@ -169,6 +178,7 @@ def check_job(item, params, info): return state, ', '.join(output), perfdata + check_info["job"] = { 'check_function' : check_job, 'inventory_function' : inventory_job,

7 years, 10 months

jolokia_metrics: Remove useless lambda constructions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3a3309c5c6a636717e43046d592865bd85b00aec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a3309c5c6a636… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 11:42:08 2017 +0100 jolokia_metrics: Remove useless lambda constructions Change-Id: I587c9afca43dfe560247ecd969e7c58412e180f0 --- checks/jolokia_metrics | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 494518b..55530ed 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -241,13 +241,12 @@ def inventory_jolokia_metrics_apps(info, what): return inv -def inventory_jolokia_metrics_serv(info, what): +def inventory_jolokia_metrics_serv(info): inv = [] parsed = jolokia_metrics_parse(info) levels = None - if what == 'serv_req': - levels = 'jolokia_metrics_serv_req_default_levels' - needed_key = "Requests" + levels = 'jolokia_metrics_serv_req_default_levels' + needed_key = "Requests" for inst, vals in parsed.iteritems(): if vals == None: continue # no data from agent @@ -257,12 +256,10 @@ def inventory_jolokia_metrics_serv(info, what): inv.append(('%s %s %s' % (inst, app, serv), levels)) return inv -def inventory_jolokia_metrics_gc(info, what): +def inventory_jolokia_metrics_gc(info): inv = [] parsed = jolokia_metrics_parse(info) levels = None - if what == 'gc': - needed_key = ["CollectionCount", "CollectionTime"] for inst, vals in parsed.iteritems(): if vals == None: continue # no data from agent @@ -270,12 +267,10 @@ def inventory_jolokia_metrics_gc(info, what): inv.append(("%s GC %s" % (inst ,gc) , levels)) return inv -def inventory_jolokia_metrics_tp(info, what): +def inventory_jolokia_metrics_tp(info): inv = [] parsed = jolokia_metrics_parse(info) levels = 'jolokia_metrics_tp_default_levels' - if what == 'tp': - needed_key = ["currentThreadsBusy", "currentThreadCount", "maxThreads"] for inst, vals in parsed.iteritems(): if vals == None: continue # no data from agent @@ -735,7 +730,7 @@ check_info["jolokia_metrics.uptime"] = { check_info["jolokia_metrics.gc"] = { "service_description" : "JVM %s", "check_function" : check_jolokia_metrics_gc, - "inventory_function" : lambda i: inventory_jolokia_metrics_gc(i, "gc"), + "inventory_function" : inventory_jolokia_metrics_gc, "group" : "jvm_gc", "has_perfdata" : True, } @@ -743,7 +738,7 @@ check_info["jolokia_metrics.gc"] = { check_info["jolokia_metrics.tp"] = { "service_description" : "JVM %s", "check_function" : check_jolokia_metrics_tp, - "inventory_function" : lambda i: inventory_jolokia_metrics_tp(i, "tp"), + "inventory_function" : inventory_jolokia_metrics_tp, "group" : "jvm_tp", "has_perfdata" : True, } @@ -777,7 +772,7 @@ check_info["jolokia_metrics.requests"] = { check_info["jolokia_metrics.serv_req"] = { "service_description" : "JVM %s Requests", "check_function" : check_jolokia_metrics_serv_req, - "inventory_function" : lambda i: inventory_jolokia_metrics_serv(i, "serv_req"), + "inventory_function" : inventory_jolokia_metrics_serv, "group" : "jvm_requests", "has_perfdata" : True, }

7 years, 10 months

4299 FIX df: fixed missing filesystem type handling

by Simon Betz

Module: check_mk Branch: master Commit: 7951fc48e12970174c42ec69a62acc83f8c6d93f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7951fc48e12970… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 11:37:54 2017 +0100 4299 FIX df: fixed missing filesystem type handling Change-Id: Ief9feae6bf11e105ec387403730eaa8dc7d034a4 --- .werks/4299 | 10 ++++++++++ ChangeLog | 1 + checks/df | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/.werks/4299 b/.werks/4299 new file mode 100644 index 0000000..bd79f6c --- /dev/null +++ b/.werks/4299 @@ -0,0 +1,10 @@ +Title: df: fixed missing filesystem type handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485340629 + + diff --git a/ChangeLog b/ChangeLog index 7087f1c..ed537dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 4283 FIX: check_mail_loop: Now using "mail to" address in To header * 4297 FIX: oracle_instance: fixed discovery function... * 4298 FIX: omd_apache: fixed missing data handling + * 4299 FIX: df: fixed missing filesystem type handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/df b/checks/df index a3dffe1..d01e3f4 100644 --- a/checks/df +++ b/checks/df @@ -52,6 +52,39 @@ # /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/opt # /dev/sda1 btrfs 20970496 4169036 16539348 21% /var/log +# <<<df>>> +# dev 795652 0 795652 0% /dev +# run 811756 11848 799908 1% /run +# /dev/sda2 1040280 716340 271512 73% / +# devtmpfs 795652 0 795652 0% /dev +# tmpfs 811756 0 811756 0% /dev/shm +# tmpfs 811756 11848 799908 1% /run +# tmpfs 811756 0 811756 0% /sys/fs/cgroup +# none 811756 12 811744 0% /var/tmp +# none 811756 0 811756 0% /var/lock +# none 409600 95460 314140 23% /var/log +# tmpfs 811756 11848 799908 1% /var/run +# none 811756 56 811700 0% /tmp +# /dev/sda1 126931 33759 86619 28% /boot +# /dev/sda5 12668904 360184 11670236 3% /persist +# <<<df>>> +# [df_inodes_start] +# dev 198913 365 198548 0% /dev +# run 202939 336 202603 0% /run +# /dev/sda2 65536 25533 40003 39% / +# devtmpfs 198913 365 198548 0% /dev +# tmpfs 202939 1 202938 0% /dev/shm +# tmpfs 202939 336 202603 0% /run +# tmpfs 202939 7 202932 0% /sys/fs/cgroup +# none 202939 4 202935 0% /var/tmp +# none 202939 1 202938 0% /var/lock +# none 202939 28 202911 0% /var/log +# tmpfs 202939 336 202603 0% /var/run +# none 202939 27 202912 0% /tmp +# /dev/sda1 32768 25 32743 0% /boot +# /dev/sda5 799680 118 799562 0% /persist +# [df_inodes_end] + def df_parse_info(info): df_blocks = [] @@ -69,24 +102,36 @@ def df_parse_info(info): elif line[-1] == '[df_inodes_end]': is_inode = False continue + + try: + int(line[1]) + except ValueError: + pass + else: + line = [ line[0], None ] + line[1:] + if not is_inode: # Handle known cases, where the file system contains spaces if line[2] == "File" and line[3] == "System": line = [ line[0], " ".join(line[1:4]) ] + line[4:] + if line[1] == "btrfs": device = line[0] if device not in btrfs_devices: btrfs_devices.add(device) df_blocks.append(line[:6] + [ "btrfs " + line[0] ]) # replace mount point with device + else: df_blocks.append(line) else: df_inodes.append(line) + except StopIteration: pass return df_blocks, df_inodes + def inventory_df(info): df_blocks, df_inodes = df_parse_info(info) mplist = []

7 years, 10 months

4298 FIX omd_apache: fixed missing data handling

by Simon Betz

Module: check_mk Branch: master Commit: 00e431996faad3ed8790f53a3f35d32089733af9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00e431996faad3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 11:16:15 2017 +0100 4298 FIX omd_apache: fixed missing data handling Change-Id: I907256e8b67c689e2cbe1e9f47c9b7e10d2111cd --- .werks/4298 | 10 ++++++++++ ChangeLog | 1 + checks/omd_apache | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4298 b/.werks/4298 new file mode 100644 index 0000000..0d441fa --- /dev/null +++ b/.werks/4298 @@ -0,0 +1,10 @@ +Title: omd_apache: fixed missing data handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485339329 + + diff --git a/ChangeLog b/ChangeLog index 57e939a..7087f1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 4014 FIX: Windows Agent / Eventlogs with vista_api: Fixed numerous bugs and memory leaks... * 4283 FIX: check_mail_loop: Now using "mail to" address in To header * 4297 FIX: oracle_instance: fixed discovery function... + * 4298 FIX: omd_apache: fixed missing data handling Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/omd_apache b/checks/omd_apache index 8680173..dc85884 100644 --- a/checks/omd_apache +++ b/checks/omd_apache @@ -86,11 +86,14 @@ def check_omd_apache(item, _no_params, parsed): return for line in parsed[item]: - if len(line) == 4: + if len(line) < 3: + continue + elif len(line) == 4: url, status, size_bytes, microsec = line else: url = " ".join(line[:-3]) status, size_bytes, microsec = line[-3:] + for key, pattern in omd_apache_patterns: # make url relative to site directory if regex(pattern).search(url[len('/'+item+'/'):]):

7 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017