Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Improved Werk #3394: No also BI aggregations are affected by the reclassifications

by Mathias Kettner

Module: check_mk Branch: master Commit: a522b5f0a29f5c53778d9bf05207bf4f75ffea6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a522b5f0a29f5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 27 14:53:37 2016 +0200 Improved Werk #3394: No also BI aggregations are affected by the reclassifications --- .werks/3394 | 5 +-- web/htdocs/availability.py | 99 ++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 57 deletions(-) diff --git a/.werks/3394 b/.werks/3394 index 537b617..ca80af1 100644 --- a/.werks/3394 +++ b/.werks/3394 @@ -14,6 +14,5 @@ a scheduled downtime in the past or in the case that scheduled downtimes were just used in order to disable notifications (but the breakdown was in fact real and not scheduled). -Availability of BI aggregations currently does not support annotations or any -reclassifications. Neither does it honor reclassifications in the underlying -host and service history. +Reclassification of downtimes on hosts and services also has an effect +on the availability of BI aggregations that are based on these objects. diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 4adf96f..cb3a0d3 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -778,10 +778,10 @@ def reclassify_by_annotations(what, av_rawdata): if what == "service": cycles = [ ((site, host_name, None), "in_host_downtime") ] + cycles - for anno_key, entry_to_change in cycles: + for anno_key, key_to_change in cycles: if anno_key in annotations: new_entries[service_description] = \ - reclassify_service_by_annotations(service_history, annotations[anno_key], entry_to_change) + reclassify_service_history_by_annotations(service_history, annotations[anno_key], key_to_change) service_history = new_entries[service_description] else: new_entries[service_description] = service_history @@ -789,38 +789,42 @@ def reclassify_by_annotations(what, av_rawdata): return reclassified_rawdata -def reclassify_service_by_annotations(service_history, annotation_entries, entry_to_change): +def reclassify_service_history_by_annotations(service_history, annotation_entries, key_to_change): new_history = service_history for annotation in annotation_entries: downtime = annotation.get("downtime") if downtime == None: continue - new_history = reclassify_service_by_annotation(new_history, annotation, entry_to_change) + new_history = reclassify_service_history_by_annotation(new_history, annotation, key_to_change) return new_history -def reclassify_service_by_annotation(service_history, annotation, entry_to_change): - downtime = annotation["downtime"] - +def reclassify_service_history_by_annotation(service_history, annotation, key_to_change): new_history = [] for history_entry in service_history: - if annotation["from"] < history_entry["until"] and annotation["until"] > history_entry["from"]: - for is_in, p_from, p_until in [ - ( False, history_entry["from"], max(history_entry["from"], annotation["from"]) ), - ( True, max(history_entry["from"], annotation["from"]), min(history_entry["until"], annotation["until"]) ), - ( False, min(history_entry["until"], annotation["until"]), history_entry["until"] ), - ]: - if p_from < p_until: - new_entry = history_entry.copy() - new_entry["from"] = p_from - new_entry["until"] = p_until - new_entry["duration"] = p_until - p_from - if is_in: - new_entry[entry_to_change] = downtime and 1 or 0 - new_history.append(new_entry) + new_history += reclassify_service_by_annotation(history_entry, annotation, key_to_change) - else: - new_history.append(history_entry) + return new_history + + +def reclassify_service_by_annotation(history_entry, annotation, key_to_change): + new_history = [] + if annotation["from"] < history_entry["until"] and annotation["until"] > history_entry["from"]: + for is_in, p_from, p_until in [ + ( False, history_entry["from"], max(history_entry["from"], annotation["from"]) ), + ( True, max(history_entry["from"], annotation["from"]), min(history_entry["until"], annotation["until"]) ), + ( False, min(history_entry["until"], annotation["until"]), history_entry["until"] ), + ]: + if p_from < p_until: + new_entry = history_entry.copy() + new_entry["from"] = p_from + new_entry["until"] = p_until + new_entry["duration"] = p_until - p_from + if is_in: + new_entry[key_to_change] = annotation["downtime"] and 1 or 0 + new_history.append(new_entry) + else: + new_history.append(history_entry) return new_history @@ -1482,9 +1486,7 @@ def get_bi_availability_rawdata(filterheaders, only_sites, av_object, include_ou def get_bi_spans(tree, aggr_group, avoptions, timewarp): time_range, range_title = avoptions["range"] phases_list = get_bi_leaf_history(tree, aggr_group, time_range) - reclassified_phases_list = reclassify_bi_phases(phases_list) - return compute_bi_timeline(tree, aggr_group, time_range, - timewarp, reclassified_phases_list) + return compute_bi_timeline(tree, aggr_group, time_range, timewarp, phases_list) def get_bi_leaf_history(tree, aggr_group, time_range): @@ -1497,7 +1499,7 @@ def get_bi_leaf_history(tree, aggr_group, time_range): only_sites.add(site) hosts.append(host) - columns = [ "host_name", "service_description", "from", "log_output", "state", "in_downtime", "in_service_period" ] + columns = [ "host_name", "service_description", "from", "until", "log_output", "state", "in_downtime", "in_service_period" ] sites.live().set_only_sites(list(only_sites)) sites.live().set_prepend_site(True) sites.live().set_limit() # removes limit @@ -1531,6 +1533,9 @@ def get_bi_leaf_history(tree, aggr_group, time_range): columns = ["site"] + columns rows = [ dict(zip(columns, row)) for row in data ] + # Reclassify base data due to annotations + rows = reclassify_bi_rows(rows) + # Now comes the tricky part: recompute the state of the aggregate # for each step in the state history and construct a timeline from # it. As a first step we need the start state for each of the @@ -1651,36 +1656,22 @@ def compute_bi_tree_state(tree, status): return tree_state -def reclassify_bi_phases(phases_list): +def reclassify_bi_rows(rows): annotations = load_annotations() if not annotations: - return phases_list - - # Each entry in the phases list represents one state snapshot of all leafs - # in the BI aggregation. It is itself a pair of (timestamp, node_list). - # the node_list is a list of dicts - each of which describes the state - # of one host or service. Such a node dict has the same structure as - # an entry in av_rawdata: - # { - # 'from' : 1461755412, - # 'host_name' : u'heute', - # 'in_downtime' : 0, - # 'in_service_period' : 1, - # 'log_output' : u'OK - sys.peer - stratum 2, offset 26.91 ms, ...', - # 'service_description' : u'NTP Time', - # 'site' : 'heute', - # 'state' : 0, - # } - - # Now during reclassification we need to split up entries due to annotations - # that change the scheduled downtime status - - reclassified_phases = [] - for phase_begin, node_list in phases_list: - reclassified_phases.append((phase_begin, node_list)) - return reclassified_phases - + return rows + new_rows = [] + for row in rows: + site = row["site"] + host_name = row["host_name"] + service_description = row["service_description"] + anno_key = (site, host_name, service_description or None) + if anno_key in annotations: + new_rows += reclassify_service_history_by_annotations([row], annotations[anno_key], "in_downtime") + else: + new_rows.append(row) + return new_rows #.

8 years, 2 months

Refactored BI availability: split functions and made them smaller

by Mathias Kettner

Module: check_mk Branch: master Commit: a4c114202355d7a7a4097f25fba787d41a023e68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4c114202355d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 27 13:30:16 2016 +0200 Refactored BI availability: split functions and made them smaller --- web/htdocs/availability.py | 94 +++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 24 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ecb1684..4adf96f 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1478,8 +1478,16 @@ def find_next_choord(broken, scale): def get_bi_availability_rawdata(filterheaders, only_sites, av_object, include_output, avoptions): raise Exception("Not implemented yet. Sorry.") + def get_bi_spans(tree, aggr_group, avoptions, timewarp): time_range, range_title = avoptions["range"] + phases_list = get_bi_leaf_history(tree, aggr_group, time_range) + reclassified_phases_list = reclassify_bi_phases(phases_list) + return compute_bi_timeline(tree, aggr_group, time_range, + timewarp, reclassified_phases_list) + + +def get_bi_leaf_history(tree, aggr_group, time_range): # Get state history of all hosts and services contained in the tree. # In order to simplify the query, we always fetch the information for # all hosts of the aggregates. @@ -1542,6 +1550,10 @@ def get_bi_spans(tree, aggr_group, avoptions, timewarp): for from_time in sorted_times: phases_list.append((from_time, phases[from_time])) + return phases_list + + +def compute_bi_timeline(tree, aggr_group, time_range, timewarp, phases_list): states = {} def update_states(phase_entries): for row in phase_entries: @@ -1553,7 +1565,7 @@ def get_bi_spans(tree, aggr_group, avoptions, timewarp): update_states(phases_list[0][1]) # states does now reflect the host/services states at the beginning # of the query range. - tree_state = compute_tree_state(tree, states) + tree_state = compute_bi_tree_state(tree, states) tree_time = time_range[0] if timewarp == int(tree_time): timewarp_state = tree_state @@ -1561,42 +1573,44 @@ def get_bi_spans(tree, aggr_group, avoptions, timewarp): timewarp_state = None timeline = [] - def append_to_timeline(from_time, until_time, tree_state): - timeline.append({ - "state" : tree_state[0]['state'], - "log_output" : tree_state[0]['output'], - "from" : from_time, - "until" : until_time, - "site" : "", - "host_name" : aggr_group, - "service_description" : tree['title'], - "in_notification_period" : 1, - "in_service_period" : tree_state[0]['in_service_period'], - "in_downtime" : tree_state[0]['in_downtime'], - "in_host_downtime" : 0, - "host_down" : 0, - "is_flapping" : 0, - "duration" : until_time - from_time, - }) - for from_time, phase in phases_list[1:]: update_states(phase) - next_tree_state = compute_tree_state(tree, states) + next_tree_state = compute_bi_tree_state(tree, states) duration = from_time - tree_time - append_to_timeline(tree_time, from_time, tree_state) + timeline.append(create_bi_timeline_entry(tree, aggr_group, tree_time, from_time, tree_state)) tree_state = next_tree_state tree_time = from_time if timewarp == tree_time: timewarp_state = tree_state # Add one last entry - for the state until the end of the interval - append_to_timeline(tree_time, time_range[1], tree_state) + timeline.append(create_bi_timeline_entry(tree, aggr_group, tree_time, time_range[1], tree_state)) return timeline, timewarp_state -def compute_tree_state(tree, status): +def create_bi_timeline_entry(tree, aggr_group, from_time, until_time, tree_state): + return { + "state" : tree_state[0]['state'], + "log_output" : tree_state[0]['output'], + "from" : from_time, + "until" : until_time, + "site" : "", + "host_name" : aggr_group, + "service_description" : tree['title'], + "in_notification_period" : 1, + "in_service_period" : tree_state[0]['in_service_period'], + "in_downtime" : tree_state[0]['in_downtime'], + "in_host_downtime" : 0, + "host_down" : 0, + "is_flapping" : 0, + "duration" : until_time - from_time, + } + + + +def compute_bi_tree_state(tree, status): # Convert our status format into that needed by BI services_by_host = {} hosts = {} @@ -1631,12 +1645,44 @@ def compute_tree_state(tree, status): services_by_host.get(site_host,[]) ] - # Finally we can execute the tree bi.load_assumptions() tree_state = bi.execute_tree(tree, status_info) return tree_state + +def reclassify_bi_phases(phases_list): + annotations = load_annotations() + if not annotations: + return phases_list + + # Each entry in the phases list represents one state snapshot of all leafs + # in the BI aggregation. It is itself a pair of (timestamp, node_list). + # the node_list is a list of dicts - each of which describes the state + # of one host or service. Such a node dict has the same structure as + # an entry in av_rawdata: + # { + # 'from' : 1461755412, + # 'host_name' : u'heute', + # 'in_downtime' : 0, + # 'in_service_period' : 1, + # 'log_output' : u'OK - sys.peer - stratum 2, offset 26.91 ms, ...', + # 'service_description' : u'NTP Time', + # 'site' : 'heute', + # 'state' : 0, + # } + + # Now during reclassification we need to split up entries due to annotations + # that change the scheduled downtime status + + reclassified_phases = [] + for phase_begin, node_list in phases_list: + reclassified_phases.append((phase_begin, node_list)) + return reclassified_phases + + + + #. # .--Various-------------------------------------------------------------. # | __ __ _ |

8 years, 2 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: bdebac22b94794f631910e863b54b4b0f97adfde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdebac22b94794… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 27 14:34:17 2016 +0200 updated werk --- .werks/3429 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3429 b/.werks/3429 index 0530ece..d9bc582 100644 --- a/.werks/3429 +++ b/.werks/3429 @@ -1,4 +1,4 @@ -Title: ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling +Title: ps, mem.linux, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index d664acc..56cff79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,7 +191,7 @@ * 3427 FIX: mssql_counters.sqlstats: fixed rate calculation * 3438 FIX: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported * 3441 FIX: ps: Added missing graph for number of processes - * 3429 FIX: ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling + * 3429 FIX: ps, mem.linux, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling Multisite: * 3187 notification view: new filter for log command via regex

8 years, 2 months

3429 FIX ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling

by Simon Betz

Module: check_mk Branch: master Commit: 7fc992fc92085156a8037220108577e547750f95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fc992fc920851… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 27 14:20:39 2016 +0200 3429 FIX ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling --- .werks/3429 | 10 ++++++++++ ChangeLog | 1 + checks/mem | 26 ++++++++------------------ checks/mem.include | 10 ++++++++++ 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.werks/3429 b/.werks/3429 new file mode 100644 index 0000000..0530ece --- /dev/null +++ b/.werks/3429 @@ -0,0 +1,10 @@ +Title: ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461759504 + + diff --git a/ChangeLog b/ChangeLog index 7c634b9..d664acc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 3427 FIX: mssql_counters.sqlstats: fixed rate calculation * 3438 FIX: mk_mongodb: Fixed agent plugin handling when pymongo can not be imported * 3441 FIX: ps: Added missing graph for number of processes + * 3429 FIX: ps, mem, mem.include: fixed missing parse_proc_meminfo_bytes during precompiling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mem b/checks/mem index e9cfb44..c1323c2 100644 --- a/checks/mem +++ b/checks/mem @@ -157,16 +157,6 @@ factory_settings["mem_linux_default_levels"] = { "levels_vmalloc": ("abs_free", (50*1024*1024, 30*1024*1024)), } -# Parse /proc/meminfo into the canonical form: into bytes, not kB -def parse_proc_meminfo_bytes(info): - meminfo = {} - for line in info: - value = int(line[1]) - if len(line) > 2 and line[2] == 'kB': - value *= 1024 - meminfo[line[0][:-1]] = value - return meminfo - def is_linux_meminfo(meminfo): return "PageTables" in meminfo and "Writeback" in meminfo and "Committed_AS" in meminfo @@ -360,15 +350,15 @@ def check_mem_linux(_no_item, params, info): yield 0, "", perfdata - check_info["mem.linux"] = { - 'check_function': check_mem_linux, - 'inventory_function': inventory_mem_linux, - 'service_description': 'Memory', - 'default_levels_variable': 'mem_linux_default_levels', - 'has_perfdata': True, - 'group': 'memory_linux', - "handle_real_time_checks" : True, + 'inventory_function' : inventory_mem_linux, + 'check_function' : check_mem_linux, + 'service_description' : 'Memory', + 'default_levels_variable' : 'mem_linux_default_levels', + 'has_perfdata' : True, + 'group' : 'memory_linux', + "handle_real_time_checks" : True, + 'includes' : [ 'mem.include' ], } #. diff --git a/checks/mem.include b/checks/mem.include index 9d3760f..e0a4f99 100644 --- a/checks/mem.include +++ b/checks/mem.include @@ -30,6 +30,16 @@ factory_settings["memory_default_levels"] = { "levels" : memused_default_levels, } +# Parse /proc/meminfo into the canonical form: into bytes, not kB +# This function is also used by the ps check +def parse_proc_meminfo_bytes(info): + meminfo = {} + for line in info: + value = int(line[1]) + if len(line) > 2 and line[2] == 'kB': + value *= 1024 + meminfo[line[0][:-1]] = value + return meminfo def check_memory(params, meminfo): swapused = meminfo['SwapTotal'] - meminfo['SwapFree']

8 years, 2 months

Fix Werk #3394 for host annotations - worked only for services

by Mathias Kettner

Module: check_mk Branch: master Commit: 7f756015b057d98cd2d0b6076fba49f47ecbc0b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f756015b057d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 27 13:14:23 2016 +0200 Fix Werk #3394 for host annotations - worked only for services --- web/htdocs/availability.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 43115df..ecb1684 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -774,8 +774,7 @@ def reclassify_by_annotations(what, av_rawdata): new_entries = {} reclassified_rawdata[(site, host_name)] = new_entries for service_description, service_history in service_entries.iteritems(): - anno_key = (site, host_name, service_description) - cycles = [ ((site, host_name, service_description), "in_downtime") ] + cycles = [ ((site, host_name, service_description or None), "in_downtime") ] if what == "service": cycles = [ ((site, host_name, None), "in_host_downtime") ] + cycles

8 years, 2 months

3442 FIX Fixed double escaping of single quotes in comment texts

by Lars Michelsen

Module: check_mk Branch: master Commit: 26d53d9ad3d2d9a8e85fab3cee2152d0a3278882 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26d53d9ad3d2d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 13:13:03 2016 +0200 3442 FIX Fixed double escaping of single quotes in comment texts --- .werks/3442 | 10 ++++++++++ ChangeLog | 1 + web/plugins/icons/builtin.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3442 b/.werks/3442 new file mode 100644 index 0000000..de49b5b --- /dev/null +++ b/.werks/3442 @@ -0,0 +1,10 @@ +Title: Fixed double escaping of single quotes in comment texts +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461755568 + + diff --git a/ChangeLog b/ChangeLog index d54f426..7c634b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -250,6 +250,7 @@ * 3413 FIX: Correctly display non-Ascii-characters in host tag values in host tag filter * 3029 FIX: rule editor icon: fixed query of invalid livestatus column... * 3125 FIX: fixed grouping of werk list by version... + * 3442 FIX: Fixed double escaping of single quotes in comment texts WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 3a78620..297fb6f 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -552,7 +552,7 @@ def paint_comment_icon(what, row, tags, host_custom_vars): text = "" for c in comments: id, author, comment, ty, timestamp = c - comment = comment.replace("\n", "<br>").replace("'","'") + comment = comment.replace("\n", "<br>") text += "%s %s: \"%s\" \n" % (paint_age(timestamp, True, 0, 'abs')[1], author, comment) return 'comment', text, url_to_view(row, 'comments_of_' + what)

8 years, 2 months

mssql: improved graphs a little

by Sebastian Herbord

Module: check_mk Branch: master Commit: aec5c28a571ce89d0fd2efa424f8accce80c3a12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aec5c28a571ce8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 27 12:03:08 2016 +0200 mssql: improved graphs a little --- web/plugins/metrics/check_mk.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index ad3acc4..3149b31 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6388,7 +6388,13 @@ graph_info.append({ "metrics" : [ ("page_reads_sec", "area" ), ("page_writes_sec", "-area"), - ("page_lookups_sec", "line" ) ] }) +graph_info.append({ + "title" : _("Datafile Sizes"), + "metrics" : [ + ("allocated_size", "line" ), + ("data_size", "area" ) + ] +})

8 years, 2 months

Fixed exception in logwatch check after recent change to core function

by Lars Michelsen

Module: check_mk Branch: master Commit: 54565011b24eedd4dd7c043d4481cce07323869e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54565011b24eed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 27 11:54:09 2016 +0200 Fixed exception in logwatch check after recent change to core function --- checks/logwatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/logwatch b/checks/logwatch index cb9f8ca..5a6395f 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -856,7 +856,7 @@ def logwatch_ec_precompile(hostname, item, params): # Directly compute set of all matching hosts here, this # will avoid recomputation later - hosts = all_matching_hosts(tags, hostlist) + hosts = all_matching_hosts(tags, hostlist, with_foreign_hosts=False) ruleset.append((item, hosts, servlist)) # Filter out any logwatch_rules which do apply to to this host

8 years, 2 months

fixed bug introduced in werk 3115 that kept logwatch from discovering in non-cluster mode

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7065e2a076ca71a33697235ba0363259679689aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7065e2a076ca71… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 27 11:39:39 2016 +0200 fixed bug introduced in werk 3115 that kept logwatch from discovering in non-cluster mode --- checks/logwatch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/logwatch b/checks/logwatch index a250d3c..cb9f8ca 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -246,6 +246,8 @@ def check_logwatch(item, params, info): cache_new = {} def is_cache_new(node): + if node is None: + return True if node not in cache_new: path = cachefile_path(node) if not os.path.exists(path):

8 years, 2 months

mssql: fixed recognition of data-files that can grow unrestricted

by Sebastian Herbord

Module: check_mk Branch: master Commit: f5dbcf93eee268de945a87e2ff05bde1d4a29c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5dbcf93eee268… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 27 11:42:10 2016 +0200 mssql: fixed recognition of data-files that can grow unrestricted --- checks/mssql.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mssql.include b/checks/mssql.include index 7240236..4846b36 100644 --- a/checks/mssql.include +++ b/checks/mssql.include @@ -118,7 +118,7 @@ def check_mssql_datafiles(item, params, info): for row in info: if len(row) == 8: inst, database, table, physical_name, max_size, allocated_size, used_size, unlimited = row - unlimited = bool(unlimited) + unlimited = unlimited == '1' else: database, table, physical_name, max_size, allocated_size, used_size = row inst = None

8 years, 2 months

← Newer
1
2
3
4
5
6
7
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016