Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: #2191 FIX Fixed handling of URL variable 'mode' in web API for discovering services

by Mathias Kettner

Module: check_mk Branch: master Commit: 13ef1117489f13e7a42e369ea5a7394013190a6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13ef1117489f13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 17:05:16 2015 +0200 #2191 FIX Fixed handling of URL variable 'mode' in web API for discovering services Thanks to Clynt Heikes --- .werks/2191 | 10 ++++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2191 b/.werks/2191 new file mode 100644 index 0000000..26cb5de --- /dev/null +++ b/.werks/2191 @@ -0,0 +1,10 @@ +Title: Fixed handling of URL variable 'mode' in web API for discovering services +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428505479 + +Thanks to Clynt Heikes diff --git a/ChangeLog b/ChangeLog index 5ef9a8b..b87c608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -421,6 +421,7 @@ * 2146 FIX: In distributed environments user notification rules trigger a profile synchronisation now... * 2158 FIX: Condition column in WATO rule tables has now a flexible width... * 2160 FIX: Fixed rename of hosts where a host with this name did exist before + * 2191 FIX: Fixed handling of URL variable 'mode' in web API for discovering services... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 7a447d6..eea3cb9 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -106,7 +106,7 @@ api_actions["delete_host"] = { ############### def action_discover_services(request): - mode = html.var("var") and html.var("mode") or "new" + mode = html.var("mode") and html.var("mode") or "new" hostname = request.get("hostname")

9 years, 5 months

Check_MK Git: check_mk: akcp_exp_humidity, akcp_sensor_humidity: fix exception in dicovery function

by Mathias Kettner

Module: check_mk Branch: master Commit: 9435f7dd3f72755dc698bbc7e79d6bae5886f7c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9435f7dd3f7275… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 16:59:42 2015 +0200 akcp_exp_humidity, akcp_sensor_humidity: fix exception in dicovery function --- checks/akcp_sensor.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index c7919aa..344075b 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -69,12 +69,12 @@ def inventory_akcp_sensor_no_params(info): # | |___/ | # +----------------------------------------------------------------------+ -akcp_humidity_defaultlevels = (35, 40, 60, 65) +akcp_humidity_defaultlevels = (30, 35, 60, 65) def inventory_akcp_humidity(info): - for line in info: - if line[-1] == "1": - yield desc, "akcp_humidity_defaultlevels" + for description, percent, status, online in info: + if online == "1": + yield description, "akcp_humidity_defaultlevels" def check_akcp_humidity(item, params, info): for description, percent, status, online in info:

9 years, 5 months

Check_MK Git: check_mk: diskstat: Fix missing items for LVM volumes

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c9efcecb7edd2b5fd127c5f874035af1bbaa842 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c9efcecb7edd2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 16:34:08 2015 +0200 diskstat: Fix missing items for LVM volumes Was due to an int vs. str compare --- checks/diskstat | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 195820d..c6f3b7d 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -111,8 +111,8 @@ def parse_diskstat(info): write_ios, write_merges, write_sectors, write_ticks, \ ios_in_prog, total_ticks, rq_ticks in proc_diskstat: - if (node_name, major, minor) in name_info: - device = name_info[(node_name, major, minor)] + if (node_name, int(major), int(minor)) in name_info: + device = name_info[(node_name, int(major), int(minor))] counter_base = "diskstat.%s." % device @@ -275,20 +275,20 @@ def diskstat_extract_name_info(info): info_plain.append(line) elif phase == 'dmsetup_info': try: - maj, min = map(int, line[2].split(':')) + major, minor = map(int, line[2].split(':')) if len(line) == 5: name = "LVM %s" % line[1] else: name = "DM %s" % line[1] - name_info[node, maj, min] = name + name_info[node, major, minor] = name except: pass # ignore such crap as "No Devices Found" elif phase == 'vx_dsk': - maj = int(line[1], 16) - min = int(line[2], 16) + major = int(line[1], 16) + minor = int(line[2], 16) group, disk = line[3].split('/')[-2:] name = "VxVM %s-%s" % (group, disk) - name_info[(node, maj, min)] = name + name_info[(node, major, minor)] = name return timestamp, info_plain, name_info @@ -308,7 +308,7 @@ def diskstat_convert_info(info): converted_disks[uuid] = converted_disks[multipath["device"]] del converted_disks[multipath["device"]] - # Remove any left-over device mapper devices that are not part of a + # Remove any left-over device mapper devices that are not part of a # known multipath device, LVM device or whatever for device in converted_disks.keys(): if device.startswith("dm-"):

9 years, 5 months

Check_MK Git: check_mk: agent_netapp: try to fix exception on missing shelf uid

by Mathias Kettner

Module: check_mk Branch: master Commit: f858411f32f36ef96f6c6defe2701e075dfecd4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f858411f32f36e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 14:57:46 2015 +0200 agent_netapp: try to fix exception on missing shelf uid --- agents/special/agent_netapp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index a1b4cae..577b251 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -142,6 +142,11 @@ def output_environment(results): if "netapp_api_disk" not in shared_data: return True + # TODO: We had a case where shelf_uid is not contained in shared_data["netapp_api_disk"]["shelf-uids"]. + # I (mk) do not know why. + if shelf_uid not in shared_data["netapp_api_disk"]["shelf-uids"]: + return False + for disk in shared_data["netapp_api_disk"]["shelf-uids"][shelf_uid]: state = shared_data["netapp_api_disk"]["disks"].get(disk) if state == "partner":

9 years, 5 months

Check_MK Git: check_mk: #2190 FIX jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b721ca61bb191a63e392f2d5dcb84f20cf6774d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b721ca61bb191… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 14:49:42 2015 +0200 #2190 FIX jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined --- .werks/2190 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/2190 b/.werks/2190 new file mode 100644 index 0000000..cba2186 --- /dev/null +++ b/.werks/2190 @@ -0,0 +1,10 @@ +Title: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428497362 + + diff --git a/ChangeLog b/ChangeLog index 1fa6c17..5ef9a8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -310,6 +310,7 @@ * 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios * 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents... * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available + * 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index bc83312..0592d0c 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -525,8 +525,9 @@ def check_jolokia_metrics_gc(item, params, info): if gc == None: return - if params: - cwarn, ccrit = params.get('CollectionCount', (None, None)) + if params == None: + params = {} + crate = get_rate("jvm.gc.count.%s" % (item), \ time.time(), int(gc['CollectionCount'])) @@ -534,6 +535,7 @@ def check_jolokia_metrics_gc(item, params, info): ctext = '' status = 0 + cwarn, ccrit = params.get('CollectionCount', (None, None)) if cwarn != None and ccrit != None: if crate >= int(ccrit): status = 2 @@ -546,9 +548,7 @@ def check_jolokia_metrics_gc(item, params, info): [('CollectionCount', crate, cwarn, ccrit)] if 'CollectionTime' in gc: - if params: - twarn, tcrit = params.get('CollectionTime', (None, None)) - + twarn, tcrit = params.get('CollectionTime', (None, None)) trate = get_rate("jvm.gc.time.%s" % (item), \ time.time(), int(gc['CollectionTime'])) trate = trate * 60.0 @@ -563,7 +563,7 @@ def check_jolokia_metrics_gc(item, params, info): status = 1 ttext = "(Level %s) " % twarn - yield status, "%.2f GC ms/minute%s" % (trate, text), \ + yield status, "%.2f GC ms/minute%s" % (trate, ttext), \ [('CollectionTime', trate, twarn, tcrit)]

9 years, 5 months

Check_MK Git: check_mk: Fixed typo in treasured check winperf_processor.single

by Mathias Kettner

Module: check_mk Branch: master Commit: 3792764b6f3c6fbd26471f959a09ba29b4873ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3792764b6f3c6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 14:37:10 2015 +0200 Fixed typo in treasured check winperf_processor.single --- doc/treasures/.gitignore | 1 - doc/treasures/checks/.f12 | 5 +++++ doc/treasures/checks/winperf_processor.single | 11 ++++------- doc/treasures/liveproxy/.f12 | 5 +++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/treasures/.gitignore b/doc/treasures/.gitignore deleted file mode 100644 index c332f1d..0000000 --- a/doc/treasures/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.f12 diff --git a/doc/treasures/checks/.f12 b/doc/treasures/checks/.f12 new file mode 100644 index 0000000..d540232 --- /dev/null +++ b/doc/treasures/checks/.f12 @@ -0,0 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} +echo "TARGET: /omd/sites/$SITE/share/check_mk/checks" +sudo rsync -var ./ /omd/sites/$SITE/local/share/check_mk/checks/ diff --git a/doc/treasures/checks/winperf_processor.single b/doc/treasures/checks/winperf_processor.single index e83781f..98342b1 100644 --- a/doc/treasures/checks/winperf_processor.single +++ b/doc/treasures/checks/winperf_processor.single @@ -34,17 +34,14 @@ def inventory_winperf_single(info): return None for line in info[1:]: - try: - if line[0] == '-232': - return [(None, "winperf_cpu_default_levels")] - except: - pass + if line[0] == '-232': + return [(None, "winperf_cpu_default_levels")] # params: levels for warn / crit in percentage def check_winperf_single(_no_item, params, info): if not info: - return + return this_time = int(float(info[0][0])) for line in info[1:]: @@ -72,7 +69,7 @@ def check_winperf_single(_no_item, params, info): check_info["winperf_processor.single"] = { 'check_function': check_winperf_single, 'inventory_function': inventory_winperf_single, - 'service_description': 'CPU utiliztion single', + 'service_description': 'CPU utilization single', 'has_perfdata': True, 'group': 'cpu_utilization_os', #'includes': [ "cpu_single.include" ], diff --git a/doc/treasures/liveproxy/.f12 b/doc/treasures/liveproxy/.f12 new file mode 100644 index 0000000..a287ada --- /dev/null +++ b/doc/treasures/liveproxy/.f12 @@ -0,0 +1,5 @@ +SITE=${SITE:-$(cat ../../../.site 2>/dev/null || true)} +SITE=${SITE:-$(omd sites --bare | head -n 1)} + +sudo install -m 755 liveproxyd /omd/sites/$SITE/bin/ +sudo su - $SITE -c "omd restart liveproxyd"

9 years, 5 months

Check_MK Git: check_mk: New helper function tryint() for usage in checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 1df1494d11a10693a13d787317dd7f94ca0048de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1df1494d11a106… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 11:11:07 2015 +0200 New helper function tryint() for usage in checks --- modules/check_mk_base.py | 10 ++++++++++ web/plugins/metrics/check_mk.py | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 90100a2..746b585 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1888,6 +1888,16 @@ def saveint(i): except: return 0 +# This variant of int() lets the string if its not +# convertable. Useful for parsing dict-like things, where +# some of the values are int. +def tryint(x): + try: + return int(x) + except: + return x + + def savefloat(f): try: return float(f) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 3156829..06205d7 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -430,7 +430,6 @@ metric_info["mem_lnx_vmalloc_chunk"] = { "unit" : "bytes", } - metric_info["execution_time"] = { "title" : _("Execution time"), "unit" : "s",

9 years, 5 months

Check_MK Git: check_mk: commit after werk failure

by Goetz Golla

Module: check_mk Branch: master Commit: 9edd416f7166ab7413342c90d9b181e6ebc09990 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9edd416f7166ab… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 7 23:18:11 2015 +0200 commit after werk failure --- .werks/2112 | 9 +++++ ChangeLog | 1 + checkman/hitachi_hnas_bossock | 29 ++++++++++++++++ checks/hitachi_hnas_bossock | 62 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 15 ++++++++ 5 files changed, 116 insertions(+) diff --git a/.werks/2112 b/.werks/2112 new file mode 100644 index 0000000..22c65ac --- /dev/null +++ b/.werks/2112 @@ -0,0 +1,9 @@ +Title: hitachi_hnas_bossock: new check to monitor number of running Bossock Fibers +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1428441368 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8671ab2..1fa6c17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,7 @@ NOTE: Please refer to the migration notes! * 2185 canon_pages: added support for b/w A4 and color A4/A3 counters * 2186 check_mk_agent.aix: use GNU df in order to exclude NFS for filesystem monitoring... + * 2112 hitachi_hnas_bossock: new check to monitor number of running Bossock Fibers * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/hitachi_hnas_bossock b/checkman/hitachi_hnas_bossock new file mode 100644 index 0000000..03c6aa6 --- /dev/null +++ b/checkman/hitachi_hnas_bossock @@ -0,0 +1,29 @@ +title: Hitachi HNAS: Number of Bossock Fibers +agents: snmp +catalog: hw/storagehw/hitachi +license: GPL +distribution: check_mk +description: + Monitors the number of Bossock Fibers in Hitachi HNAS storage systems. + It was tested against Hitachi HNAS Modell 3090 but probably will work + for other HNAS devices using the BlueArc MIB - give it a try. + + The checks gets WARN or CRIT depending on the warning and critical levels + for the number of fibers. + +inventory: + Creates one check for every cluster node in the HNAS system. + +item: + The ID of the node + +perfdata: + The number of Bossock Fibers + +[parameters] +parameters (tuple): warn, crit levels (int, int) + +[configuration] +hitachi_hnas_bossock_default_levels(tuple): The standard levels for {WARN} and + {CRIT}, preset to (250, 350) + diff --git a/checks/hitachi_hnas_bossock b/checks/hitachi_hnas_bossock new file mode 100644 index 0000000..4b3aaaf --- /dev/null +++ b/checks/hitachi_hnas_bossock @@ -0,0 +1,62 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +hitachi_hnas_bossock_default_levels = (250, 350) + +def inventory_hitachi_hnas_bossock(info): + for clusternode, fibers in info: + yield clusternode, 'hitachi_hnas_bossock_default_levels' + +def check_hitachi_hnas_bossock(item, params, info): + for clusternode, fibers in info: + if clusternode == item: + warn, crit = params + infotext = "%s running (levels %d/%d)" % (fibers, warn, crit) + + if int(fibers) >= crit: + state = 2 + elif int(fibers) >= warn: + state = 1 + else: + state = 0 + + perfdata = [ ("fibers", fibers, warn, crit) ] + + return state, infotext, perfdata + +check_info["hitachi_hnas_bossock"] = { + "check_function" : check_hitachi_hnas_bossock, + "inventory_function" : inventory_hitachi_hnas_bossock, + "service_description" : "Bossock Fibers on Node %s", + "has_perfdata" : True, + "group" : "bossock_fibers", + "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.6.7.4.1", [ + 1, # clusterNodeStatsCnID + 2, # runningBossockFibers + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.11096.6"), +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 42156cc..a2a6c12 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8673,3 +8673,18 @@ register_check_parameters( ), None ) + +register_check_parameters( + subgroup_storage, + "bossock_fibers", + _("Number of Running Bossock Fibers"), + Tuple( + title = _("Number of fibers"), + elements = [ + Integer(title = _("Warning at"), unit=_("fibers")), + Integer(title = _("Critical at"), unit=_("fibers")), + ] + ), + TextAscii( title = _("Node ID")), + "first" +)

9 years, 5 months

Check_MK Git: check_mk: hitachi_hnas_volume: fix from last merge

by Goetz Golla

Module: check_mk Branch: master Commit: bab3c776e01e3788f40f8c2ecf502366c244c511 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab3c776e01e37… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 7 22:53:24 2015 +0200 hitachi_hnas_volume: fix from last merge --- checks/hitachi_hnas_volume | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index b6cc896..9c822b8 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -39,23 +39,15 @@ def check_hitachi_hnas_volume(item, params, info): if volid == '': continue if volid + " " + label == item: -<<<<<<< HEAD - size_mb = int(total) / 1048576.0 - avail_mb = int(free) / 1048576.0 - fslist.append((item, size_mb, avail_mb, 0)) - - status, message, perfdata = df_check_filesystem_list(item, params, fslist) -======= if total and free: size_mb = int(total) / 1048576.0 avail_mb = int(free) / 1048576.0 - fslist.append((item, size_mb, avail_mb)) + fslist.append((item, size_mb, avail_mb, 0)) status, message, perfdata = df_check_filesystem_list(item, params, fslist) else: status = 1 message = "no filesystem size information (!)" perfdata = [] ->>>>>>> c301dde... #2111 FIX hitachi_hnas_volume: fix for cases when size information of volumes is not available # evaluate volumeStatus statusmap = (("", 3),

9 years, 5 months

Check_MK Git: check_mk: Conflicts:

by Goetz Golla

Module: check_mk Branch: master Commit: e4889feba9c5417e4804dee54324f3d05e31cd33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4889feba9c541… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Apr 7 22:33:48 2015 +0200 Conflicts: ChangeLog checks/hitachi_hnas_volume --- .werks/2111 | 10 ++++++++++ ChangeLog | 1 + checks/hitachi_hnas_volume | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/.werks/2111 b/.werks/2111 new file mode 100644 index 0000000..e4bbb63 --- /dev/null +++ b/.werks/2111 @@ -0,0 +1,10 @@ +Title: hitachi_hnas_volume: fix for cases when size information of volumes is not available +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428438547 + + diff --git a/ChangeLog b/ChangeLog index c1c697b..c42d26f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,6 +308,7 @@ * 1899 FIX: mk_oracle: backport of werk 1564 from agent... * 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios * 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents... + * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index fac705b..b6cc896 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -39,11 +39,23 @@ def check_hitachi_hnas_volume(item, params, info): if volid == '': continue if volid + " " + label == item: +<<<<<<< HEAD size_mb = int(total) / 1048576.0 avail_mb = int(free) / 1048576.0 fslist.append((item, size_mb, avail_mb, 0)) status, message, perfdata = df_check_filesystem_list(item, params, fslist) +======= + if total and free: + size_mb = int(total) / 1048576.0 + avail_mb = int(free) / 1048576.0 + fslist.append((item, size_mb, avail_mb)) + status, message, perfdata = df_check_filesystem_list(item, params, fslist) + else: + status = 1 + message = "no filesystem size information (!)" + perfdata = [] +>>>>>>> c301dde... #2111 FIX hitachi_hnas_volume: fix for cases when size information of volumes is not available # evaluate volumeStatus statusmap = (("", 3),

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015