Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Add new test for winperf_if teaming discovery

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2f909b0a7d8479740e381a1a04434e741f48ab5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f909b0a7d8479… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Dec 19 13:37:33 2018 +0100 Add new test for winperf_if teaming discovery Change-Id: Ic149f17cc676dd59e030b8bd800a1d5ceb86f602 --- tests/unit/checks/test_if_winperf_if.py | 120 ++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 5 deletions(-) diff --git a/tests/unit/checks/test_if_winperf_if.py b/tests/unit/checks/test_if_winperf_if.py index ce9843d..b3aa3a8 100644 --- a/tests/unit/checks/test_if_winperf_if.py +++ b/tests/unit/checks/test_if_winperf_if.py @@ -1,10 +1,11 @@ import pytest -import ast -from testlib import cmk_path + +from checktestlib import DiscoveryResult # Mark all tests in this file as check related tests pytestmark = pytest.mark.checks + @pytest.mark.parametrize("info,settings,items", [ ([], [{}], []), ([['123', '456', '789'], ['1', 'instances:', 'A_B-C_1'], @@ -30,9 +31,16 @@ pytestmark = pytest.mark.checks [u'1090', u'3734320', u'4166703', u'0', u'0', u'bulk_count'], [u'1092', u'0', u'0', u'0', u'0', u'bulk_count'], [u'1094', u'22618', u'22618', u'22618', u'22618', u'large_rawcount'], - [u'Node', u'MACAddress', u'Name', u'NetConnectionID', u'NetConnectionStatus', u'Speed', u'GUID'], - [u'NODE1 ', u' 00:00:00:00:00:00 ', u' A_B-C_1 ', u' Ethernet1-XYZ ', u' 2 ', u' 10000000000 ', u' {FOO-123-BAR}']], - [{"use_alias": True}], ['Ethernet1-XYZ']), + [ + u'Node', u'MACAddress', u'Name', u'NetConnectionID', u'NetConnectionStatus', u'Speed', + u'GUID' + ], + [ + u'NODE1 ', u' 00:00:00:00:00:00 ', u' A_B-C_1 ', u' Ethernet1-XYZ ', u' 2 ', + u' 10000000000 ', u' {FOO-123-BAR}' + ]], [{ + "use_alias": True + }], ['Ethernet1-XYZ']), ]) def test_winperf_if_netconnection_id(check_manager, monkeypatch, info, settings, items): check = check_manager.get_check("winperf_if") @@ -41,3 +49,105 @@ def test_winperf_if_netconnection_id(check_manager, monkeypatch, info, settings, parsed = check.run_parse(info) discovered_items = [e[0] for e in check.run_discovery(parsed)] assert discovered_items == items + + +info_winperf_if_teaming = [ + [u'1542018413.59', u'510', u'2341040'], + [ + u'4', + u'instances:', + u'HPE_Ethernet_1Gb_4-port_331i_Adapter__3', + u'HPE_Ethernet_1Gb_4-port_331i_Adapter__4', + u'HPE_Ethernet_1Gb_4-port_331i_Adapter', + u'HPE_Ethernet_1Gb_4-port_331i_Adapter__2', + ], + [u'-122', u'201612106', u'187232778', u'200985680546908', u'969308895925', u'bulk_count'], + [u'-110', u'2938459', u'2713782', u'141023109713', u'7143818358', u'bulk_count'], + [u'-244', u'2920458', u'2695781', u'133889346630', u'9159143', u'bulk_count'], + [u'-58', u'18001', u'18001', u'7133763083', u'7134659215', u'bulk_count'], + [u'10', u'1000000000', u'1000000000', u'1000000000', u'1000000000', u'large_rawcount'], + [u'-246', u'189182492', u'174803164', u'200050287945665', u'730174911', u'bulk_count'], + [u'14', u'0', u'0', u'133879714188', u'131929', u'bulk_count'], + [u'16', u'2920458', u'2695781', u'8946694', u'9027210', u'bulk_count'], + [u'18', u'0', u'0', u'685748', u'4', u'large_rawcount'], + [u'20', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'22', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'-4', u'12429614', u'12429614', u'935392601243', u'968578721014', u'bulk_count'], + [u'26', u'0', u'0', u'7133594582', u'7134655376', u'bulk_count'], + [u'28', u'18001', u'18001', u'168501', u'3839', u'bulk_count'], + [u'30', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'32', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'34', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'1086', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'1088', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'1090', u'0', u'0', u'0', u'0', u'bulk_count'], + [u'1092', u'0', u'0', u'0', u'0', u'bulk_count'], + [u'1094', u'0', u'0', u'0', u'0', u'large_rawcount'], + [u'[teaming_start]'], + [ + u'TeamName', u'TeamingMode', u'LoadBalancingAlgorithm', u'MemberMACAddresses', + u'MemberNames', u'MemberDescriptions', u'Speed', u'GUID' + ], + [ + u'LAN ', u'SwitchIndependent ', u'Dynamic ', u'38:63:BB:44:D0:24;38:63:BB:44:D0:25', + u'nic1;nic2', + u'HPE Ethernet 1Gb 4-port 331i Adapter;HPE Ethernet 1Gb 4-port 331i Adapter #2', + u'1000000000;1000000000', + u'{4DA62AA0-8163-459C-9ACE-95B1E729A7DD};{FEF2305A-57FD-4AEC-A817-C082565B6AA7}' + ], + [u'[teaming_end]'], + [ + u'Node', u'MACAddress', u'Name', u'NetConnectionID', u'NetConnectionStatus', u'Speed', + u'GUID' + ], + [ + u'S5EXVM318 ', u' 38:63:BB:44:D0:26 ', u' HPE Ethernet 1Gb 4-port 331i Adapter #3 ', + u' nic3-vl302 ', u' 2 ', u' 1000000000 ', u' {5FBD3455-980D-4AD6-BDEE-79B42B7BBDBC}' + ], + [ + u'S5EXVM318 ', u' 38:63:BB:44:D0:27 ', u' HPE Ethernet 1Gb 4-port 331i Adapter #4 ', + u' nic4-vl303 ', u' 2 ', u' 1000000000 ', u' {8A1D9DD0-DF30-46CD-87FC-ACB13A5AB2BA}' + ], + [ + u'S5EXVM318 ', u' 38:63:BB:44:D0:24 ', u' HPE Ethernet 1Gb 4-port 331i Adapter ', u' nic1 ', + u' 2 ', u' ', u' {4DA62AA0-8163-459C-9ACE-95B1E729A7DD}' + ], + [ + u'S5EXVM318 ', u' 38:63:BB:44:D0:25 ', u' HPE Ethernet 1Gb 4-port 331i Adapter ', u' nic2 ', + u' 2 ', u' ', u' {FEF2305A-57FD-4AEC-A817-C082565B6AA7}' + ], + [ + u'S5EXVM318 ', u' 38:63:BB:44:D0:24 ', u' Microsoft Network Adapter Multiplexor Driver ', + u' LAN ', u' 2 ', u' 2000000000 ', u' {69DCC9F6-FD98-474C-87F8-DD1023C6117C}' + ], +] + +discovery_winperf_if_teaming = [ + ('HPE Ethernet 1Gb 4-port 331i Adapter 3', "{'state': ['1'], 'speed': 1000000000}"), + ('HPE Ethernet 1Gb 4-port 331i Adapter 4', "{'state': ['1'], 'speed': 1000000000}"), + (u'LAN', + "{'aggregate': {'item_type': 'description', 'group_patterns': {'non-existent-testhost': {'items': [], 'iftype': '6'}}}, 'state': ['1'], 'speed': 2000000000}" + ), +] + + +(a)pytest.mark.parametrize( + "settings,info,expected_discovery", + [ + ( + [{ + 'use_desc': True + }], + info_winperf_if_teaming, + discovery_winperf_if_teaming, + ), + ], +) +def test_winperf_if_inventory_teaming(check_manager, monkeypatch, settings, info, + expected_discovery): + check = check_manager.get_check("winperf_if") + monkeypatch.setitem(check.context, "host_extra_conf", lambda _, __: settings) + monkeypatch.setitem(check.context, "_prepare_if_group_patterns_from_conf", lambda: {}) + parsed = check.run_parse(info) + actual_discovery = check.run_discovery(parsed) + assert DiscoveryResult(expected_discovery) == DiscoveryResult(actual_discovery)

5 years, 9 months

Tell unit test about new WATO rule

by Konstantin Büttner

Module: check_mk Branch: master Commit: dd655eb4f44414d4c2d773dcbe703fa6d958df32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd655eb4f44414… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 19 15:36:28 2018 +0100 Tell unit test about new WATO rule Change-Id: I7c95a541351772d082258e1b3d070a8903c03af4 --- tests/unit/cmk/gui/test_watolib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/cmk/gui/test_watolib.py b/tests/unit/cmk/gui/test_watolib.py index 0ed0550..bec1ece 100644 --- a/tests/unit/cmk/gui/test_watolib.py +++ b/tests/unit/cmk/gui/test_watolib.py @@ -1384,6 +1384,7 @@ def test_grouped_rulespecs(): 'agent_config:msexch_database', 'agent_config:mk_site_object_counts', 'agent_config:mk_docker_container_piggybacked', + 'agent_config:mk_docker_node', 'agent_config:veeam_backup_status', 'agent_config:mk_nfsiostat', ],

5 years, 9 months

6984 FIX docker_node_disk_usage, docker_node_info, docker_node_images, docker_node_network: Extract sections to plugin

by Konstantin Büttner

Module: check_mk Branch: master Commit: c3b5e4851327eb25f6c5c2d05350e7070ad96d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3b5e4851327eb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 19 15:07:32 2018 +0100 6984 FIX docker_node_disk_usage, docker_node_info, docker_node_images, docker_node_network: Extract sections to plugin Due to poor performance of commands such as <tt>docker system df</tt> in some environments, the check_mk_agent would be slowed down to the point of unusability. To address this, these sections have been extracted into the <tt>mk_docker_node</tt> agent plugin, allowing them to be run asynchronously. If you update the agent and you need these sections, you will have to deploy the plugin to continue monitoring docker node information. CMK-1413 Change-Id: I0687e757951f3505e91a167c4d3e4a383a012dca --- .werks/6984 | 16 ++++++++++++++ agents/check_mk_agent.linux | 26 ----------------------- agents/plugins/mk_docker_node | 49 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 26 deletions(-) diff --git a/.werks/6984 b/.werks/6984 new file mode 100644 index 0000000..7b93260 --- /dev/null +++ b/.werks/6984 @@ -0,0 +1,16 @@ +Title: docker_node_disk_usage, docker_node_info, docker_node_images, docker_node_network: Extract sections to plugin +Level: 2 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545227106 + +Due to poor performance of commands such as <tt>docker system df</tt> in some environments, the +check_mk_agent would be slowed down to the point of unusability. To address this, these sections +have been extracted into the <tt>mk_docker_node</tt> agent plugin, allowing them to be run asynchronously. + +If you update the agent and you need these sections, you will have to deploy the plugin to continue +monitoring docker node information. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cc94e66..13e9f56 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1032,32 +1032,6 @@ if type pvecm > /dev/null 2>&1 ; then pvecm nodes fi -# Iterate all running containers and report piggyback data for them -if type docker > /dev/null 2>&1; then - echo "<<<docker_node_info:sep(58)>>>" - # sed: protect leading whitespace - docker info | sed 's/^/|/' - - echo "<<<docker_node_disk_usage:sep(0)>>>" - docker system df - - echo "<<<docker_node_images>>>" - echo "[[[images]]]" - docker images --format "{{json .}}" - - echo "[[[image_inspect]]]" - IMAGE_IDS=$(docker images | awk 'NR>1 {print $3}') - docker image inspect $IMAGE_IDS - - echo "[[[containers]]]" - # equivalent of 'docker ps' for newer docker versions: 'docker container ls' - docker ps --all --format "{{json .}}" - - echo "<<<docker_node_network:sep(0)>>>" - NETWORK_IDS=$(docker network ls -f 'driver=bridge' | awk 'NR>1 {print $1}') - docker network inspect $NETWORK_IDS -fi - # Start new liveupdate process in background on each agent execution. Starting # a new live update process will terminate the old one automatically after # max. 1 sec. diff --git a/agents/plugins/mk_docker_node b/agents/plugins/mk_docker_node new file mode 100755 index 0000000..7bc1080 --- /dev/null +++ b/agents/plugins/mk_docker_node @@ -0,0 +1,49 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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- +# tails. 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. + +if type docker > /dev/null 2>&1; then + echo "<<<docker_node_info:sep(58)>>>" + # sed: protect leading whitespace + docker info | sed 's/^/|/' + + echo "<<<docker_node_disk_usage:sep(0)>>>" + docker system df + + echo "<<<docker_node_images>>>" + echo "[[[images]]]" + docker images --format "{{json .}}" + + echo "[[[image_inspect]]]" + IMAGE_IDS=$(docker images | awk 'NR>1 {print $3}') + docker image inspect $IMAGE_IDS + + echo "[[[containers]]]" + # equivalent of 'docker ps' for newer docker versions: 'docker container ls' + docker ps --all --format "{{json .}}" + + echo "<<<docker_node_network:sep(0)>>>" + NETWORK_IDS=$(docker network ls -f 'driver=bridge' | awk 'NR>1 {print $1}') + docker network inspect $NETWORK_IDS +fi

5 years, 9 months

Make test_locking a bit more stable.

by Sven Panne

Module: check_mk Branch: master Commit: 56506d8d046b3b9f64b18ca4ca887ad2f7de3561 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56506d8d046b3b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 19 12:54:09 2018 +0100 Make test_locking a bit more stable. Basically the test is fundamentally broken, we just make it a bit more likely that it succeeds. Change-Id: I8667dd3571af000dd7183078ec32d3507a7b18fc --- tests/unit/cmk/utils/test_store.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/cmk/utils/test_store.py b/tests/unit/cmk/utils/test_store.py index d63dff4..90393ea 100644 --- a/tests/unit/cmk/utils/test_store.py +++ b/tests/unit/cmk/utils/test_store.py @@ -271,4 +271,5 @@ def test_locking(tmpdir): break time.sleep(0.01) assert store1.have_lock(path) == False + time.sleep(0.2) assert store2.have_lock(path) == True

5 years, 9 months

Add esx_vsphere_hostsystem test vor ESX version 5.1

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b91d5a54d4434fbfb1537f1bc68a32f759874132 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b91d5a54d4434f… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Dec 17 17:43:16 2018 +0100 Add esx_vsphere_hostsystem test vor ESX version 5.1 Change-Id: I19ea70d443560c89af5508208dc43fcdbc088865 --- .../esx_vsphere_hostsystem_esx51_regression.py | 298 +++++++++++++++++++++ 1 file changed, 298 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b91d5a54d4…

5 years, 9 months

minor fix of alcatel_temp MIB obj documentation

by Florian Kromer

Module: check_mk Branch: master Commit: 53c2bc285a55359651aa8ff19d6e7aa811e54e36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c2bc285a5535… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Dec 18 10:12:06 2018 +0100 minor fix of alcatel_temp MIB obj documentation Change-Id: Ia00028b81bf65a2ddaae6f3a6d876cd587052b7a --- checks/alcatel_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/alcatel_temp b/checks/alcatel_temp index ed12630..e21637f 100644 --- a/checks/alcatel_temp +++ b/checks/alcatel_temp @@ -33,7 +33,7 @@ check_info["alcatel_temp"] = { "has_perfdata": True, "snmp_scan_function": alcatel_networking_products_scan_function, "snmp_info": ( - ".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.3.1", # MIB object "alaChasEntPhysFanTable" + ".1.3.6.1.4.1.6486.800.1.1.1.3.1.1.3.1", # MIB object "chasChassisEntry" [ 4, # MIB object "chasHardwareBoardTemp" 5, # MIB object "chasHardwareCpuTemp"

5 years, 9 months

Format esx_hostsystem.multipath regression test

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e56f2bace6c5ddf48f6cb2e86db250097260d4d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e56f2bace6c5dd… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Dec 17 16:43:58 2018 +0100 Format esx_hostsystem.multipath regression test Change-Id: I3bc4ff21431317f8e21791aa093f57e251b5943c --- .../datasets/esx_vsphere_hostsystem_regression.py | 239 +++++++++++---------- 1 file changed, 122 insertions(+), 117 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py index c21f70d..e98c804 100644 --- a/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_hostsystem_regression.py @@ -1,121 +1,126 @@ - - checkname = 'esx_vsphere_hostsystem' +info = [ + [ + [ + u'config.multipathState.path', u'vmhba0:C2:T0:L0', u'active', u'vmhba1:C0:T0:L0', + u'active', u'vmhba66:C0:T0:L0', u'active', u'vmhba66:C0:T1:L0', u'active', + u'vmhba66:C0:T2:L0', u'active' + ], + [ + u'config.storageDevice.multipathInfo', u'6e843b6d8f2740bdecbad4676da7a9dd', + u'vmhba66:C0:T2:L0', u'active', u'6e843b6bc5cc897d430ad40b7d9172d1', + u'vmhba66:C0:T0:L0', u'active', u'6e843b63fcbd92ad8f22d4cf7d8e6cdc', + u'vmhba66:C0:T1:L0', u'active', u'766d6862', u'vmhba1:C0:T0:L0', u'active', + u'600605b002db9f7018d0a40c2a1444b0', u'vmhba0:C2:T0:L0', u'active' + ], + [u'hardware.biosInfo.biosVersion', u'-[D6E158AUS-1.16]-'], + [u'hardware.biosInfo.releaseDate', u'2012-11-26T00:00:00Z'], + [u'hardware.cpuInfo.hz', u'2933437094'], + [u'hardware.cpuInfo.numCpuCores', u'12'], + [u'hardware.cpuInfo.numCpuPackages', u'2'], + [u'hardware.cpuInfo.numCpuThreads', u'24'], + [u'hardware.cpuPkg.busHz.0', u'133338040'], + [u'hardware.cpuPkg.busHz.1', u'133338015'], + [ + u'hardware.cpuPkg.description.0', u'Intel(R)', u'Xeon(R)', u'CPU', u'X5670', u'@', + u'2.93GHz' + ], + [ + u'hardware.cpuPkg.description.1', u'Intel(R)', u'Xeon(R)', u'CPU', u'X5670', u'@', + u'2.93GHz' + ], + [u'hardware.cpuPkg.hz.0', u'2933437152'], + [u'hardware.cpuPkg.hz.1', u'2933437036'], + [u'hardware.cpuPkg.index.0', u'0'], + [u'hardware.cpuPkg.index.1', u'1'], + [u'hardware.cpuPkg.vendor.0', u'intel'], + [u'hardware.cpuPkg.vendor.1', u'intel'], + [u'hardware.memorySize', u'146016378880'], + [u'hardware.systemInfo.model', u'System', u'x3650', u'M3', u'-[7945M2G]-'], + [u'hardware.systemInfo.otherIdentifyingInfo.AssetTag.0', u'none'], + [u'hardware.systemInfo.otherIdentifyingInfo.OemSpecificString.0', u'IBM', u'SystemX'], + [u'hardware.systemInfo.otherIdentifyingInfo.ServiceTag.0', u'none'], + [u'hardware.systemInfo.uuid', u'e8a2b8a7-b9d4-3f21-a53a-afca3baa74f2'], + [u'hardware.systemInfo.vendor', u'IBM'], + [u'name', u'esx-w.dhcp.mathias-kettner'], + [u'overallStatus', u'green'], + [u'runtime.inMaintenanceMode', u'false'], + [u'runtime.powerState', u'poweredOn'], + [u'summary.quickStats.overallCpuUsage', u'2946'], + [u'summary.quickStats.overallMemoryUsage', u'110738'], + ], + None, +] -info = [[[u'config.multipathState.path', - u'vmhba0:C2:T0:L0', - u'active', - u'vmhba1:C0:T0:L0', - u'active', - u'vmhba66:C0:T0:L0', - u'active', - u'vmhba66:C0:T1:L0', - u'active', - u'vmhba66:C0:T2:L0', - u'active'], - [u'config.storageDevice.multipathInfo', - u'6e843b6d8f2740bdecbad4676da7a9dd', - u'vmhba66:C0:T2:L0', - u'active', - u'6e843b6bc5cc897d430ad40b7d9172d1', - u'vmhba66:C0:T0:L0', - u'active', - u'6e843b63fcbd92ad8f22d4cf7d8e6cdc', - u'vmhba66:C0:T1:L0', - u'active', - u'766d6862', - u'vmhba1:C0:T0:L0', - u'active', - u'600605b002db9f7018d0a40c2a1444b0', - u'vmhba0:C2:T0:L0', - u'active'], - [u'hardware.biosInfo.biosVersion', u'-[D6E158AUS-1.16]-'], - [u'hardware.biosInfo.releaseDate', u'2012-11-26T00:00:00Z'], - [u'hardware.cpuInfo.hz', u'2933437094'], - [u'hardware.cpuInfo.numCpuCores', u'12'], - [u'hardware.cpuInfo.numCpuPackages', u'2'], - [u'hardware.cpuInfo.numCpuThreads', u'24'], - [u'hardware.cpuPkg.busHz.0', u'133338040'], - [u'hardware.cpuPkg.busHz.1', u'133338015'], - [u'hardware.cpuPkg.description.0', - u'Intel(R)', - u'Xeon(R)', - u'CPU', - u'X5670', - u'@', - u'2.93GHz'], - [u'hardware.cpuPkg.description.1', - u'Intel(R)', - u'Xeon(R)', - u'CPU', - u'X5670', - u'@', - u'2.93GHz'], - [u'hardware.cpuPkg.hz.0', u'2933437152'], - [u'hardware.cpuPkg.hz.1', u'2933437036'], - [u'hardware.cpuPkg.index.0', u'0'], - [u'hardware.cpuPkg.index.1', u'1'], - [u'hardware.cpuPkg.vendor.0', u'intel'], - [u'hardware.cpuPkg.vendor.1', u'intel'], - [u'hardware.memorySize', u'146016378880'], - [u'hardware.systemInfo.model', u'System', u'x3650', u'M3', u'-[7945M2G]-'], - [u'hardware.systemInfo.otherIdentifyingInfo.AssetTag.0', u'none'], - [u'hardware.systemInfo.otherIdentifyingInfo.OemSpecificString.0', - u'IBM', - u'SystemX'], - [u'hardware.systemInfo.otherIdentifyingInfo.ServiceTag.0', u'none'], - [u'hardware.systemInfo.uuid', u'e8a2b8a7-b9d4-3f21-a53a-afca3baa74f2'], - [u'hardware.systemInfo.vendor', u'IBM'], - [u'name', u'esx-w.dhcp.mathias-kettner'], - [u'overallStatus', u'green'], - [u'runtime.inMaintenanceMode', u'false'], - [u'runtime.powerState', u'poweredOn'], - [u'summary.quickStats.overallCpuUsage', u'2946'], - [u'summary.quickStats.overallMemoryUsage', u'110738']], - None] - - -discovery = {'': [], - 'cpu_usage': [(None, {})], - 'cpu_util_cluster': [], - 'maintenance': [(None, {'target_state': 'false'})], - 'mem_usage': [(None, 'esx_host_mem_default_levels')], - 'mem_usage_cluster': [], - 'multipath': [(u'L0 physical', None), (u'L0 pseudo-logical', None)], - 'state': [(None, None)]} - +discovery = { + '': [], + 'cpu_usage': [(None, {})], + 'cpu_util_cluster': [], + 'maintenance': [(None, { + 'target_state': 'false' + })], + 'mem_usage': [(None, 'esx_host_mem_default_levels')], + 'mem_usage_cluster': [], + 'multipath': [(u'L0 physical', None), (u'L0 pseudo-logical', None)], + 'state': [(None, None)] +} -checks = {'cpu_usage': [(None, - {}, - [(0, - 'total cpu: 8.4%, 2.95GHz/35.20GHz, 2 sockets, 6 cores/socket, 24 threads', - [('util', 8.369022144778265, None, None, 0, 100)])])], - 'maintenance': [(None, - {'target_state': 'false'}, - [(0, 'System not in Maintenance mode', [])])], - 'mem_usage': [(None, - (80.0, 90.0), - [(0, - '79% used - 108.14 GB/135.99 GB', - [('usage', - 116117209088.0, - 116813103104.0, - 131414740992.0, - 0, - 146016378880.0), - ('mem_total', 146016378880.0, None, None, None, None)])])], - 'multipath': [(u'L0 physical', - {}, - [(0, - u'2 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba0:C2:T0:L0\nvmhba1:C0:T0:L0', - [])]), - (u'L0 pseudo-logical', - {}, - [(0, - u'3 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba66:C0:T0:L0\nvmhba66:C0:T1:L0\nvmhba66:C0:T2:L0', - [])])], - 'state': [(None, - {}, - [(0, 'Entity state: green', []), - (0, 'Power state: poweredOn', [])])]} \ No newline at end of file +checks = { + 'cpu_usage': [( + None, + {}, + [( + 0, + 'total cpu: 8.4%, 2.95GHz/35.20GHz, 2 sockets, 6 cores/socket, 24 threads', + [('util', 8.369022144778265, None, None, 0, 100)], + )], + )], + 'maintenance': [( + None, + { + 'target_state': 'false' + }, + [(0, 'System not in Maintenance mode', [])], + )], + 'mem_usage': [( + None, + (80.0, 90.0), + [( + 0, + '79% used - 108.14 GB/135.99 GB', + [ + ('usage', 116117209088.0, 116813103104.0, 131414740992.0, 0, 146016378880.0), + ('mem_total', 146016378880.0, None, None, None, None), + ], + )], + )], + 'multipath': [ + ( + u'L0 physical', + {}, + [( + 0, + u'2 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba0:C2:T0:L0\nvmhba1:C0:T0:L0', + [], + )], + ), + ( + u'L0 pseudo-logical', + {}, + [( + 0, + u'3 active, 0 dead, 0 disabled, 0 standby, 0 unknown\nIncluded Paths:\nvmhba66:C0:T0:L0\nvmhba66:C0:T1:L0\nvmhba66:C0:T2:L0', + [], + )], + ) + ], + 'state': [( + None, + {}, + [ + (0, 'Entity state: green', []), + (0, 'Power state: poweredOn', []), + ], + )], +}

5 years, 9 months

Refactoring of esx_vsphere_hostsystem_convert

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b8446dfc74031b7c9ea9e3bc203df9f86af3245a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8446dfc74031b… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Dec 18 16:22:10 2018 +0100 Refactoring of esx_vsphere_hostsystem_convert Change-Id: I0d66476a8566869eb5733b6d7865899ab5d57f59 --- checks/esx_vsphere_hostsystem | 95 ++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 7e59b7b..5703002 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -413,52 +413,65 @@ check_info['esx_vsphere_hostsystem.maintenance'] = { # vmhba32:C0:T0:L0 active -def esx_vsphere_multipath_convert(info): - data = esx_vsphere_hostsystem_convert(info) - paths = {} - data = data.get('config.multipathState.path') - if not data: - return paths - - data = zip(data[::2], data[1::2]) - for path, state in data: - # vSphere6 uses a different format, e.g "vmhba32:C0:T0:L0 active" - if len(path.split(":")) == 4 and path.startswith("vmhba"): - hba_num = int(path.split(":")[0].replace("vmhba", "")) - lun_id = path.split(":")[-1] - - # vmware specificies three different types of LUNs. Physical LUNs will - # reserves vmhba number 0-31. The other two reserve numbers of base64. - # The lower 32 range is reserved for pseudo logical LUNs. The upper 32 - # for logical LUNs. e.g. 32-63 for pseudo logical LUNs like USB and - # 64-95 for logical LUNs like iSCSI. - # These should be added as different multipath LUNs. - if hba_num >= 32 and hba_num % 64 < 33: - lun_id = "%s pseudo-logical" % lun_id - elif hba_num >= 32 and hba_num % 64 > 32: - lun_id = "%s logical" % lun_id - else: - lun_id = "%s physical" % lun_id +def lun_id_for_new_format(path): + hba_num = int(path.split(":")[0].replace("vmhba", "")) + lun_id = path.split(":")[-1] - paths.setdefault(lun_id, []) - # Note: There is no path type information available in these esx paths - paths[lun_id].append((state, None, path)) + # vmware specificies three different types of LUNs. Physical LUNs will + # reserves vmhba number 0-31. The other two reserve numbers of base64. + # The lower 32 range is reserved for pseudo logical LUNs. The upper 32 + # for logical LUNs. e.g. 32-63 for pseudo logical LUNs like USB and + # 64-95 for logical LUNs like iSCSI. + # These should be added as different multipath LUNs. + if hba_num >= 32 and hba_num % 64 < 33: + return "%s pseudo-logical" % lun_id + if hba_num >= 32 and hba_num % 64 > 32: + return "%s logical" % lun_id + return "%s physical" % lun_id + + +ESXLegacyPathInfo = collections.namedtuple('LegacyPathInfo', ['path_type', 'hw_type', 'lun_id']) + + +def has_new_format(path): + # vSphere6 uses a different format, e.g "vmhba32:C0:T0:L0 active" + return len(path.split(":")) == 4 and path.startswith("vmhba") - # Legacy format for older vSphere versions: - else: - path_tokens = path.split('-') - if "." not in path_tokens[-1]: - continue # invalid format / unknown type - # We've seen path tokens which include more than one "." - # PATH_TYPE.A_NAME.AN_ID_WITH_UNDERSCORES_AND_NUMBERS - path_type, lun_id = path_tokens[-1].rsplit('.', 1) - hw_type = path.split('.')[0] +def parse_legacy_format(path): + path_tokens = path.split('-') + if "." not in path_tokens[-1]: + return None # invalid format / unknown type + # We've seen path tokens which include more than one "." + # PATH_TYPE.A_NAME.AN_ID_WITH_UNDERSCORES_AND_NUMBERS + path_type, lun_id = path_tokens[-1].rsplit('.', 1) + hw_type = path.split('.')[0] + return ESXLegacyPathInfo(path_type, hw_type, lun_id) - if path_type in ['naa', 'eui'] and not hw_type == 'unknown': - paths.setdefault(lun_id, []) - paths[lun_id].append((state, "%s/%s" % (path_type, hw_type), path)) +def legacy_path_matches(path_info): + return path_info.path_type in ['naa', 'eui'] and not path_info.hw_type == 'unknown' + + +def esx_vsphere_multipath_convert(info): + data = esx_vsphere_hostsystem_convert(info) + + raw_path_states = data.get('config.multipathState.path') + if not raw_path_states: + return {} + path_states = zip(raw_path_states[::2], raw_path_states[1::2]) + + paths = {} + for path, state in path_states: + if has_new_format(path): + # Note: There is no path type information available in these esx paths + lun_id = lun_id_for_new_format(path) + paths.setdefault(lun_id, []).append((state, None, path)) + else: + path_info = parse_legacy_format(path) + if path_info and legacy_path_matches(path_info): + paths.setdefault(path_info.lun_id, []).append( + (state, "%s/%s" % (path_info.path_type, path_info.hw_type), path)) return paths

5 years, 9 months

rename testfile

by Moritz Kiemer

Module: check_mk Branch: master Commit: d356084ee28b49545c93ea34cf5e29db76caba96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d356084ee28b49… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 19 08:15:17 2018 +0100 rename testfile Change-Id: I453f7ee701b0b4bb27417fd8b22ae4fef396514e --- .../checks/generictests/datasets/{alcatel_aos7.py => alcatel_cpu_aos7.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/alcatel_aos7.py b/tests/unit/checks/generictests/datasets/alcatel_cpu_aos7.py similarity index 100% rename from tests/unit/checks/generictests/datasets/alcatel_aos7.py rename to tests/unit/checks/generictests/datasets/alcatel_cpu_aos7.py

5 years, 9 months

alcatel.include: reduce madness a little

by Moritz Kiemer

Module: check_mk Branch: master Commit: fb59201503d5216d9e46cea3ed7fd192cfd1274e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb59201503d521… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 19 08:51:38 2018 +0100 alcatel.include: reduce madness a little Change-Id: Ib9bb8515fc0b9d2d64a9f46934a23ed48c25a9c9 --- checks/alcatel.include | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/checks/alcatel.include b/checks/alcatel.include index fc89291..bd7b348 100644 --- a/checks/alcatel.include +++ b/checks/alcatel.include @@ -80,13 +80,14 @@ def check_alcatel_fans(item, _no_params, info): 1: "not running", 2: "running", } - for nr, value in enumerate(info): - if nr + 1 == item: - fan_state = int(value[0]) - state = 0 - if fan_state != 2: - state = 2 - return state, "Fan " + fan_states[fan_state] + try: + line = info[int(item) - 1] + fan_state = int(line[0]) + except (ValueError, IndexError): + return + + state = 0 if fan_state == 2 else 2 + return state, "Fan " + fan_states.get(fan_state, "unknown (%s)" % fan_state) def inventory_alcatel_power(info):

5 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018