Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: FIX BI editor: fixed display bug in "

by Andreas Boesl

Create nodes based on a service search" Message-ID: <5339289d.9axEslwjsI1Saguu%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 58eb05aad2ae27bc798e92b2a383e390ad85fc3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58eb05aad2ae27… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 31 10:34:34 2014 +0200 FIX BI editor: fixed display bug in "Create nodes based on a service search" The WATO BI editor had some problems when displaying rules with the pattern<br> "Create nodes based on a service search" -> "State of a service" --- .werks/741 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/741 b/.werks/741 new file mode 100644 index 0000000..956eb45 --- /dev/null +++ b/.werks/741 @@ -0,0 +1,9 @@ +Title: BI editor: fixed display bug in "Create nodes based on a service search" +Level: 1 +Component: bi +Version: 1.2.5i2 +Date: 1396254706 +Class: fix + +The WATO BI editor had some problems when displaying rules with the pattern<br> +"Create nodes based on a service search" -> "State of a service" diff --git a/ChangeLog b/ChangeLog index 59ec71b..3fb0a69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * 0764 lnx_quota: Added new check to monitor Linux File System Quota... * 0740 FIX: winperf_if: now able to handle bandwidth > 4GBit... + BI: + * 0741 FIX: BI editor: fixed display bug in "Create nodes based on a service search"... + 1.2.5i1: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b00ac70..9338fff 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15089,7 +15089,8 @@ def bi_called_rule(node): return subnode[1][0], info elif node[0] == "foreach_service": subnode = node[1][-1] - return subnode[1][0], _("Called for each service...") + if subnode[0] == 'call': + return subnode[1][0], _("Called for each service...") def count_bi_rule_references(aggregations, aggregation_rules, ruleid): aggr_refs = 0

10 years, 2 months

Check_MK Git: check_mk: Some preparations for upcoming reporting

by Mathias Kettner

Module: check_mk Branch: master Commit: 2baa0b895d3deabfb62cd3a80c574fe255040372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2baa0b895d3dea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 30 22:08:43 2014 +0200 Some preparations for upcoming reporting --- mkeventd/web/plugins/views/mkeventd.py | 1 + web/htdocs/config.py | 2 ++ web/htdocs/index.py | 7 +++++++ web/htdocs/views.py | 22 +++++++++++++++++++++- web/plugins/views/bi.py | 1 + web/plugins/views/painters.py | 2 ++ web/plugins/views/perfometer.py | 1 + 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 6fb10e6..9bb2111 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -619,6 +619,7 @@ if mkeventd_enabled: multisite_painters["event_icons"] = { "title" : _("Event Icons"), "short" : _("Icons"), + "printable" : False, "columns" : [ "event_phase" ], "paint" : paint_event_icons, } diff --git a/web/htdocs/config.py b/web/htdocs/config.py index f748d98..bb8ea35 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -319,6 +319,8 @@ def may_with_roles(some_role_ids, pname): base_role_id = role["basedon"] else: base_role_id = role_id + if pname not in permissions_by_name: + return False # Permission unknown. Assume False. Functionality might be missing perm = permissions_by_name[pname] he_may = base_role_id in perm["defaults"] if he_may: diff --git a/web/htdocs/index.py b/web/htdocs/index.py index df53cc0..d18635a 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -68,6 +68,13 @@ def load_all_plugins(): pass except Exception: raise + + # Load reporting plugins (only available in subscription version) + try: + reporting.load_plugins() + except: + pass + __builtin__.load_all_plugins = load_all_plugins # Main entry point for all HTTP-requests (called directly by mod_apache) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6eacfab..dd3d124 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -235,6 +235,18 @@ class Filter: def heading_info(self, infoname): return None +def unset_all_filtervars(): + for f in multisite_filters.values(): + for varname in f.htmlvars: + html.del_var(varname) + +def get_all_filtervars(): + filtervars = {} + for f in multisite_filters.values(): + for varname in f.htmlvars: + if html.has_var(varname): + filtervars[varname] = html.var(varname) + return filtervars # Load all views - users or builtins def load_views(): @@ -1176,7 +1188,15 @@ def page_view(): raise MKGeneralException(_("Missing the variable view_name in the URL.")) view = html.available_views.get(view_name) if not view: - raise MKGeneralException(("No view defined with the name '%s'.") % html.attrencode(view_name)) + raise MKGeneralException(_("No view defined with the name '%s'.") % html.attrencode(view_name)) + + if config.may("reporting.instant"): + if html.var("instant_report"): + import reporting + reporting.instant_report() + return + + html.add_status_icon("report", _("Export as PDF (instant report)"), html.makeuri([("instant_report", "1")])) show_view(view, True, True, True) diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index a335f1c..4c33124 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -89,6 +89,7 @@ def paint_bi_icons(row): multisite_painters["aggr_icons"] = { "title" : _("Links"), "columns" : [ "aggr_group", "aggr_name", "aggr_effective_state" ], + "printable" : False, "paint" : paint_bi_icons, } diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 00f8c6c..65a5628 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -188,6 +188,7 @@ def iconpainter_columns(what): multisite_painters["service_icons"] = { "title": _("Service icons"), "short": _("Icons"), + "printable" : False, # does not contain printable text "columns": iconpainter_columns("service"), "groupby" : lambda row: "", # Do not account for in grouping "paint": lambda row: paint_icons("service", row) @@ -196,6 +197,7 @@ multisite_painters["service_icons"] = { multisite_painters["host_icons"] = { "title": _("Host icons"), "short": _("Icons"), + "printable" : False, # does not contain printable text "columns": iconpainter_columns("host"), "groupby" : lambda row: "", # Do not account for in grouping "paint": lambda row: paint_icons("host", row) diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 997f123..1b27798 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -197,6 +197,7 @@ multisite_painters["perfometer"] = { "service_check_command", "service_pnpgraph_present", "service_plugin_output" ], "paint" : paint_perfometer, "sorter" : "svc_perf_val01", + "printable" : False, # No printable on PDF, only in HTML } load_web_plugins("perfometer", globals())

10 years, 2 months

Check_MK Git: check_mk: cisco_temp_sensor: Check cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: 90df37d95c06ae9ab70476cad78fc65b7b750c73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90df37d95c06ae… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 28 14:55:15 2014 +0100 cisco_temp_sensor: Check cleanup --- checks/cisco_temp_sensor | 60 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 32c5d7d..19404b5 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -159,32 +159,34 @@ def check_cisco_temp_sensor(item, _no_params, info): ( "temperature", value, warn, crit ) ]) return (3, "sensor not found in SNMP data") -check_info['cisco_temp_sensor'] = (check_cisco_temp_sensor, "Temperature %s", 1, inventory_cisco_temp_sensor) - -snmp_info['cisco_temp_sensor'] = [ - # Description of sensors - ( ".1.3.6.1.2.1.47.1.1.1.1", [ - OID_END, - 2, # Description of the sensor - ]), - - # Type and current state - ( ".1.3.6.1.4.1.9.9.91.1.1.1.1", [ - OID_END, - 1, # Type (see above), 8 = Celsius, 12 = truth value - 4, # Most recent measurement - 5, # Status of the sensor 1 == ok, 2 == cannot report, 3 == broken - ]), - - # Threshold - ( ".1.3.6.1.4.1.9.9.91.1.2.1.1", [ - OID_END, - 4, # Thresholds - ]), -] - -snmp_scan_functions['cisco_temp_sensor'] = \ - lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ - oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") != None - -checkgroup_of["cisco_temp_sensor"] = "temperature_auto" + +check_info['cisco_temp_sensor'] = { + "check_function" : check_cisco_temp_sensor, + "inventory_function" : inventory_cisco_temp_sensor, + "service_description": "Temperature %s", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ + oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") != None, + "snmp_info" : [ + ( ".1.3.6.1.2.1.47.1.1.1.1", [ + OID_END, + 2, # Description of the sensor + ]), + + # Type and current state + ( ".1.3.6.1.4.1.9.9.91.1.1.1.1", [ + OID_END, + 1, # Type (see above), 8 = Celsius, 12 = truth value + 4, # Most recent measurement + 5, # Status of the sensor 1 == ok, 2 == cannot report, 3 == broken + ]), + + # Threshold + ( ".1.3.6.1.4.1.9.9.91.1.2.1.1", [ + OID_END, + 4, # Thresholds + ]), + ], + "group" : "temperature_auto" +} +

10 years, 2 months

Check_MK Git: check_mk: lnx_quota: Added new check to monitor Linux File System Quota

by Lars Michelsen

Module: check_mk Branch: master Commit: 67efa2f17f32dbb41ab9dd330f257a56b9896e5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67efa2f17f32db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 19:56:05 2014 +0100 lnx_quota: Added new check to monitor Linux File System Quota This check monitors filesystems where linux user quotas has been configured for users which exceed their space and file quotas. --- .werks/764 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/764 b/.werks/764 new file mode 100644 index 0000000..df81538 --- /dev/null +++ b/.werks/764 @@ -0,0 +1,9 @@ +Title: lnx_quota: Added new check to monitor Linux File System Quota +Level: 1 +Component: checks +Version: 1.2.5i2 +Date: 1396032940 +Class: feature + +This check monitors filesystems where linux user quotas has been +configured for users which exceed their space and file quotas. diff --git a/ChangeLog b/ChangeLog index 13cca8f..59ec71b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes * 0774 ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices * 0775 ibm_svc_systemstats.diskio: new check for disk throughput in IBM SVC / V7000 devices in total + * 0764 lnx_quota: Added new check to monitor Linux File System Quota... * 0740 FIX: winperf_if: now able to handle bandwidth > 4GBit...

10 years, 3 months

Check_MK Git: check_mk: lnx_quota: Added new check to monitor Linux File System Quota

by Lars Michelsen

Module: check_mk Branch: master Commit: 79547604b2d139d7ce6d601fe62fd0e9e4974128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79547604b2d139… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 19:55:30 2014 +0100 lnx_quota: Added new check to monitor Linux File System Quota --- agents/plugins/lnx_quota | 6 +++ checkman/lnx_quota | 22 ++++++++++ checks/lnx_quota | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/agents/plugins/lnx_quota b/agents/plugins/lnx_quota new file mode 100644 index 0000000..09fde34 --- /dev/null +++ b/agents/plugins/lnx_quota @@ -0,0 +1,6 @@ +#!/bin/bash +echo "<<<lnx_quota>>>" +for VOL in $(grep usrjquota /etc/fstab | cut -d' ' -f2); do + echo "[[[$VOL]]]" + repquota -up $VOL +done diff --git a/checkman/lnx_quota b/checkman/lnx_quota new file mode 100644 index 0000000..2f236e5 --- /dev/null +++ b/checkman/lnx_quota @@ -0,0 +1,22 @@ +title: Linux File System Quotas +agents: linux +catalog: os/storage +license: GPL +distribution: check_mk +description: + This check monitors filesystems where linux user quotas has been configured + for users which exceed their space and file quotas. + + The check uses information provided by the Check_MK linux agent which are + available when the agent has been extended with the {lnx_quota} agent plugin. + +item: + The mountpoint of the filesystem + +perfdata: + Two values per user. {<user>_blocks} reports the currently allocated space + of the user in bytes and {<user>_files} reports the number of files currently + owned by the user. + +inventory: + Creates one check for each filesystem with enabled user quotas diff --git a/checks/lnx_quota b/checks/lnx_quota new file mode 100644 index 0000000..524c217 --- /dev/null +++ b/checks/lnx_quota @@ -0,0 +1,102 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +def lnx_quota_parse(info): + parsed = {} + fs = None + for line in info: + if line[0].startswith('[[['): + # new filesystem + fs = line[0][3:-3] + parsed[fs] = {} + elif fs and len(line) == 10: + # new table entry + parsed[fs][line[0]] = map(int, line[2:]) + return parsed + +def inventory_lnx_quota(info): + inv = [] + for fs in lnx_quota_parse(info).keys(): + inv.append((fs, {})) + return inv + +def check_lnx_quota(item, params, info): + parsed = lnx_quota_parse(info) + if item not in parsed: + return 3, 'Quota info not found for this filesystem' + + state = 0 + output = [] + perfdata = [] + + fmt = lambda v, w: w == 'files' and '%d files' % v or get_bytes_human_readable(used*1000, 1000) + + for user, values in parsed[item].items(): + for what, (used, soft, hard, grace) in [ + ('blocks', values[:4]), + ('files', values[4:]) ]: + if soft == 0 and hard == 0: + continue # skip entries with not-set limits + + this_state = 0 + txt = '%s %s' % (user, fmt(used, what)) + if used > hard: + this_state = 2 + txt += ' (over %s hard(!!))' % fmt(hard, what) + elif used > soft: + this_state = 1 + txt += ' (over %s soft' % fmt(soft, what) + if grace != 0: + # user is or was in grace period + if grace <= time.time(): + txt += ', grace exceeded(!!)' + this_state = 2 + else: + txt += ', within grace(!)' + else: + txt += '(!)' + txt += ')' + # When users are in "ok" state, don't output their usage, just + # add the perfdata for them + if this_state: + output.append(txt) + state = max(state, this_state) + + perfdata.append(('%s_%s' % (user, what), used*1000, + soft*1000, hard*1000, 0, hard*1000)) + + if not output: + output.append('All users are within quota') + + return state, ', '.join(output), perfdata + +check_info['lnx_quota'] = { + 'check_function' : check_lnx_quota, + 'inventory_function' : inventory_lnx_quota, + 'service_description' : 'Quota %s', + 'has_perfdata' : True, + 'group' : 'quota', +}

10 years, 3 months

Check_MK Git: check_mk: FIX winperf_if: now able to handle display of bandwidth > 4GBit

by Andreas Boesl

Module: check_mk Branch: master Commit: c8ee9de6e9e0f88fc09708d27a65ce665423b53d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ee9de6e9e0f8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 28 15:20:55 2014 +0100 FIX winperf_if: now able to handle display of bandwidth > 4GBit If an interface had a bandwidth of > 4GBit the check did not receive the correct bandwidth value, because of a 32 bit counter overflow. Workaround: The windows plugin wmic_if.bat now also reports the correct bandwidth value. If you use this plugin its bandwidth value will have precedence before the bandwidth determined by the agent. --- .werks/740 | 11 +++++++++++ ChangeLog | 2 ++ agents/windows/plugins/wmic_if.bat | 2 +- checks/winperf_if | 3 ++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/740 b/.werks/740 new file mode 100644 index 0000000..504df72 --- /dev/null +++ b/.werks/740 @@ -0,0 +1,11 @@ +Title: winperf_if: now able to handle display of bandwidth > 4GBit +Level: 1 +Component: checks +Version: 1.2.5i2 +Date: 1396016199 +Class: fix + +If an interface had a bandwidth of > 4GBit the check did not receive +the correct bandwidth value, because of a 32 bit counter overflow. +Workaround: The windows plugin wmic_if.bat now also reports the correct bandwidth value. +If you use this plugin its bandwidth value will have precedence before the bandwidth determined by the agent. diff --git a/ChangeLog b/ChangeLog index 2cdf4e3..62c7302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.2.5i2: Checks & Agents: + * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes * 0774 ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices + * 0740 FIX: winperf_if: now able to handle display of bandwidth > 4GBit... 1.2.5i1: diff --git a/agents/windows/plugins/wmic_if.bat b/agents/windows/plugins/wmic_if.bat index 501c892..2192d7e 100644 --- a/agents/windows/plugins/wmic_if.bat +++ b/agents/windows/plugins/wmic_if.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<winperf_if:sep^(44^)^>^>^> -wmic path Win32_NetworkAdapter get macaddress,name,netconnectionid,netconnectionstatus /format:csv +wmic path Win32_NetworkAdapter get speed,macaddress,name,netconnectionid,netconnectionstatus /format:csv diff --git a/checks/winperf_if b/checks/winperf_if index a7a7cf6..6035cc3 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -121,6 +121,7 @@ def convert_winperf_if(info): for nr, nic_name in enumerate(nic_names): nic = nics[nic_name] mac_txt = nic.get('MACAddress') + bandwidth = saveint(nic.get('Speed')) if mac_txt: mac = "".join(map(lambda x: chr(int(x, 16)), mac_txt.split(':'))) else: @@ -129,7 +130,7 @@ def convert_winperf_if(info): str(nr + 1), nic_name, "loopback" in nic_name.lower() and '24' or '6', - nic[10], # Aktuelle Bandbreite + bandwidth or nic[10], # Aktuelle Bandbreite # NetConnectionStatus: 2 st up, 7 ist 'not connected'. If the plugin # wmic_if is missing and we have link information we need to assume 'up': nic.get('NetConnectionStatus', '2') == '2' and '1' or '2',

10 years, 3 months

Check_MK Git: check_mk: fixed wording in check manpage of ibm_svc_nodestats .diskio

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: bbc4e718c9b023bdb588ee265c208a045d58646c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc4e718c9b023… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 15:06:11 2014 +0100 fixed wording in check manpage of ibm_svc_nodestats.diskio --- checkman/ibm_svc_nodestats.diskio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/ibm_svc_nodestats.diskio b/checkman/ibm_svc_nodestats.diskio index 79e1311..523c197 100644 --- a/checkman/ibm_svc_nodestats.diskio +++ b/checkman/ibm_svc_nodestats.diskio @@ -13,7 +13,7 @@ item: "Drives", "MDisks" or "VDisks" plus the name of the node. inventory: - Creates one check for every Drive, MDisk or VDisk on every node. + Creates one check for Drives, one for MDisks and one for VDisks per node. perfdata: Two values: Throughput read and throughput write in Bytes/sec.

10 years, 3 months

Check_MK Git: check_mk: ibm_svc_systemstats.diskio: new check for disk throughput in IBM SVC / V7000 devices in total

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: de60cab2c2f8102e4787b973b3de6e1a73ae6c3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de60cab2c2f810… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Mar 28 15:04:29 2014 +0100 ibm_svc_systemstats.diskio: new check for disk throughput in IBM SVC / V7000 devices in total --- .werks/775 | 8 ++ ChangeLog | 1 + checkman/ibm_svc_systemstats.diskio | 19 ++++ checks/ibm_svc_systemstats | 120 ++++++++++++++++++++ .../check_mk-ibm_svc_systemstats.diskio.php | 1 + web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/datasource_programs.py | 6 +- 7 files changed, 152 insertions(+), 4 deletions(-) diff --git a/.werks/775 b/.werks/775 new file mode 100644 index 0000000..cd46a9f --- /dev/null +++ b/.werks/775 @@ -0,0 +1,8 @@ +Title: ibm_svc_systemstats.diskio: new check for disk throughput in IBM SVC / V7000 devices in total +Level: 1 +Component: checks +Version: 1.2.5i2 +Date: 1396015424 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index aab5f25..ffbc71b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes * 0774 ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices + * 0775 ibm_svc_systemstats.diskio: new check for disk throughput in IBM SVC / V7000 devices in total 1.2.5i1: diff --git a/checkman/ibm_svc_systemstats.diskio b/checkman/ibm_svc_systemstats.diskio new file mode 100644 index 0000000..ef46e95 --- /dev/null +++ b/checkman/ibm_svc_systemstats.diskio @@ -0,0 +1,19 @@ +title: IBM SVC / V7000: Disk Throughput for Drives/MDisks/VDisks in Total +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Reports the disk throughput for Drives, MDisks and VDisks of an IBM + SVC / V7000 device in total in bytes per second. + + The check is only for reporting and returns always {OK}. + +item: + "Drives", "MDisks" or "VDisks" + +inventory: + Creates one check for Drives, one for MDisks and one for VDisks. + +perfdata: + Two values: Throughput read and throughput write in Bytes/sec. diff --git a/checks/ibm_svc_systemstats b/checks/ibm_svc_systemstats new file mode 100644 index 0000000..13a0ceb --- /dev/null +++ b/checks/ibm_svc_systemstats @@ -0,0 +1,120 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# <<<ibm_svc_systemstats:sep(58)>>> +# compression_cpu_pc:0:0:140325134929 +# cpu_pc:2:2:140325134929 +# fc_mb:640:1482:140325134754 +# fc_io:46718:56258:140325134749 +# sas_mb:0:0:140325134929 +# sas_io:0:0:140325134929 +# iscsi_mb:0:0:140325134929 +# iscsi_io:0:0:140325134929 +# write_cache_pc:0:1:140325134819 +# total_cache_pc:70:75:140325134704 +# vdisk_mb:207:533:140325134754 +# vdisk_io:4827:5966:140325134819 +# vdisk_ms:1:2:140325134759 +# mdisk_mb:222:651:140325134754 +# mdisk_io:4995:6741:140325134754 +# mdisk_ms:1:3:140325134809 +# drive_mb:0:0:140325134929 +# drive_io:0:0:140325134929 +# drive_ms:0:0:140325134929 +# vdisk_r_mb:113:428:140325134524 +# vdisk_r_io:2470:3672:140325134819 +# vdisk_r_ms:1:4:140325134759 +# vdisk_w_mb:93:143:140325134704 +# vdisk_w_io:2359:3595:140325134859 +# vdisk_w_ms:0:2:140325134704 +# mdisk_r_mb:32:362:140325134754 +# mdisk_r_io:1452:2825:140325134754 +# mdisk_r_ms:4:7:140325134649 +# mdisk_w_mb:189:291:140325134749 +# mdisk_w_io:3542:4465:140325134714 +# mdisk_w_ms:0:2:140325134819 +# drive_r_mb:0:0:140325134929 +# drive_r_io:0:0:140325134929 +# drive_r_ms:0:0:140325134929 +# drive_w_mb:0:0:140325134929 +# drive_w_io:0:0:140325134929 +# drive_w_ms:0:0:140325134929 + + +# parses agent output into a structure like: +# {'Drives': {'r_mb': 0, 'w_mb': 0}, +# 'MDisks': {'r_mb': 32, 'w_mb': 189}, +# 'VDisks': {'r_mb': 113, 'w_mb': 93}} + +def ibm_svc_systemstats_parse(info): + parsed = {} + for stat_name, stat_current, stat_peak, stat_peak_time in info: + if stat_name in ("vdisk_r_mb", "vdisk_w_mb"): + if "VDisks" not in parsed.keys(): + parsed["VDisks"] = {} + stat_name = stat_name.replace("vdisk_", "") + parsed["VDisks"][stat_name] = int(stat_current) + if stat_name in ("mdisk_r_mb", "mdisk_w_mb"): + if "MDisks" not in parsed.keys(): + parsed["MDisks"] = {} + stat_name = stat_name.replace("mdisk_", "") + parsed["MDisks"][stat_name] = int(stat_current) + if stat_name in ("drive_r_mb", "drive_w_mb"): + if "Drives" not in parsed.keys(): + parsed["Drives"] = {} + stat_name = stat_name.replace("drive_", "") + parsed["Drives"][stat_name] = int(stat_current) + return parsed + +def inventory_ibm_svc_systemstats(info): + inventory = [] + parsed = ibm_svc_systemstats_parse(info) + for key in parsed.keys(): + inventory.append( (key, None) ) + return inventory + +def check_ibm_svc_systemstats(item, _no_params, info): + parsed = ibm_svc_systemstats_parse(info) + + if item not in parsed.keys(): + return 3, "%s not found in agent output" % item + + read_bytes = parsed[item]['r_mb'] * 1024 * 1024 + write_bytes = parsed[item]['w_mb'] * 1024 * 1024 + perfdata = [ ("read", read_bytes), ("write", write_bytes) ] + + return 0, "%s/sec read, %s/sec write" % \ + (get_bytes_human_readable(read_bytes), get_bytes_human_readable(write_bytes)), \ + perfdata + +check_info["ibm_svc_systemstats.diskio"] = { + "check_function" : check_ibm_svc_systemstats, + "inventory_function" : inventory_ibm_svc_systemstats, + "service_description" : "IBM SVC Throughput %s Total", + "has_perfdata" : True, +} + diff --git a/pnp-templates/check_mk-ibm_svc_systemstats.diskio.php b/pnp-templates/check_mk-ibm_svc_systemstats.diskio.php new file mode 120000 index 0000000..8b45325 --- /dev/null +++ b/pnp-templates/check_mk-ibm_svc_systemstats.diskio.php @@ -0,0 +1 @@ +check_mk-diskstat.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 5bdf83e..fb7a1e9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -533,6 +533,7 @@ perfometers["check_mk-mysql.innodb_io"] = perfometer_check_mk_diskstat perfometers["check_mk-esx_vsphere_counters.diskio"] = perfometer_check_mk_diskstat perfometers["check_mk-emcvnx_disks"] = perfometer_check_mk_diskstat perfometers["check_mk-ibm_svc_nodestats.diskio"] = perfometer_check_mk_diskstat +perfometers["check_mk-ibm_svc_systemstats.diskio"] = perfometer_check_mk_diskstat def perfometer_in_out_mb_per_sec(row, check_command, perf_data): read_mbit = float(perf_data[0][1]) / 131072 diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 6a29d60..90f9077 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -272,12 +272,10 @@ register_rule(group, ( "lsnode", _("IO Groups") ), ( "lsnodestats", _("Node Stats") ), ( "lssystem", _("System Info") ), -# ( "lssystemstats", _("System Stats") ), + ( "lssystemstats", _("System Stats") ), ], -# default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", -# "lsnodestats", "lssystem", "lssystemstats", ], default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", - "lsnodestats", "lssystem", ], + "lsnodestats", "lssystem", "lssystemstats", ], allow_empty = False, ), title = _("Retrieve information about..."),

10 years, 3 months

Check_MK Git: check_mk: Fixed changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 1359684dc006c4200c4f560c194204c3de032d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1359684dc006c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 28 14:58:07 2014 +0100 Fixed changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 2cdf4e3..aab5f25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i2: Checks & Agents: + * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes * 0774 ibm_svc_nodestats.diskio: new check for disk troughput per node on IBM SVC / V7000 devices

10 years, 3 months

Check_MK Git: check_mk: fixed version info in wer 147

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5feb3884fcc8eacac8142c5af550ddcb42dbe22b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5feb3884fcc8ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 28 14:12:58 2014 +0100 fixed version info in wer 147 --- .werks/147 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/147 b/.werks/147 index e270cab..c03b313 100644 --- a/.werks/147 +++ b/.werks/147 @@ -1,7 +1,7 @@ Title: enterasys_fans: New Check to monitor fans of enterasys swichtes Level: 1 Component: checks -Version: 1.2.5i1 +Version: 1.2.5i2 Date: 1396001864 Class: feature

10 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014