Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3625 FIX zfs_arc_cache: fixed data handling if hits and misses are missing

by Simon Betz

Module: check_mk Branch: master Commit: 149fff236a34bbebe42fbcb5afcdb81e9f23d49b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=149fff236a34bb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 30 10:22:50 2016 +0200 3625 FIX zfs_arc_cache: fixed data handling if hits and misses are missing --- .werks/3625 | 10 +++++++ ChangeLog | 1 + checks/zfs_arc_cache | 73 +++++++++++++++++++++++++++++++++++++------------- 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/.werks/3625 b/.werks/3625 new file mode 100644 index 0000000..62f1476 --- /dev/null +++ b/.werks/3625 @@ -0,0 +1,10 @@ +Title: zfs_arc_cache: fixed data handling if hits and misses are missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464596505 + + diff --git a/ChangeLog b/ChangeLog index 3b2da98..a8554b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -242,6 +242,7 @@ * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disabled * 3578 FIX: df: Fixed exception when monitoring filesystems without inode infos * 3624 FIX: oracle_asm_diskgroup: fixed dismounted disk handling + * 3625 FIX: zfs_arc_cache: fixed data handling if hits and misses are missing Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index b529191..1eacf82 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -85,6 +85,26 @@ # arc_meta_limit = 80 MB # arc_meta_max = 2077 MB +# newer output under solaris 11.3 +# <<<zfs_arc_cache>>> +# size = 46751 MB +# target size (c) = 1027788 MB +# target mru_size (p) = 64236 MB +# c_min = 4018 MB +# c_max = 1027788 MB +# buf_size = 605 MB +# data_size = 43123 MB +# other_size = 2988 MB +# rawdata_size = 0 MB +# meta_used = 3628 MB +# meta_max = 3628 MB +# meta_limit = 0 MB +# memory_throttle_count = 0 +# arc_no_grow = 0 +# arc_tempreserve = 0 MB +# mfu_size = 30605 MB +# mru_size = 11601 MB + # parses agent output in a structure like # {'arc_meta_limit': 80, @@ -93,6 +113,7 @@ # [...] # } + def parse_zfs_arc_cache(info): parsed = {} for line in info: @@ -100,6 +121,7 @@ def parse_zfs_arc_cache(info): parsed[line[0]] = int(line[2]) return parsed + # .--cache---------------------------------------------------------------. # | _ | # | ___ __ _ ___| |__ ___ | @@ -109,36 +131,45 @@ def parse_zfs_arc_cache(info): # | | # '----------------------------------------------------------------------' + def inventory_zfs_arc_cache(parsed): if parsed.get("hits") and parsed.get("misses"): return [ (None, None) ] else: return [] + def check_zfs_arc_cache(_no_item, _no_params, parsed): - for key in [ "", "prefetch_data_", "prefetch_metadata_" ]: - human_key = key.replace("_", " ") - total_hits_misses = parsed["%shits" % key] + parsed["%smisses" % key] - if not total_hits_misses: - yield 0, " No %sHits or Misses" % human_key, [("%shit_ratio" % key, 0, '', '', 0, 100)] - else: - hit_ratio = float(parsed["%shits" % key]) / total_hits_misses * 100 - yield 0, " %sHit Ratio: %0.2f %%" % (human_key.title(), hit_ratio), [("%shit_ratio" % key, "%0.2f" % hit_ratio, '', '', 0, 100)] + if parsed.get("hits") and parsed.get("misses"): + for key in [ "", "prefetch_data_", "prefetch_metadata_" ]: + human_key = key.replace("_", " ") + total_hits_misses = parsed["%shits" % key] + parsed["%smisses" % key] + if not total_hits_misses: + yield 0, "No %sHits or Misses" % human_key, \ + [("%shit_ratio" % key, 0, '', '', 0, 100)] + + else: + hit_ratio = float(parsed["%shits" % key]) / total_hits_misses * 100 + yield 0, "%sHit Ratio: %0.2f%%" % (human_key.title(), hit_ratio), \ + [("%shit_ratio" % key, "%0.2f" % hit_ratio, '', '', 0, 100)] + else: + yield 3, "No info about hit ratio available" # size if "size" in parsed.keys(): - yield 0, "Cache size: %d MB" % parsed["size"], [("size", parsed["size"] * 1024 * 1024, '', '', 0)] + yield 0, "Cache size: %d MB" % parsed["size"], \ + [("size", parsed["size"] * 1024 * 1024, '', '', 0)] # arc_meta # these values may be missing, this is ok too # in this case just do not report these values - if "arc_meta_used" in parsed.keys() and "arc_meta_limit" in parsed.keys() and "arc_meta_max" in parsed.keys(): - yield 0, "Arc Meta %d MB used, Limit %d MB, Max %d MB" \ - % (parsed["arc_meta_used"], parsed["arc_meta_limit"], parsed["arc_meta_max"]),[ - ("arc_meta_used", parsed["arc_meta_used"] * 1024 * 1024, '', '', 0), - ("arc_meta_limit", parsed["arc_meta_limit"] * 1024 * 1024, '', '', 0), - ("arc_meta_max", parsed["arc_meta_max"] * 1024 * 1024, '', '', 0) - ] + if "arc_meta_used" in parsed.keys() and "arc_meta_limit" in parsed.keys() and \ + "arc_meta_max" in parsed.keys(): + yield 0, "Arc Meta %d MB used, Limit %d MB, Max %d MB" % \ + (parsed["arc_meta_used"], parsed["arc_meta_limit"], parsed["arc_meta_max"]), \ + [("arc_meta_used", parsed["arc_meta_used"] * 1024 * 1024, '', '', 0), + ("arc_meta_limit", parsed["arc_meta_limit"] * 1024 * 1024, '', '', 0), + ("arc_meta_max", parsed["arc_meta_max"] * 1024 * 1024, '', '', 0)] check_info["zfs_arc_cache"] = { @@ -149,6 +180,7 @@ check_info["zfs_arc_cache"] = { "has_perfdata" : True, } + #. # .--L2 cache------------------------------------------------------------. # | _ ____ _ | @@ -159,6 +191,7 @@ check_info["zfs_arc_cache"] = { # | | # '----------------------------------------------------------------------' + def inventory_zfs_arc_cache_l2(parsed): # if l2_size == 0 there is no l2 cache available at all if "l2_size" in parsed.keys() and parsed["l2_size"] > 0: @@ -166,6 +199,7 @@ def inventory_zfs_arc_cache_l2(parsed): else: return [] + def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): status = 0 perfdata = [] @@ -174,8 +208,9 @@ def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): # hit ratio if "l2_hits" in parsed.keys() and "l2_misses" in parsed.keys(): l2_hit_ratio = float(parsed["l2_hits"]) / (parsed["l2_hits"] + parsed["l2_misses"]) * 100 - message += " L2 hit ratio: %0.2f %%" % l2_hit_ratio + message += " L2 hit ratio: %0.2f%%" % l2_hit_ratio perfdata.append(("l2_hit_ratio", "%0.2f" % l2_hit_ratio, '', '', 0, 100)) + else: message += " no info about L2 hit ratio available" perfdata.append(("l2_hit_ratio", 0, '', '', 0, 100)) @@ -189,13 +224,13 @@ def check_zfs_arc_cache_l2(_no_item, _no_params, parsed): message += ", no info about L2 size available" perfdata.append(("l2_size", 0, '', '', 0)) status = 3 + return status, message, perfdata + check_info["zfs_arc_cache.l2"] = { "check_function" : check_zfs_arc_cache_l2, "inventory_function" : inventory_zfs_arc_cache_l2, "service_description" : "ZFS arc cache L2", "has_perfdata" : True, } - -#.

8 years, 4 months

3624 FIX oracle_asm_diskgroup: fixed dismounted disk handling

by Simon Betz

Module: check_mk Branch: master Commit: 438d0b2c5417c11a08d561376034486f554a9f8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438d0b2c5417c1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 30 09:10:19 2016 +0200 3624 FIX oracle_asm_diskgroup: fixed dismounted disk handling --- .werks/3624 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_asm_diskgroup | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3624 b/.werks/3624 new file mode 100644 index 0000000..a0fa9e4 --- /dev/null +++ b/.werks/3624 @@ -0,0 +1,10 @@ +Title: oracle_asm_diskgroup: fixed dismounted disk handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464592188 + + diff --git a/ChangeLog b/ChangeLog index ca6847f..3b2da98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -241,6 +241,7 @@ * 3577 FIX: Solaris agent: Fixed performance issue introduced with #3389 * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disabled * 3578 FIX: df: Fixed exception when monitoring filesystems without inode infos + * 3624 FIX: oracle_asm_diskgroup: fixed dismounted disk handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index deb8595..9518b3d 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -61,6 +61,10 @@ def check_oracle_asm_diskgroup(item, params, info): dg_name = name.rstrip('/') if dg_name == item: + + if state == "DISMOUNTED": + return 2, "Disk dismounted" + add_text = "" if typ in ('NORMAL', 'HIGH'): if typ == 'NORMAL':

8 years, 4 months

3580 The macro $HOSTNAME$ is now available for host checks which are based on service states

by Lars Michelsen

Module: check_mk Branch: master Commit: 522908a0c5dd572d331e254ce43f7253e87042f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=522908a0c5dd57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 30 08:46:41 2016 +0200 3580 The macro $HOSTNAME$ is now available for host checks which are based on service states --- .werks/3580 | 9 +++++++++ ChangeLog | 1 + modules/check_mk.py | 4 +++- web/plugins/wato/check_mk_configuration.py | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3580 b/.werks/3580 new file mode 100644 index 0000000..d307958 --- /dev/null +++ b/.werks/3580 @@ -0,0 +1,9 @@ +Title: The macro $HOSTNAME$ is now available for host checks which are based on service states +Level: 1 +Component: core +Compatible: compat +Version: 1.2.9i1 +Date: 1464590736 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2d938a2..ca6847f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 3342 MKP: local/lib and local/bin of sites can now be packed... * 3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default)... * 3531 Reduced Check_MK helper size for certain dists/python versions... + * 3580 The macro $HOSTNAME$ is now available for host checks which are based on service states * 3193 FIX: Fixed fake check results for hosts... * 3214 FIX: Removing SNMP checks for non SNMP hosts and agent based checks for non agent hosts... * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts diff --git a/modules/check_mk.py b/modules/check_mk.py index 1d0762d..c5c1de1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1200,7 +1200,9 @@ def host_check_command(hostname, ip, is_clust): return "check-mk-host-service!" + service command = "check-mk-host-custom-%d" % (len(hostcheck_commands_to_define) + 1) hostcheck_commands_to_define.append((command, - 'echo "$SERVICEOUTPUT:%s:%s$" && exit $SERVICESTATEID:%s:%s$' % (hostname, service, hostname, service))) + 'echo "$SERVICEOUTPUT:%s:%s$" && exit $SERVICESTATEID:%s:%s$' % + (hostname, service.replace('$HOSTNAME$', hostname), + hostname, service.replace('$HOSTNAME$', hostname)))) return command elif value[0] == "tcp": diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d613ff9..8497233 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1499,6 +1499,8 @@ register_rule( size = 45, allow_empty = False, attrencode = True, + help = _("You can use the macro <tt>$HOSTNAME$</tt> here. It will be replaced " + "with the name of the current host."), )), ( "custom", _("Use a custom check plugin..."), PluginCommandLine() ), ],

8 years, 4 months

fixed network_fs.include if no params are set

by Simon Betz

Module: check_mk Branch: master Commit: 70bde3d8a37081bc80bf459be0fa3c637900a2cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70bde3d8a37081… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat May 28 11:52:30 2016 +0200 fixed network_fs.include if no params are set --- checks/network_fs.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/network_fs.include b/checks/network_fs.include index 28858b6..730267e 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -58,7 +58,7 @@ def check_network_fs_mounts(item, params, info): used_bytes = size_bytes - free_bytes used_perc = 100.0 * used_bytes / size_bytes perfdata = None - if params.get("has_perfdata"): + if params is not None and params.get("has_perfdata"): perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] if line[-5] == 'ok':

8 years, 4 months

3615 if: Convert bandwidth from octets into bits for graph display

by Mathias Kettner

Module: check_mk Branch: master Commit: 4af65d8af3679d8a61ed1346f137c0b063242055 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4af65d8af3679d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 27 16:25:13 2016 +0200 3615 if: Convert bandwidth from octets into bits for graph display This makes it easier to create custom graphs based on bits/sec. If you have any existing custom graphs that make use of Input octets or Output octets then you need to replace those metrics with Input bandwidth or Output bandwidth. --- .werks/3615 | 11 +++++++++++ ChangeLog | 2 ++ web/plugins/metrics/check_mk.py | 28 ++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.werks/3615 b/.werks/3615 new file mode 100644 index 0000000..0c0dea1 --- /dev/null +++ b/.werks/3615 @@ -0,0 +1,11 @@ +Title: if: Convert bandwidth from octets into bits for graph display +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.9i1 +Date: 1464359025 +Class: feature + +This makes it easier to create custom graphs based on bits/sec. If you have any +existing custom graphs that make use of Input octets or Output octets +then you need to replace those metrics with Input bandwidth or Output bandwidth. diff --git a/ChangeLog b/ChangeLog index 050852d..2d938a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,8 @@ * 3610 mk_oracle: linux plugin now available for solaris * 3611 websphere_mq_queues: now age of messages not processed is configurable... * 3612 nfsmounts: new rule for en/disabling performance data + * 3615 if: Convert bandwidth from octets into bits for graph display... + NOTE: Please refer to the migration notes! * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 8019946..cd9f19a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1670,6 +1670,12 @@ metric_info["if_in_octets"] = { "color" : "#00e060", } +metric_info["if_in_bps"] = { + "title" : _("Input bandwidth"), + "unit" : "bits/s", + "color" : "#00e060", +} + metric_info["if_in_pkts"] = { "title" : _("Input Packets"), "unit" : "1/s", @@ -1682,6 +1688,13 @@ metric_info["if_out_pkts"] = { "color" : "#0080e0", } +metric_info["if_out_bps"] = { + "title" : _("Output bandwidth"), + "unit" : "bits/s", + "color" : "#0080e0", +} + + metric_info["if_out_octets"] = { "title" : _("Output Octets"), "unit" : "bytes/s", @@ -3690,8 +3703,8 @@ check_metrics["check_mk-arbor_pravail.disk_usage"] = disk_utilization_trans # in=0;;;0; inucast=0;;;; innucast=0;;;; indisc=0;;;; inerr=0;0.01;0.1;; out=0;;;0; outucast=0;;;; outnucast=0;;;; outdisc=0;;;; outerr=0;0.01;0.1;; outqlen=0;;;0; if_translation = { - "in" : { "name": "if_in_octets" }, - "out" : { "name": "if_out_octets" }, + "in" : { "name": "if_in_bps", "scale": 8 }, + "out" : { "name": "if_out_bps", "scale": 8 }, "indisc" : { "name": "if_in_discards" }, "inerr" : { "name": "if_in_errors" }, "outdisc" : { "name": "if_out_discards" }, @@ -4707,6 +4720,7 @@ perfometer_info.append(("dual", [ } ])) + perfometer_info.append(("dual", [ { "type" : "logarithmic", @@ -5914,6 +5928,16 @@ graph_info.append({ ], }) +# Same but for checks that have been translated in to bits/s +graph_info.append({ + "title" : _("Bandwidth"), + "metrics" : [ + ( "if_in_bps", "area", ), + ( "if_out_bps", "-area", ), + ], +}) + + graph_info.append({ "title" : _("Packets"), "metrics" : [

8 years, 4 months

3579 FIX Fixed visibility of SNMP community attribute when SNMP tag is inherited

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b3e529b95e9b281cd73afa91a808f34635d567c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b3e529b95e9b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 27 13:55:37 2016 +0200 3579 FIX Fixed visibility of SNMP community attribute when SNMP tag is inherited --- .werks/3579 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/js/wato.js | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3579 b/.werks/3579 new file mode 100644 index 0000000..85521c7 --- /dev/null +++ b/.werks/3579 @@ -0,0 +1,10 @@ +Title: Fixed visibility of SNMP community attribute when SNMP tag is inherited +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464350115 + + diff --git a/ChangeLog b/ChangeLog index fad9e46..050852d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -393,6 +393,7 @@ * 3527 FIX: WATO service discovery: fixed warning with locked hosts... * 3534 FIX: Fixed exception with upload of interlaced PNG files... * 3242 FIX: Fixed hostname translation for empty optional groups + * 3579 FIX: Fixed visibility of SNMP community attribute when SNMP tag is inherited Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 4b51e2b..2ac3830 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -96,10 +96,10 @@ function wato_fix_visibility() { } var oTdContent = oTr.childNodes[1]; /* If the Checkbox is unchecked try to get a value from the inherited_tags */ - var oCheckbox = oTdLegend.childNodes[1].childNodes[0]; + var oCheckbox = oTdLegend.getElementsByTagName("input")[0]; if (oCheckbox.checked == false ){ var attrname = 'attr_' + oCheckbox.name.replace(/.*_change_/, ''); - if(attrname in inherited_tags && inherited_tags[attrname] !== null){ + if (attrname in inherited_tags && inherited_tags[attrname] !== null){ currentTags = currentTags.concat(inherited_tags[attrname].split("|")); } } else {

8 years, 4 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 561a69967721d500eab7e39a79d42fa284c11cad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561a69967721d5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 13:30:50 2016 +0200 updated werk --- .werks/3612 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3612 b/.werks/3612 index 750a21e..8ad3684 100644 --- a/.werks/3612 +++ b/.werks/3612 @@ -1,4 +1,4 @@ -Title: nfsmounts: now has performance data +Title: nfsmounts: new rule for en/disabling performance data Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 88449ce..fad9e46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,7 +87,7 @@ * 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results... * 3610 mk_oracle: linux plugin now available for solaris * 3611 websphere_mq_queues: now age of messages not processed is configurable... - * 3612 nfsmounts: now has performance data + * 3612 nfsmounts: new rule for en/disabling performance data * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters

8 years, 4 months

3614 FIX Outage statistics for hosts now also work in PDF reports

by Mathias Kettner

Module: check_mk Branch: master Commit: 07b01a515777a549ba573be960a47be94f06a24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07b01a515777a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 27 13:29:34 2016 +0200 3614 FIX Outage statistics for hosts now also work in PDF reports If you created a PDF report containing an availability table of hosts with some of the outage statistics contained, then these were missing. This problem did not arise when you did an PDF export or simply added an availability table to an existing report via the context menu. --- .werks/3614 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 18 +++++++++++++++--- web/plugins/views/availability.py | 6 ------ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.werks/3614 b/.werks/3614 new file mode 100644 index 0000000..db0c4e9 --- /dev/null +++ b/.werks/3614 @@ -0,0 +1,13 @@ +Title: Outage statistics for hosts now also work in PDF reports +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464348499 + +If you created a PDF report containing an availability table of hosts with some of the +outage statistics contained, then these were missing. This problem did not arise when +you did an PDF export or simply added an availability table to an existing report via +the context menu. diff --git a/ChangeLog b/ChangeLog index 7092265..88449ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -427,6 +427,7 @@ * 3332 FIX: Avoid falling back to annotation edit form when reloading page directly after editing * 3393 FIX: Availability annotations: also show annotations for hosts when showing services * 3415 FIX: Availability option "Visual levels for the availability" not longer enables itself... + * 3614 FIX: Outage statistics for hosts now also work in PDF reports... Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index cb3a0d3..9c1dbd8 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -531,6 +531,18 @@ def get_default_avoptions(): }, } +def get_outage_statistic_options(avoptions): + # Outage options are stored with keys matching service states (like "ok" and "crit"). + # For hosts we use the same checkbox but mean "up" and "down". We simply add these states + # to the list of selected states. + aggrs, states = avoptions.get("outage_statistics", ([], [])) + fixed_states = states[:] + for os, oh in [ ("ok","up"), ("crit","down"), ("unknown", "unreach") ]: + if os in fixed_states: + fixed_states.append(oh) + return aggrs, fixed_states + + #. # .--Computation---------------------------------------------------------. # | ____ _ _ _ | @@ -633,7 +645,7 @@ def compute_availability(what, av_rawdata, avoptions): # 2.2.2.2.3 "crit" # 2.2.2.2.4 "unknown" availability_table = [] - os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) + os_aggrs, os_states = get_outage_statistic_options(avoptions) need_statistics = os_aggrs and os_states grouping = avoptions["grouping"] timeline_rows = [] # Need this as a global variable if just one service is affected @@ -1091,7 +1103,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): # Headers for availability cells av_table["cell_titles"] = [] - os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) + os_aggrs, os_states = get_outage_statistic_options(avoptions) for sid, css, sname, help in availability_columns[what]: if not cell_active(sid, avoptions): continue @@ -1183,7 +1195,7 @@ def layout_availability_table(what, group_title, availability_table, avoptions): # Statistics? x_cnt, x_min, x_max = entry["statistics"].get(sid, (None, None, None)) - os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) + os_aggrs, os_states = get_outage_statistic_options(avoptions) if sid in os_states: for aggr in os_aggrs: if x_cnt != None: diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b2b78de..34961d0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -106,12 +106,6 @@ def render_availability_options(what): if html.form_submitted(): config.save_user_file("avoptions", avoptions) - # Convert outage-options from service to host - states = avoptions["outage_statistics"][1] - for os, oh in [ ("ok","up"), ("crit","down"), ("unknown", "unreach") ]: - if os in states: - states.append(oh) - return avoptions

8 years, 4 months

3578 FIX df: Fixed exception when monitoring filesystems without inode infos

by Lars Michelsen

Module: check_mk Branch: master Commit: d0ca4eff720c2dd011b16a86d329fc5d3b0b9b0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0ca4eff720c2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 27 13:24:32 2016 +0200 3578 FIX df: Fixed exception when monitoring filesystems without inode infos --- .werks/3578 | 10 ++++++++++ ChangeLog | 1 + checks/df | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3578 b/.werks/3578 new file mode 100644 index 0000000..5fc2cb8 --- /dev/null +++ b/.werks/3578 @@ -0,0 +1,10 @@ +Title: df: Fixed exception when monitoring filesystems without inode infos +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464348249 + + diff --git a/ChangeLog b/ChangeLog index bd45b15..7092265 100644 --- a/ChangeLog +++ b/ChangeLog @@ -237,6 +237,7 @@ * 3613 FIX: Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% * 3577 FIX: Solaris agent: Fixed performance issue introduced with #3389 * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disabled + * 3578 FIX: df: Fixed exception when monitoring filesystems without inode infos Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/df b/checks/df index 59ad58b..a3dffe1 100644 --- a/checks/df +++ b/checks/df @@ -126,7 +126,7 @@ def check_df(item, params, info): used_mb = int(line[3]) / 1024.0 reserved_mb = size_mb - avail_mb - used_mb # reserved for root fslist_blocks.append((mountpoint, size_mb, avail_mb, reserved_mb)) - if df_inodes: + if df_inodes and len(df_inodes) > idx: fslist_inodes.append((mountpoint, int(df_inodes[idx][2]), int(df_inodes[idx][4]))) return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes)

8 years, 4 months

added rule for nfsmounts

by Simon Betz

Module: check_mk Branch: master Commit: 25dfcaebb1f3e5e45d01f60637fee3e92972adcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25dfcaebb1f3e5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 13:23:41 2016 +0200 added rule for nfsmounts --- checks/network_fs.include | 6 ++++-- web/plugins/wato/check_parameters.py | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/checks/network_fs.include b/checks/network_fs.include index 0dde3c1..28858b6 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -34,7 +34,7 @@ def inventory_network_fs_mounts(info): return [ (" ".join(line[:-5]), None) for line in info ] -def check_network_fs_mounts(item, _no_params, info): +def check_network_fs_mounts(item, params, info): for line in info: mountpoint = " ".join(line[:-5]) if mountpoint == item: @@ -57,7 +57,9 @@ def check_network_fs_mounts(item, _no_params, info): free_bytes = free_blocks * blocksize used_bytes = size_bytes - free_bytes used_perc = 100.0 * used_bytes / size_bytes - perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] + perfdata = None + if params.get("has_perfdata"): + perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] if line[-5] == 'ok': if size_bytes == 0: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 61aac04..118c82b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8424,11 +8424,24 @@ register_check_parameters( subgroup_storage, "network_fs", _("Network filesystem - overall status (e.g. NFS)"), - None, + Dictionary( + elements = [ + ("has_perfdata", + DropdownChoice( + title = _("Performance data settings"), + choices = [ + (True, _("Enable performance data")), + (False, _("Disable performance data")), + ], + default_value = False + ), + ), + ], + ), TextAscii( title = _("Name of the mount point"), help = _("For NFS enter the name of the mount point.")), - "first" + "dict" ) register_check_parameters(

8 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016