Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2332 New icon for hosts/ services that are out of their service period

by Mathias Kettner

Module: check_mk Branch: master Commit: 813034c973c78a2989f2df6a3934488b03e3ba79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=813034c973c78a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 17 10:26:27 2015 +0200 #2332 New icon for hosts/services that are out of their service period The service period defines the times of the day that a service is expected to by up. This is mainly being used for availability computations but can also be used for filtering out unimportant things during non-work-hours. --- .werks/2332 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/images/icon_outof_serviceperiod.png | Bin 0 -> 4480 bytes web/plugins/icons/builtin.py | 21 +++++++++++++++++++-- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.werks/2332 b/.werks/2332 new file mode 100644 index 0000000..04550f1 --- /dev/null +++ b/.werks/2332 @@ -0,0 +1,11 @@ +Title: New icon for hosts/services that are out of their service period +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i2 +Date: 1434529503 +Class: feature + +The service period defines the times of the day that a service is expected +to by up. This is mainly being used for availability computations but can +also be used for filtering out unimportant things during non-work-hours. diff --git a/ChangeLog b/ChangeLog index 1ac8253..517a535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ Multisite: * 2260 Improved load time of Check_MK GUI... + * 2332 New icon for hosts/services that are out of their service period... * 2324 FIX: Add icon for those checks that cannot be rescheduled... * 2261 FIX: Fixed wrong pnp template cache path in non OMD environments... * 2262 FIX: Fixed deletion of foreign views/dashboards... diff --git a/web/htdocs/images/icon_outof_serviceperiod.png b/web/htdocs/images/icon_outof_serviceperiod.png new file mode 100644 index 0000000..ff10824 Binary files /dev/null and b/web/htdocs/images/icon_outof_serviceperiod.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 9ed722f..824ec70 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -654,8 +654,6 @@ multisite_icons_and_actions['status_passive_checks'] = { # | | |\ | (_) | |_| | _|_____| __/ __/ | | | (_) | (_| \__ \ | # | |_| \_|\___/ \__|_|_|(_) |_| \___|_| |_|\___/ \__,_|___/ | # | | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------' def paint_notification_periods(what, row, tags, host_custom_vars): @@ -669,6 +667,25 @@ multisite_icons_and_actions['status_notification_period'] = { } #. +# .--Service Period------------------------------------------------------. +# | ____ _ ____ | +# | / ___| ___ _ ____ _(_) ___ ___ | _ \ ___ _ __ | +# | \___ \ / _ \ '__\ \ / / |/ __/ _ \ | |_) / _ \ '__| | +# | ___) | __/ | \ V /| | (_| __/ | __/ __/ | _ | +# | |____/ \___|_| \_/ |_|\___\___| |_| \___|_|(_) | +# | | +# '----------------------------------------------------------------------' +def paint_service_periods(what, row, tags, host_custom_vars): + if not row[what + "_in_service_period"]: + return 'outof_serviceperiod', _('Out of service period') + +multisite_icons_and_actions['status_service_period'] = { + 'columns': [ 'in_service_period' ], + 'paint': paint_service_periods, + 'toplevel': True, +} + +#. # .--Aggregations--------------------------------------------------------. # | _ _ _ | # | / \ __ _ __ _ _ __ ___ __ _ __ _| |_(_) ___ _ __ ___ |

9 years

Check_MK Git: check_mk: #2126 cisco_ace_rserver: new check to monitor real servers of Cisco ACE servers

by Goetz Golla

Module: check_mk Branch: master Commit: 985bd3da167a8b4625f06c26e7c604eb080fca6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=985bd3da167a8b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jun 17 08:16:25 2015 +0200 #2126 cisco_ace_rserver: new check to monitor real servers of Cisco ACE servers --- .werks/2126 | 9 ++++ ChangeLog | 1 + checkman/cisco_ace_rserver | 28 ++++++++++++ checks/cisco_ace_rserver | 93 +++++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 9 +++- 5 files changed, 139 insertions(+), 1 deletion(-) diff --git a/.werks/2126 b/.werks/2126 new file mode 100644 index 0000000..5c347b2 --- /dev/null +++ b/.werks/2126 @@ -0,0 +1,9 @@ +Title: cisco_ace_rserver: new check to monitor real servers of Cisco ACE servers +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1434521754 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index aa0e9a2..1ac8253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 2124 datapower_pdrive, datapower_ldrive: new checks to monitor disk states of IBM Datapower Gateways * 2125 datapower_raid_bat: new check to monitor the battery of RAID controllers of IBM Datapower Gateways * 2330 ovs_bonding: Linux agent now supports OVS version 6.2... + * 2126 cisco_ace_rserver: new check to monitor real servers of Cisco ACE servers * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... diff --git a/checkman/cisco_ace_rserver b/checkman/cisco_ace_rserver new file mode 100644 index 0000000..83fcdab --- /dev/null +++ b/checkman/cisco_ace_rserver @@ -0,0 +1,28 @@ +title: Cisco ACE Server: Status of Real Server +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + + This check monitors the status of the so-called real servers of Cisco + switches with the Application Control Engine (ACE) module. It uses snmp + to extract information from the CISCO-ENHANCED-SLB MIB. + + The check monitors the operational and the administrative state of each + rserver, as well as the current number of connections. The criticality of + the check is determined from the operational state: if the operational + state is {in service}, the check is {OK}. If the operational state is + {probe testing} or {standby}, the check is {WARN}. Otherwise, it is {CRIT}. + If the administrative state is {out of service}, the worst total criticality + is {WARN}. + +item: + The name of the real server, or, if this is not configured on the device, + the IP-address of the real server. + +inventory: + One service for each real server is created + +perfdata: + The current number of connections going through a real server. diff --git a/checks/cisco_ace_rserver b/checks/cisco_ace_rserver new file mode 100644 index 0000000..1e9c30e --- /dev/null +++ b/checks/cisco_ace_rserver @@ -0,0 +1,93 @@ +#!/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. + + +def inventory_cisco_ace_rserver(info): + for name, ip, descr, admin_status, oper_status, conns in info: + if name != '': + item = name + elif descr != '': + item = descr + else: + item = socket.inet_ntoa(ip) + yield item, None + +def check_cisco_ace_rserver(item, _no_params, info): + admin_stati = { + "1": "in service", + "2": "out of service", + "3": "in service, standby", + } + oper_stati = { + "1": (2, "out of service"), + "2": (0, "in service"), + "3": (2, "failed"), + "4": (2, "ready to test"), + "5": (2, "testing"), + "6": (2, "max connection reached, throttling"), + "7": (2, "max clients reached, throttling"), + "8": (2, "dfp throttle"), + "9": (2, "probe failed"), + "10": (1, "probe testing"), + "11": (2, "oper wait"), + "12": (2, "test wait"), + "13": (2, "inband probe failed"), + "14": (2, "return code failed"), + "15": (2, "arp failed"), + "16": (1, "standby"), + "17": (2, "inactive"), + "18": (2, "max load reached"), + } + + for name, ip, descr, admin_status, oper_status, conns in info: + ip_addr = socket.inet_ntoa(ip) + if name == item or ip_addr == item or descr == item: + admin_state = admin_stati[admin_status] + state, state_txt = oper_stati[oper_status] + if admin_status == "2" and state == 2: + state == 1 # max state is WARN if real server out of service + infotext = "Operational State: %s, Administrative State: %s, Current Connections: %s" % \ + (state_txt, admin_state, conns) + perfdata = [ ("connections", int(conns)) ] + + return state, infotext, perfdata + + +check_info['cisco_ace_rserver'] = { + "inventory_function" : inventory_cisco_ace_rserver, + "check_function" : check_cisco_ace_rserver, + "service_description" : "ACE RServer %s", + "snmp_info" : ( ".1.3.6.1.4.1.9.9.470.1.1.1.1", [ # cesRserverEntry + "1", # cesRserverName + "4", # cesRserverIpAddress + "5", # cesRserverDescription + "12", # cesRserverAdminStatus + "13", # cesRserverOperStatus + "19", # cesRserverCurrConns + ] ), + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.9.1.824", +} diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 93c5805..48735ec 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1328,6 +1328,7 @@ check_metrics["check_mk-carel_sensors"] = {} check_metrics["check_mk-casa_cpu_temp"] = {} check_metrics["check_mk-cisco_temp_perf"] = {} check_metrics["check_mk-cisco_temp_sensor"] = {} +check_metrics["check_mk-cisco_ace_rserver"] = {} check_metrics["check_mk-climaveneta_temp"] = {} check_metrics["check_mk-cmciii.temp"] = {} check_metrics["check_mk-cmctc.temp"] = {} @@ -1559,7 +1560,13 @@ perfometer_info.append(("stacked", [ perfometer_info.append(("linear", ( [ "running_sessions" ], "total_sessions", None))) perfometer_info.append(("linear", ( [ "shared_locks", "exclusive_locks" ], None, None))) -perfometer_info.append(("linear", ( [ "connections" ], 100, None))) +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "connections", + "half_value": 50, + "exponent" : 2 +}) + perfometer_info.append(("logarithmic", ( "connection_time", 0.2, 2))) perfometer_info.append(("dual", [

9 years

Check_MK Git: check_mk: Code refacturing - necessary for new alert handlers

by Mathias Kettner

Module: check_mk Branch: master Commit: cfe7b674ce38cca0e8e8001a716fef939371e4e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfe7b674ce38cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 16 16:19:17 2015 +0200 Code refacturing - necessary for new alert handlers --- checks/livestatus_status | 2 +- modules/check_mk.py | 17 +- modules/events.py | 498 +++++++++++++++++++++++++++ modules/notify.py | 467 +------------------------ web/htdocs/wato.py | 637 ++++++++++++++++++----------------- web/plugins/wato/builtin_modules.py | 4 +- 6 files changed, 863 insertions(+), 762 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfe7b674ce…

9 years

Check_MK Git: check_mk: Remove obsolete duplicate metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: cad3e952d1be8db2e6ec4848729ebcaf58155c29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cad3e952d1be8d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 16 14:39:33 2015 +0200 Remove obsolete duplicate metrics --- web/plugins/metrics/check_mk.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f925db1..93c5805 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -430,12 +430,6 @@ metric_info["mem_lnx_vmalloc_chunk"] = { "unit" : "bytes", } -metric_info["execution_time"] = { - "title" : _("Execution time"), - "unit" : "s", - "color" : "#22dd33", -} - metric_info["load1"] = { "title" : _("CPU load average of last minute"), "unit" : "", @@ -472,12 +466,6 @@ metric_info["process_creations"] = { "color" : "#ff8020", } -metric_info["threads"] = { - "title" : _("Number of running threads"), - "unit" : "count", - "color" : "#8040f0", -} - metric_info["fs_used"] = { "title" : _("Used filesystem space"), "unit" : "bytes", @@ -849,7 +837,7 @@ metric_info["hours_since_service"] = { } metric_info["execution_time"] = { - "title" : _("Total execution time"), + "title" : _("Execution time"), "unit" : "s", "color" : "#d080af", }

9 years

Check_MK Git: check_mk: #2330 ovs_bonding: Linux agent now supports OVS version 6.2

by Mathias Kettner

Module: check_mk Branch: master Commit: 9c0e7444e7d80a7bd4e7e6d724b1971fae7361f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0e7444e7d80a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 16 10:12:23 2015 +0200 #2330 ovs_bonding: Linux agent now supports OVS version 6.2 Thanks to Alexander Scholler. --- .werks/2330 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2330 b/.werks/2330 new file mode 100644 index 0000000..28064bd --- /dev/null +++ b/.werks/2330 @@ -0,0 +1,9 @@ +Title: ovs_bonding: Linux agent now supports OVS version 6.2 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1434442321 +Class: feature + +Thanks to Alexander Scholler. diff --git a/ChangeLog b/ChangeLog index 72f2696..aa0e9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 2123 datapower_fs: new check to monitor filesystems on IBMs Datapower Gateways * 2124 datapower_pdrive, datapower_ldrive: new checks to monitor disk states of IBM Datapower Gateways * 2125 datapower_raid_bat: new check to monitor the battery of RAID controllers of IBM Datapower Gateways + * 2330 ovs_bonding: Linux agent now supports OVS version 6.2... * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ce4972e..90940d5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -240,7 +240,7 @@ fi # Same for Open vSwitch bonding if type ovs-appctl > /dev/null ; then echo '<<<ovs_bonding:sep(58)>>>' - for bond in $(ovs-appctl bond/list | sed -e 1d | cut -f2) ; do + for bond in $(ovs-appctl bond/list | sed -e 1d | rev | cut -f3 | rev) ; do echo "[$bond]" ovs-appctl bond/show $bond done

9 years

Check_MK Git: check_mk: raritan_pdu_ocprot: Removed print statement

by Konstantin Büttner

Module: check_mk Branch: master Commit: d60200c39436e1e0d6ed30e57f265afdd50396f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d60200c39436e1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 15 18:21:32 2015 +0200 raritan_pdu_ocprot: Removed print statement --- checks/raritan_pdu_ocprot | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/raritan_pdu_ocprot b/checks/raritan_pdu_ocprot index b97aa52..38632d4 100644 --- a/checks/raritan_pdu_ocprot +++ b/checks/raritan_pdu_ocprot @@ -51,8 +51,6 @@ def parse_raritan_pdu_ocprot(info): parsed.setdefault(protector_id, {})["state"] = state elif end_oid.endswith(".1"): parsed.setdefault(protector_id, {})["current"] = float(value) / 10 - - pprint.pprint(parsed) return parsed

9 years

Check_MK Git: check_mk: oracle_asm_diskgroup: Added missing pnp template symlink

by Konstantin Büttner

Module: check_mk Branch: master Commit: ea422a0caa42cd65afda424434d9d940d69090bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea422a0caa42cd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 15 15:04:13 2015 +0200 oracle_asm_diskgroup: Added missing pnp template symlink --- pnp-templates/check_mk-oracle_asm_diskgroup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pnp-templates/check_mk-oracle_asm_diskgroup.php b/pnp-templates/check_mk-oracle_asm_diskgroup.php new file mode 120000 index 0000000..28b85a4 --- /dev/null +++ b/pnp-templates/check_mk-oracle_asm_diskgroup.php @@ -0,0 +1 @@ +check_mk-df.php \ No newline at end of file

9 years

Check_MK Git: check_mk: Removed print statement in windows_intel_bonding

by Mathias Kettner

Module: check_mk Branch: master Commit: 2dbcce6011323f66782e57ff71d65ab85d5bbc00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dbcce6011323f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 15 12:16:58 2015 +0200 Removed print statement in windows_intel_bonding --- checks/windows_intel_bonding | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/windows_intel_bonding b/checks/windows_intel_bonding index 1fd680e..53da7a5 100644 --- a/checks/windows_intel_bonding +++ b/checks/windows_intel_bonding @@ -73,7 +73,6 @@ def parse_windows_intel_bonding(info): if line[0] == "###": break adapter_function, adapter_status = line[0], line[1] - print (line) adapter_bond = line[2].split(",")[-1].split("=")[1][1:-1] adapter = line[3].split(",")[1].split("=")[1][1:-1] adapters[adapter] = { "function": adapter_function, "status": adapter_status, "bond": adapter_bond }

9 years

Check_MK Git: check_mk: Removed duplicate werk 2330

by Mathias Kettner

Module: check_mk Branch: master Commit: 0de665bd6a4bcc8404cf0d742276c413d5fb6446 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0de665bd6a4bcc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 15 12:16:13 2015 +0200 Removed duplicate werk 2330 --- .werks/2330 | 9 --------- ChangeLog | 1 - 2 files changed, 10 deletions(-) diff --git a/.werks/2330 b/.werks/2330 deleted file mode 100644 index cff7ccf..0000000 --- a/.werks/2330 +++ /dev/null @@ -1,9 +0,0 @@ -Title: windows_intel_bonding: Fix exception in case of no existing bonding device -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i2 -Date: 1434363304 -Class: fix - - diff --git a/ChangeLog b/ChangeLog index ff1215d..d01e156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,7 +27,6 @@ * 1258 FIX: fileinfo solaris: Fixed configuration crash... * 2221 FIX: cisco_temperature: Fixed order of device levels for some devices... * 2329 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device - * 2330 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device Multisite: * 2260 Improved load time of Check_MK GUI...

9 years

Check_MK Git: check_mk: #2330 FIX windows_intel_bonding: Fix exception in case of no existing bonding device

by Mathias Kettner

Module: check_mk Branch: master Commit: 96f473c6bb952cbf6f90a4549c3e1ca8f4440a4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96f473c6bb952c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 15 12:15:19 2015 +0200 #2330 FIX windows_intel_bonding: Fix exception in case of no existing bonding device --- .werks/2329 | 9 ++++++ .werks/2330 | 9 ++++++ ChangeLog | 2 ++ checks/windows_intel_bonding | 69 ++++++++++++++++++++++-------------------- 4 files changed, 56 insertions(+), 33 deletions(-) diff --git a/.werks/2329 b/.werks/2329 new file mode 100644 index 0000000..3dfb53a --- /dev/null +++ b/.werks/2329 @@ -0,0 +1,9 @@ +Title: windows_intel_bonding: Fix exception in case of no existing bonding device +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1434363248 +Class: fix + + diff --git a/.werks/2330 b/.werks/2330 new file mode 100644 index 0000000..cff7ccf --- /dev/null +++ b/.werks/2330 @@ -0,0 +1,9 @@ +Title: windows_intel_bonding: Fix exception in case of no existing bonding device +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1434363304 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 701baa1..ff1215d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ * 1257 FIX: oracle_jobs: Fix: Discovery now supports the old oracle plugin again * 1258 FIX: fileinfo solaris: Fixed configuration crash... * 2221 FIX: cisco_temperature: Fixed order of device levels for some devices... + * 2329 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device + * 2330 FIX: windows_intel_bonding: Fix exception in case of no existing bonding device Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/checks/windows_intel_bonding b/checks/windows_intel_bonding index ac9ff8a..1fd680e 100644 --- a/checks/windows_intel_bonding +++ b/checks/windows_intel_bonding @@ -25,23 +25,23 @@ # Boston, MA 02110-1301 USA. -#<<<windows_intel_bonding>>> -#Caption Name RedundancyStatus -#Bond_10.4 {714F579F-D17A-40DC-B684-083C561EE352} 2 +# <<<windows_intel_bonding>>> +# Caption Name RedundancyStatus +# Bond_10.4 {714F579F-D17A-40DC-B684-083C561EE352} 2 # -#### -#AdapterFunction AdapterStatus GroupComponent PartComponent -#1 1 IANet_TeamOfAdapters.CreationClassName="IANet_TeamOfAdapters",Name="{714F579F-D17A-40DC-B684-083C561EE352}" IANet_PhysicalEthernetAdapter.CreationClassName="IANet_PhysicalEthernetAdapter",DeviceID="{18EC3002-F03B-4B69-AD88-BFEB700460DC}",SystemCreationClassName="Win32_ComputerSystem",SystemName="Z3061021" -#2 2 IANet_TeamOfAdapters.CreationClassName="IANet_TeamOfAdapters",Name="{714F579F-D17A-40DC-B684-083C561EE352}" IANet_PhysicalEthernetAdapter.CreationClassName="IANet_PhysicalEthernetAdapter",DeviceID="{1EDEBE50-005F-4533-BAFC-E863617F1030}",SystemCreationClassName="Win32_ComputerSystem",SystemName="Z3061021" +# ### +# AdapterFunction AdapterStatus GroupComponent PartComponent +# 1 1 IANet_TeamOfAdapters.CreationClassName="IANet_TeamOfAdapters",Name="{714F579F-D17A-40DC-B684-083C561EE352}" IANet_PhysicalEthernetAdapter.CreationClassName="IANet_PhysicalEthernetAdapter",DeviceID="{18EC3002-F03B-4B69-AD88-BFEB700460DC}",SystemCreationClassName="Win32_ComputerSystem",SystemName="Z3061021" +# 2 2 IANet_TeamOfAdapters.CreationClassName="IANet_TeamOfAdapters",Name="{714F579F-D17A-40DC-B684-083C561EE352}" IANet_PhysicalEthernetAdapter.CreationClassName="IANet_PhysicalEthernetAdapter",DeviceID="{1EDEBE50-005F-4533-BAFC-E863617F1030}",SystemCreationClassName="Win32_ComputerSystem",SystemName="Z3061021" # -#### -#AdapterStatus Caption DeviceID -#51 TEAM : Bond_10.4 - Intel(R) Gigabit ET Dual Port Server Adapter {18EC3002-F03B-4B69-AD88-BFEB700460DC} -#51 TEAM : Bond_10.4 - Intel(R) Gigabit ET Dual Port Server Adapter #2 {1EDEBE50-005F-4533-BAFC-E863617F1030} -#35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #43 {55799336-A84B-4DA5-8EB9-B7426AA1AB75} -#35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #35 {7DB9B461-FAC0-4763-9AF9-9A6CA6648188} -#35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #40 {82AE1F27-BF28-4E30-AC3D-809DF5FF0D39} -#35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #38 {DC918766-F61C-4801-92F8-E5532907EA0D} +# ### +# AdapterStatus Caption DeviceID +# 51 TEAM : Bond_10.4 - Intel(R) Gigabit ET Dual Port Server Adapter {18EC3002-F03B-4B69-AD88-BFEB700460DC} +# 51 TEAM : Bond_10.4 - Intel(R) Gigabit ET Dual Port Server Adapter #2 {1EDEBE50-005F-4533-BAFC-E863617F1030} +# 35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #43 {55799336-A84B-4DA5-8EB9-B7426AA1AB75} +# 35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #35 {7DB9B461-FAC0-4763-9AF9-9A6CA6648188} +# 35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #40 {82AE1F27-BF28-4E30-AC3D-809DF5FF0D39} +# 35 Broadcom BCM5709C NetXtreme II GigE (NDIS VBD Client) #38 {DC918766-F61C-4801-92F8-E5532907EA0D} def get_real_adapter_name(bond, name): prefix = "TEAM : %s - " % bond @@ -55,28 +55,31 @@ def parse_windows_intel_bonding(info): try: # Get bond info - lines.next() # Skip header - while True: - line = lines.next() - if line[0] == "###": - break - bond_caption = " ".join(line[:-2]) - bond_name, bond_mode = line[-2], line[-1] - bonds[bond_name] = { "caption": bond_caption, "mode": bond_mode} + line = lines.next() + if line[0] != "###": + while True: + line = lines.next() + if line[0] == "###": + break + bond_caption = " ".join(line[:-2]) + bond_name, bond_mode = line[-2], line[-1] + bonds[bond_name] = { "caption": bond_caption, "mode": bond_mode} # Get adapter info - lines.next() # Skip header - while True: - line = lines.next() - if line[0] == "###": - break - adapter_function, adapter_status = line[0], line[1] - adapter_bond = line[2].split(",")[-1].split("=")[1][1:-1] - adapter = line[3].split(",")[1].split("=")[1][1:-1] - adapters[adapter] = { "function": adapter_function, "status": adapter_status, "bond": adapter_bond } + line = lines.next() + if line[0] != "###": + while True: + line = lines.next() + if line[0] == "###": + break + adapter_function, adapter_status = line[0], line[1] + print (line) + adapter_bond = line[2].split(",")[-1].split("=")[1][1:-1] + adapter = line[3].split(",")[1].split("=")[1][1:-1] + adapters[adapter] = { "function": adapter_function, "status": adapter_status, "bond": adapter_bond } # Get adapter names - lines.next() # Skip header + line = lines.next() # Skip header while True: line = lines.next() adapter_names[line[-1]] = " ".join(line[1:-1])

9 years

← Newer
1
...
9
10
11
12
13
14
15
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015