Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: Automatically refresh new virtual tree snapin

by Mathias Kettner

Module: check_mk Branch: master Commit: 1df1b983ec3ce4f5c9539e7722ee4c2162afc8a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1df1b983ec3ce4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 12:44:21 2014 +0200 Automatically refresh new virtual tree snapin --- web/plugins/sidebar/shipped.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 768cb02..82031b9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1354,6 +1354,7 @@ sidebar_snapins["tag_tree"] = { "description" : _("This snapin shows tree views of your hosts based on their tag classifications. You " "can configure which tags to use in your global settings of Multisite."), "render" : render_tag_tree, + "refresh" : True, "allowed" : [ "admin", "user", "guest" ], "styles" : """

10 years, 5 months

Check_MK Git: check_mk: New snapin with virtual host trees

by Mathias Kettner

Module: check_mk Branch: master Commit: 6a886c471038c86cf45390586b1ad5187a86a7b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a886c471038c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 12:43:42 2014 +0200 New snapin with virtual host trees We have added a new snapin to Multisite: Virtual Host Tree. This snapin allows you to have trees of your hosts created based upon tags. In order to use this simply add the snapin to your sidebar and go to the Global Settings, section Status GUI (Multisite) and the new setting Virtual Host Trees. You can create an arbitrary number of virtual trees. They will be globally visible for all users. Each tree consists of a sequence of tag groups. Let's assume that you have created a virtual tree from the three fictive tag groups Location, Application and Criticality. The virtual host tree will then have tree levels. At the top level there is the selection of the location, on the second level the application and on the leaf-level the criticality. A click of an arbitrary node of the tree brings you to all hosts having the selected tags. --- .werks/963 | 21 +++ ChangeLog | 1 + web/htdocs/js/checkmk.js | 21 ++- web/htdocs/js/sidebar.js | 7 + web/htdocs/sidebar.css | 2 +- web/htdocs/sidebar.py | 7 + web/htdocs/valuespec.py | 46 +++++-- web/htdocs/wato.py | 1 + web/plugins/config/builtin.py | 3 + web/plugins/pages/shipped.py | 1 + web/plugins/sidebar/shipped.py | 192 ++++++++++++++++++++++++++++ web/plugins/sidebar/wato.py | 1 + web/plugins/views/builtin.py | 4 +- web/plugins/wato/check_mk_configuration.py | 37 ++++++ 14 files changed, 324 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6a886c4710…

10 years, 5 months

Check_MK Git: check_mk: Save transids only for one day

by Mathias Kettner

Module: check_mk Branch: master Commit: 9db384d40f4d42190df1da9909923cd2697fe001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9db384d40f4d42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 11:49:17 2014 +0200 Save transids only for one day This avoid long page loading times when too many trans ids are being created --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 45df4af..2cac2e1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -974,7 +974,7 @@ class html: now = time.time() for valid_id in valid_ids: timestamp, rand = valid_id.split("/") - if now - int(timestamp) < 604800: # 7 * 24 hours + if now - int(timestamp) < 86400: # one day cleared_ids.append(valid_id) self.save_transids(cleared_ids + self.new_transids, unlock = True)

10 years, 5 months

Check_MK Git: check_mk: FIX Fix CSV-Export in availability table

by Mathias Kettner

Module: check_mk Branch: master Commit: e8e84ec3be63b81b06fe6559b3cae396fc24b61a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8e84ec3be63b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 10:05:09 2014 +0200 FIX Fix CSV-Export in availability table --- .werks/962 | 8 ++++++++ ChangeLog | 1 + web/htdocs/table.py | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/962 b/.werks/962 new file mode 100644 index 0000000..1650e9c --- /dev/null +++ b/.werks/962 @@ -0,0 +1,8 @@ +Title: Fix CSV-Export in availability table +Level: 1 +Component: reporting +Version: 1.2.5i3 +Date: 1399017888 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f9761dc..68b5c7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... + * 0962 FIX: Fix CSV-Export in availability table Event Console: * 0885 New option for writing all messages into a syslog-like logfile... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 7a4cef0..482a42d 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -177,7 +177,7 @@ def end(): for row, css, state in rows: if state == "header": continue - for cell_content, css_classes, colspan in row: + for cell_content, css_classes in row: if search_term in cell_content.lower(): filtered_rows.append((row, css, state)) break # skip other cells when matched @@ -254,7 +254,7 @@ def end(): for nr, (row, css, state) in enumerate(rows): if do_csv: - html.write(csv_separator.join([ html.strip_tags(cell_content) for cell_content, css_classes in row ])) + html.write(csv_separator.join([ html.strip_tags(cell_content) for cell_content, css_classes, colspan in row ])) html.write("\n") else: # HTML output

10 years, 5 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 202eb8a40cbd006a54802a842312406f6331a13f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=202eb8a40cbd00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 2 10:04:35 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 754d8e0..66ae025 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -962 +972

10 years, 5 months

Check_MK Git: check_mk: FIX Multisite Views: Fixed bug where custom views could not get deleted

by Andreas Boesl

Module: check_mk Branch: master Commit: 42cff4abf8bfb4eacd95c34839ec1237469170d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42cff4abf8bfb4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 30 15:05:58 2014 +0200 FIX Multisite Views: Fixed bug where custom views could not get deleted --- .werks/912 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/912 b/.werks/912 new file mode 100644 index 0000000..f1aa852 --- /dev/null +++ b/.werks/912 @@ -0,0 +1,9 @@ +Title: Multisite Views: Fixed bug where custom views could not get deleted +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398863104 + + diff --git a/ChangeLog b/ChangeLog index 0117e9b..f9761dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 0906 FIX: Improved transaction handling in Web GUI... * 0909 FIX: Table checkboxes: Fixed bug where selected checkboxes got ignored... * 0811 FIX: Fixed handling of exceptions occuring before login in debug mode + * 0912 FIX: Multisite Views: Fixed bug where custom views could not get deleted WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e2389a1..a7abb19 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -418,6 +418,7 @@ def page_edit_views(msg=None): save_views(config.user_id) html.reload_sidebar() elif c == False: + html.footer() return if html.var('mode') == 'create':

10 years, 5 months

Check_MK Git: check_mk: esx_vsphere_hostsystem.multipath: now able to configure paths minimum count

by Andreas Boesl

Module: check_mk Branch: master Commit: c9c6ea730ec8330e10da3fdbb837cb7d7bbdbdcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c6ea730ec833… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 30 13:47:08 2014 +0200 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count You can now configure the minimum levels for the active, dead, disabled, standby and unknown paths via WATO. --- .werks/911 | 9 ++++++++ ChangeLog | 1 + checkman/esx_vsphere_hostsystem.multipath | 5 ++--- checks/esx_vsphere_hostsystem | 26 ++++++++++++++++----- web/plugins/wato/check_parameters.py | 35 ++++++++++++++++------------- 5 files changed, 52 insertions(+), 24 deletions(-) diff --git a/.werks/911 b/.werks/911 new file mode 100644 index 0000000..6adcbe4 --- /dev/null +++ b/.werks/911 @@ -0,0 +1,9 @@ +Title: esx_vsphere_hostsystem.multipath: now able to configure paths minimum count +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398858257 +Class: feature + +You can now configure the minimum levels for the active, dead, disabled, standby and +unknown paths via WATO. diff --git a/ChangeLog b/ChangeLog index e0393e1..7c4d359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches + * 0911 esx_vsphere_hostsystem.multipath: now able to configure paths minimum count... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/esx_vsphere_hostsystem.multipath b/checkman/esx_vsphere_hostsystem.multipath index b3aa1e2..08b5c74 100644 --- a/checkman/esx_vsphere_hostsystem.multipath +++ b/checkman/esx_vsphere_hostsystem.multipath @@ -22,6 +22,5 @@ item: The unique id of the path [parameters] -parameters (dict): Each key represents a path state. It's values - are the warn / crit levels and of type (int,int). Available key types - are {active}, {dead}, {disabled}, {standby}, {unknown} +parameters (dict): Each key represents a path state. The value is a int tuple + with (crit_min, warn_min, warn_max, crit_max). Available key types are {active}, {dead}, {disabled}, {standby}, {unknown} diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 343d213..09c6160 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -260,14 +260,28 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): state = 0 for state_name, state_values in state_infos.items(): if params.get(state_name): - warn, crit = params.get(state_name) + limits = params.get(state_name) + if len(limits) == 2: + warn_max, crit_max = limits + crit_min, warn_min = 0, 0 + else: + crit_min, warn_min, warn_max, crit_max = limits + + extra_info = "" count = state_values[1] - if count > crit: - state = 2 - state_values[2] = "(!!)" - elif count > warn: + if count < crit_min: + state = max(state, 2) + state_values[2] = "(!!)(less than %d)" % crit_min + elif count > crit_max: + state = max(state, 2) + state_values[2] = "(!!)(more than %d)" % crit_max + elif count < warn_min: state = max(state, 1) - state_values[2] = "(!)" + state_values[2] = "(!)(less than %d)" % warn_min + elif count > warn_max: + state = max(state, 1) + state_values[2] = "(!)(more than %d)" % warn_max + # Output message message = "Type %s" % path_type for element in "active", "dead", "disabled", "standby", "unknown": diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7be3629..7f31150 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3454,21 +3454,26 @@ register_check_parameters( Dictionary( title = _("Custom settings"), elements = [ (element, - Tuple( - title = description, - elements = [ - Integer(title = _("Warning if more than")), - Integer(title = _("Critical if more than")), - ] - ) - ) for (element, description) in [ - ("active", _("Active paths")), - ("dead", _("Dead paths")), - ("disabled", _("Disabled paths")), - ("standby", _("Standby paths")), - ("unknown", _("Unknown paths")) - ] - ] + Transform( + Tuple( + title = description, + elements = [ + Integer(title = _("Critical if less than")), + Integer(title = _("Warning if less than")), + Integer(title = _("Warning if more than")), + Integer(title = _("Critical if more than")), + ] + ), + forth = lambda x: len(x) == 2 and (0, 0, x[0], x[1]) or x + ) + ) for (element, description) in [ + ("active", _("Active paths")), + ("dead", _("Dead paths")), + ("disabled", _("Disabled paths")), + ("standby", _("Standby paths")), + ("unknown", _("Unknown paths")) + ] + ] ), ] ),

10 years, 5 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 0677aa2b4e8992d21683c1ee9626b46e19213e38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0677aa2b4e8992… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 12:39:27 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index be1c55a..754d8e0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -952 +962

10 years, 5 months

Check_MK Git: check_mk: ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices.

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 21406af93f1c1eb186ac97c9a101d4aa9a7f08b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21406af93f1c1e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 12:40:20 2014 +0200 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. --- .werks/952 | 8 ++++ ChangeLog | 1 + agents/special/agent_ibmsvc | 7 ++- checkman/ibm_svc_array | 26 +++++++++++ checks/ibm_svc_array | 71 +++++++++++++++++++++++++++++++ web/plugins/wato/datasource_programs.py | 5 ++- 6 files changed, 114 insertions(+), 4 deletions(-) diff --git a/.werks/952 b/.werks/952 new file mode 100644 index 0000000..2b51cf5 --- /dev/null +++ b/.werks/952 @@ -0,0 +1,8 @@ +Title: ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398854374 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3cc3a5b..5cf1b1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches * 0901 ibm_svc_portfc: more devices recognized... + * 0952 ibm_svc_array: New check for Status of RAID Arrays in IBM SVC / Storwize devices. * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc index 8be2635..ba51bba 100755 --- a/agents/special/agent_ibmsvc +++ b/agents/special/agent_ibmsvc @@ -62,8 +62,9 @@ OPTIONS: which may contain the keywords "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", "lseventlog", "lsportfc" - "lsenclosure", "lsenclosurestats" or "all" to define - which information should be queried from the device. + "lsenclosure", "lsenclosurestats", "lsarray" or "all" + to define which information should be queried from + the device. You can define to use only view of them to optimize performance. The default is "all". @@ -117,6 +118,8 @@ command_options = { "command" : "lsenclosure -nohdr -delim :"}, "lsenclosurestats" : {"section_header" : "ibm_svc_enclosurestats", "active" : False, "command" : "lsenclosurestats -nohdr -delim :"}, + "lsarray" : {"section_header" : "ibm_svc_array", "active" : False, + "command" : "lsarray -nohdr -delim :"}, } for o,a in opts: diff --git a/checkman/ibm_svc_array b/checkman/ibm_svc_array new file mode 100644 index 0000000..0324051 --- /dev/null +++ b/checkman/ibm_svc_array @@ -0,0 +1,26 @@ +title: IBM SVC / Storwize V3700 / V7000: Status of RAID Arrays +agents: ibm_svc +catalog: hw/storagehw/ibm +license: GPL +distribution: check_mk +description: + Checks the status of RAID Arrays in an IBM SVC / Storwize V3700 / V7000 + device. + + Status {online} is {OK}, status {offline} and {degraded} are {CRIT} and + every other status is {WARN}. + + Other informations given in the check output is just informational and + does not trigger any state change. + + Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring + data from the device. Your monitoring user must be able to SSH to the device + with SSH Key Authentification. Please exchange SSH key. The Special Agent itself + can be configured by WATO. + +item: + The ID of the RAID Array as delivered by lsarray command. + +inventory: + Creates one check for every RAID Array on the IBM SVC / Storwize V3700 / V7000 + device. diff --git a/checks/ibm_svc_array b/checks/ibm_svc_array new file mode 100644 index 0000000..19c114b --- /dev/null +++ b/checks/ibm_svc_array @@ -0,0 +1,71 @@ +#!/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_array:sep(58)>>> +# 27:SSD_mdisk27:online:1:POOL_0_V7000_RZ:372.1GB:online:raid1:1:256:generic_ssd +# 28:SSD_mdisk28:online:2:POOL_1_V7000_BRZ:372.1GB:online:raid1:1:256:generic_ssd +# 29:SSD_mdisk0:online:1:POOL_0_V7000_RZ:372.1GB:online:raid1:1:256:generic_ssd +# 30:SSD_mdisk1:online:2:POOL_1_V7000_BRZ:372.1GB:online:raid1:1:256:generic_ssd + + +def inventory_ibm_svc_array(info): + inventory = [] + for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ + raid_status, raid_level, redundancy, strip_size, tier in info: + inventory.append( (mdisk_id, None) ) + return inventory + +def check_ibm_svc_array(item, _no_params, info): + status = 3 + for mdisk_id, mdisk_name, mdisk_status, mdisk_grp_id, mdisk_grp_name, capacity, \ + raid_status, raid_level, redundancy, strip_size, tier in info: + if mdisk_id == item: + + # Check raid_status + message = "RAID Array %s reports status %s" % (item, raid_status) + if raid_status == "online": + status = 0 + elif raid_status == "offline" or raid_status == "degraded": + status = 2 + message += "(!!)" + else: + status = 1 + message += "(!)" + + # add information + message += ", RAID Level: %s, Tier: %s" % (raid_level, tier) + + return status, message + return 3, "RAID Array %s not found in agent output" % item + +check_info["ibm_svc_array"] = { + "check_function" : check_ibm_svc_array, + "inventory_function" : inventory_ibm_svc_array, + "service_description" : "IBM SVC RAID Array %s", + "has_perfdata" : False, +} + diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index a69cec5..7cb00e5 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -40,7 +40,7 @@ register_rule(group, "via SSH. The command line may contain the placeholders <tt><IP></tt> and " "<tt><HOST></tt>."), label = _("Command line to execute"), - empty_text = _("Access Check_MK Agent via TCP"), + empty_text = _("Access Check_MK Agent via TCP"), size = 80, attrencode = True)) @@ -277,10 +277,11 @@ register_rule(group, ( "lsportfc", _("FC Ports") ), ( "lsenclosure", _("Enclosures") ), ( "lsenclosurestats", _("Enclosure Stats") ), + ( "lsarray", _("RAID Arrays") ), ], default_value = [ "lshost", "lslicense", "lsmdisk", "lsmdiskgrp", "lsnode", "lsnodestats", "lssystem", "lssystemstats", "lsportfc", - "lsenclosure", "lsenclosurestats" ], + "lsenclosure", "lsenclosurestats", "lsarray" ], allow_empty = False, ), title = _("Retrieve information about..."),

10 years, 5 months

Check_MK Git: check_mk: ibm_svc_portfc: more devices recognized

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 4ae7aeca29a48389811b4c7cfcefccde5ea9784f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ae7aeca29a483… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Apr 30 11:36:50 2014 +0200 ibm_svc_portfc: more devices recognized some devices provide more information if running the lsportfc command (especially: privide an additional field "cluster_use") The check now works with these devices too. --- .werks/901 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_svc_portfc | 39 ++++++++++++++++++++++++++++----------- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/.werks/901 b/.werks/901 new file mode 100644 index 0000000..8e9807f --- /dev/null +++ b/.werks/901 @@ -0,0 +1,10 @@ +Title: ibm_svc_portfc: more devices recognized +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398850437 +Class: feature + +some devices provide more information if running the lsportfc command +(especially: privide an additional field "cluster_use") +The check now works with these devices too. diff --git a/ChangeLog b/ChangeLog index c93bcb8..1545b37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 0898 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices * 0156 akcp_daisy_temp: New Check for akcp daisyTemp sensor chains... * 0899 enterasys_temp: New Check for temperature sensor in Enterasys Switches + * 0901 ibm_svc_portfc: more devices recognized... * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/ibm_svc_portfc b/checks/ibm_svc_portfc index 6b96782..50a4792 100644 --- a/checks/ibm_svc_portfc +++ b/checks/ibm_svc_portfc @@ -24,6 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Output may have 11 fields: +# id:fc_io_port_id:port_id:type:port_speed:node_id:node_name:WWPN:nportid:status:attachment # Example output from agent: # <<<ibm_svc_portfc:sep(58)>>> # 0:1:1:fc:8Gb:1:node1:5005076803042126:030400:active:switch @@ -34,23 +36,38 @@ # 9:2:2:fc:8Gb:2:node2:5005076803082127:040500:active:switch # 10:3:3:fc:N/A:2:node2:50050768030C2127:000000:inactive_unconfigured:none # 11:4:4:fc:N/A:2:node2:5005076803102127:000000:inactive_unconfigured:none +# +# Output may have 12 fields: +# id:fc_io_port_id:port_id:type:port_speed:node_id:node_name:WWPN:nportid:status:attachment:cluster_use +# Example output from agent: +# <<<ibm_svc_portfc:sep(58)>>> +# 0:1:1:fc:8Gb:1:node1:5005076803042126:030400:active:switch:local_partner +# 1:2:2:fc:8Gb:1:node1:5005076803082126:040400:active:switch:local_partner +# 2:3:3:fc:N/A:1:node1:50050768030C2126:000000:inactive_unconfigured:none:local_partner +# 3:4:4:fc:N/A:1:node1:5005076803102126:000000:inactive_unconfigured:none:local_partner +# 8:1:1:fc:8Gb:2:node2:5005076803042127:030500:active:switch:local_partner +# 9:2:2:fc:8Gb:2:node2:5005076803082127:040500:active:switch:local_partner +# 10:3:3:fc:N/A:2:node2:50050768030C2127:000000:inactive_unconfigured:none:local_partner +# 11:4:4:fc:N/A:2:node2:5005076803102127:000000:inactive_unconfigured:none:local_partner + def inventory_ibm_svc_portfc(info): inventory = [] - for fc_port_id, fc_io_port_id, port_id, fc_port_type, port_speed, \ - node_id, node_name, WWPN, nportid, fc_port_status, attachment in info: - if fc_port_status == "active": - inventory.append( (fc_port_id, None) ) + for line in info: + if len(line) in (11, 12) and line[9] == "active": + inventory.append( (line[0], None) ) return inventory def check_ibm_svc_portfc(item, _no_params, info): - for fc_port_id, fc_io_port_id, port_id, fc_port_type, port_speed, \ - node_id, node_name, WWPN, nportid, fc_port_status, attachment in info: - if fc_port_id == item: - if fc_port_status == "active": - return 0, "FC Port %s is %s" % (fc_port_id, fc_port_status) - else: - return 2, "FC Port %s is %s" % (fc_port_id, fc_port_status) + for line in info: + if len(line) in (11, 12): + fc_port_id = line[0] + fc_port_status = line[9] + if fc_port_id == item: + if fc_port_status == "active": + return 0, "FC Port %s is %s" % (fc_port_id, fc_port_status) + else: + return 2, "FC Port %s is %s" % (fc_port_id, fc_port_status) return 3, "FC Port %s not found in agent output" % item

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits