Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

Tests: Made config reload check after site.activate_changes()

by Lars Michelsen

call more robust Message-ID: <5c797a4c.U5y2wJOJzujXHEhX%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5d78af277775034aaeddb98113867f435d80b5b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d78af27777503… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 19:24:47 2019 +0100 Tests: Made config reload check after site.activate_changes() call more robust Change-Id: Ic43bf9f5e5408c168ea2fe5ee36640bfe7358b89 --- tests/testlib/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index ca39b11..633f318 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1636,7 +1636,14 @@ class CMKWebSession(WebSession): # core restart/reload, so e.g. querying a Livestatus table immediately # might not reflect the changes yet. Ask the core for a successful reload. def config_reloaded(): - new_t = self.site.live.query_value("GET status\nColumns: program_start\n") + import livestatus + try: + new_t = self.site.live.query_value("GET status\nColumns: program_start\n") + except livestatus.MKLivestatusException: + # Seems like the socket may vanish for a short time. Keep waiting in case + # of livestatus (connection) issues... + return False + return new_t > old_t reload_time, timeout = time.time(), 10

5 years, 4 months

rename ucs_bladecenter_psu reg test according to convention

by Florian Kromer

Module: check_mk Branch: master Commit: 9adc7173419605cb556241d44bef0fb8d40d6e75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9adc7173419605… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Feb 11 17:39:30 2019 +0100 rename ucs_bladecenter_psu reg test according to convention Change-Id: Icbf70431f3cb0dd29a70dedd4a0d690333ca6da7 --- .../{ucs_bladecenter_psu_regression.py => ucs_bladecenter_psu.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/unit/checks/generictests/datasets/ucs_bladecenter_psu_regression.py b/tests/unit/checks/generictests/datasets/ucs_bladecenter_psu.py similarity index 100% rename from tests/unit/checks/generictests/datasets/ucs_bladecenter_psu_regression.py rename to tests/unit/checks/generictests/datasets/ucs_bladecenter_psu.py

5 years, 4 months

ucs_bladecenter_fans: add regression test

by Florian Kromer

Module: check_mk Branch: master Commit: 3513f55a453426d3b34a57f5fc2fa5ba32d5e0c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3513f55a453426… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Feb 11 17:21:14 2019 +0100 ucs_bladecenter_fans: add regression test Change-Id: Iec3ce16b6d0fcc093bd1599e9af35798f05ae9d5 --- .../generictests/datasets/ucs_bladecenter_fans.py | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/ucs_bladecenter_fans.py b/tests/unit/checks/generictests/datasets/ucs_bladecenter_fans.py new file mode 100644 index 0000000..592ae59 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/ucs_bladecenter_fans.py @@ -0,0 +1,31 @@ +# yapf: disable + +checkname = 'ucs_bladecenter_fans' + + +info = [['equipmentNetworkElementFanStats', + 'Dn sys/switch-A/fan-module-1-1/fan-1/stats', + 'SpeedAvg 8542'], + ['equipmentFanModuleStats', + 'Dn sys/chassis-2/fan-module-1-1/stats', + 'AmbientTemp 29.000000'], + ['equipmentFan', + 'Dn sys/chassis-1/fan-module-1-1/fan-1', + 'Model N20-FAN5', + 'OperState operable'], + ['equipmentFanStats', + 'Dn sys/chassis-2/fan-module-1-1/fan-1/stats', + 'SpeedAvg 3652']] + + +discovery = {'': [('Chassis 2', None), ('Switch A', None)], + 'temp': [('Ambient Chassis 2 FAN', {})]} + + +checks = {'': [('Chassis 2', {}, [(3, 'Fan statistics not available', [])]), + ('Switch A', {}, [(3, 'Fan statistics not available', [])])], + 'temp': [('Ambient Chassis 2 FAN', + {'levels': (40, 50)}, + [(0, + u'1 Sensors; Highest: 29.0 \xb0C, Average: 29.0 \xb0C, Lowest: 29.0 \xb0C', + [('temp', 29.0, None, None, None, None)])])]}

5 years, 4 months

7036 ucs_c_rack_server_util: Utilization

by Florian Kromer

Module: check_mk Branch: master Commit: cc88266830ee675fd8dd8759e402b01764f4140b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc88266830ee67… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Feb 8 17:28:11 2019 +0100 7036 ucs_c_rack_server_util: Utilization This werk adds support for monitoring of Cisco UCS C-Series Rack Server utilization. Main check: - ucs_c_rack_server_util: Overal utilization Sub checks: - ucs_c_rack_server_util.cpu: CPU utilization - ucs_c_rack_Server_util.memory: memory utilitazion - ucs_c_rack_server_util.io: IO utilization CMK-1741 Change-Id: Id2dbcc4db6ec80b19e70518a58a19759d32f2efd --- .werks/7036 | 19 +++ checkman/ucs_c_rack_server_util | 41 +++++ checkman/ucs_c_rack_server_util.cpu | 37 +++++ checkman/ucs_c_rack_server_util.mem | 38 +++++ checkman/ucs_c_rack_server_util.pci_io | 39 +++++ checks/ucs_c_rack_server_util | 182 +++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 36 ++++ .../memory_utilization_multiitem.py | 82 ++++++++++ .../overall_utilization_multiitem.py | 83 ++++++++++ .../pci_io_utilization_multiitem.py | 82 ++++++++++ .../datasets/ucs_c_rack_server_util.py | 64 ++++++++ 11 files changed, 703 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc88266830…

5 years, 4 months

k8s_resources: Use more accurate names for relative resource requests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1ec102848cbf09f70ad108de25fa5a3634be8d61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ec102848cbf09… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Feb 27 11:40:18 2019 +0100 k8s_resources: Use more accurate names for relative resource requests Change-Id: I91448ad4420f4a8f81dac07a12cd23a88a38d8b5 --- cmk/gui/plugins/metrics/check_mk.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 935dab0..1ea84ba 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4576,19 +4576,19 @@ metric_info["k8s_memory_capacity"] = { } metric_info["k8s_pods_usage"] = { - "title": _("Pod usage"), + "title": _("Pod request"), "unit": "%", "color": "31/a", } metric_info["k8s_memory_usage"] = { - "title": _("Memory usage"), + "title": _("Memory request"), "unit": "%", "color": "31/a", } metric_info["k8s_cpu_usage"] = { - "title": _("CPU usage"), + "title": _("CPU request"), "unit": "%", "color": "31/a", } @@ -8615,7 +8615,7 @@ graph_info["citrix_serverload"] = { } graph_info["k8s_resources.pods"] = { - "title": _("Pods"), + "title": _("Pod resources"), "metrics": [ ("k8s_pods_capacity", "area"), ("k8s_pods_allocatable", "area"), @@ -8624,7 +8624,7 @@ graph_info["k8s_resources.pods"] = { } graph_info["k8s_resources.cpu"] = { - "title": _("CPU"), + "title": _("CPU resources"), "metrics": [ ("k8s_cpu_capacity", "area"), ("k8s_cpu_allocatable", "area"), @@ -8635,7 +8635,7 @@ graph_info["k8s_resources.cpu"] = { } graph_info["k8s_resources.memory"] = { - "title": _("Memory"), + "title": _("Memory resources"), "metrics": [ ("k8s_memory_capacity", "area"), ("k8s_memory_allocatable", "area"),

5 years, 4 months

Remove more pnp templates and fix some issues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ec917acdc5ab9e82c27db544af1f434f0589daac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec917acdc5ab9e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Feb 28 15:56:53 2019 +0100 Remove more pnp templates and fix some issues Issues: * add missing metric translations for the rmon_stats check * add the metric load5 to the cpu_load graph * make the jitter metric optional in the ntp_time_offset graph * use different colors for the metrics of the tsm_stagingpools check * use different colors for the metrics of the vms_system.ios check * fix the service perfometer for direct and buffered I/O operations * use "None" for absent warn and crit levels in the perfdata of the check vms_system.procs * remove the irritating graph for dhcp leases (users can define levels for free and used leases, but only the levels for free leases were shown in the graph and the free leases were stacked above the used leases) CMK-1739 Change-Id: I3304c00e4d4e34a06602bfa75949a464486de2c2 --- checks/vms_system | 2 +- cmk/gui/plugins/metrics/check_mk.py | 60 +++++------ pnp-templates/check_mk-check_mk-cmctc.temp.php | 1 - pnp-templates/check_mk-raritan_pdu_inlet.php | 114 --------------------- pnp-templates/check_mk-raritan_pdu_outletcount.php | 114 --------------------- pnp-templates/check_mk-rmon_stats.php | 47 --------- pnp-templates/check_mk-rms200_temp.php | 1 - pnp-templates/check_mk-sensatronics_temp.php | 1 - pnp-templates/check_mk-smart.stats.php | 1 - pnp-templates/check_mk-smart.temp.php | 1 - pnp-templates/check_mk-statgrab_load.php | 1 - pnp-templates/check_mk-stulz_humidity.php | 38 ------- pnp-templates/check_mk-stulz_temp.php | 1 - pnp-templates/check_mk-systemtime.php | 51 --------- pnp-templates/check_mk-tcp_conn_stats.php | 49 --------- pnp-templates/check_mk-tsm_stagingpools.php | 47 --------- pnp-templates/check_mk-ucd_cpu_load.php | 1 - pnp-templates/check_mk-ucd_cpu_util.php | 1 - .../check_mk-ucs_bladecenter_fans.temp.php | 1 - .../check_mk-ucs_bladecenter_psu.chassis_temp.php | 1 - .../check_mk-ucs_bladecenter_psu.switch_power.php | 1 - pnp-templates/check_mk-ups_bat_temp.php | 1 - pnp-templates/check_mk-ups_outphase.php | 88 ---------------- pnp-templates/check_mk-ups_socomec_outphase.php | 1 - pnp-templates/check_mk-viprinet_temp.php | 38 ------- pnp-templates/check_mk-vms_cpu.php | 1 - pnp-templates/check_mk-vms_sys.util.php | 51 --------- pnp-templates/check_mk-vms_system.ios.php | 40 -------- pnp-templates/check_mk-vms_system.procs.php | 1 - ...k-wagner_titanus_topsense.airflow_deviation.php | 36 ------- ...k-wagner_titanus_topsense.chamber_deviation.php | 34 ------ .../check_mk-wagner_titanus_topsense.temp.php | 1 - pnp-templates/check_mk-win_dhcp_pools.php | 51 --------- pnp-templates/check_mk-winperf_msx_queues.php | 35 ------- pnp-templates/check_mk-zfs_arc_cache.l2.php | 63 ------------ pnp-templates/check_mk-zfs_arc_cache.php | 96 ----------------- pnp-templates/template-cpu_utilization.php | 64 ------------ pnp-templates/template-temperature.php | 38 ------- 38 files changed, 25 insertions(+), 1148 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec917acdc5…

5 years, 4 months

7037 ucs_c_rack_server_power: Motherboard Power

by Florian Kromer

Module: check_mk Branch: master Commit: 90dd0c99df7409a1635ecdfcb05944ab37fdd272 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90dd0c99df7409… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Feb 20 11:19:42 2019 +0100 7037 ucs_c_rack_server_power: Motherboard Power This werk adds support for monitoring of Cisco UCS C-Series Rack Server motherboard output power, input current and input voltage. CMK-1741 Change-Id: I1f07239d995dac73a8a0fd194ee78b54c41fe7fc --- .werks/7037 | 13 ++++ checkman/ucs_c_rack_server_power | 35 +++++++++ checks/ucs_c_rack_server_power | 88 ++++++++++++++++++++++ .../wato/check_parameters/power_multiitem.py | 78 +++++++++++++++++++ .../datasets/ucs_c_rack_server_power.py | 32 ++++++++ 5 files changed, 246 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90dd0c99df…

5 years, 4 months

Extracted helper functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f2bfb798cd751565b9b150c7194dca93ee6f42c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f2bfb798cd751… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 28 08:34:24 2019 +0100 Extracted helper functions CMK-1736 Change-Id: I7352e41cd0951c100a63265962650c74c7a3ee0a --- cmk_base/snmp.py | 100 +++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 3617797..50e3e48 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -54,6 +54,7 @@ _enforce_stored_walks = False _g_single_oid_hostname = None _g_single_oid_ipaddress = None _g_single_oid_cache = None +# TODO: Move to StoredWalkSNMPBackend? _g_walk_cache = {} # type: Dict[str, List[str]] #. @@ -353,22 +354,6 @@ class StoredWalkSNMPBackend(cmk_base.snmp_utils.ABCSNMPBackend): rowinfo = [] - # New implementation: use binary search - def to_bin_string(oid): - try: - return tuple(map(int, oid.strip(".").split("."))) - except: - raise MKGeneralException("Invalid OID %s" % oid) - - def compare_oids(a, b): - aa = to_bin_string(a) - bb = to_bin_string(b) - if len(aa) <= len(bb) and bb[:len(aa)] == aa: - result = 0 - else: - result = cmp(aa, bb) - return result - if host_config.hostname in _g_walk_cache: lines = _g_walk_cache[host_config.hostname] else: @@ -385,7 +370,7 @@ class StoredWalkSNMPBackend(cmk_base.snmp_utils.ABCSNMPBackend): current = (begin + end) / 2 parts = lines[current].split(None, 1) comp = parts[0] - hit = compare_oids(oid_prefix, comp) + hit = self._compare_oids(oid_prefix, comp) if hit == 0: break elif hit == 1: # we are too low @@ -396,46 +381,61 @@ class StoredWalkSNMPBackend(cmk_base.snmp_utils.ABCSNMPBackend): if hit != 0: return [] # not found - def collect_until(index, direction): - rows = [] - # Handle case, where we run after the end of the lines list - if index >= len(lines): - if direction > 0: - return [] - else: - index -= 1 - while True: - line = lines[index] - parts = line.split(None, 1) - o = parts[0] - if o.startswith('.'): - o = o[1:] - if o == oid or o.startswith(oid_prefix + "."): - if len(parts) > 1: - try: - value = cmk_base.agent_simulator.process(parts[1]) - except: - value = parts[1] # agent simulator missing in precompiled mode - else: - value = "" - # Fix for missing starting oids - rows.append(('.' + o, classic_snmp.strip_snmp_value(value))) - index += direction - if index < 0 or index >= len(lines): - break - else: - break - return rows - - rowinfo = collect_until(current, -1) + rowinfo = self._collect_until(oid, oid_prefix, lines, current, -1) rowinfo.reverse() - rowinfo += collect_until(current + 1, 1) + rowinfo += self._collect_until(oid, oid_prefix, lines, current + 1, 1) if dot_star: return [rowinfo[0]] return rowinfo + def _compare_oids(self, a, b): + aa = self._to_bin_string(a) + bb = self._to_bin_string(b) + if len(aa) <= len(bb) and bb[:len(aa)] == aa: + result = 0 + else: + result = cmp(aa, bb) + return result + + def _to_bin_string(self, oid): + try: + return tuple(map(int, oid.strip(".").split("."))) + except: + raise MKGeneralException("Invalid OID %s" % oid) + + def _collect_until(self, oid, oid_prefix, lines, index, direction): + rows = [] + # Handle case, where we run after the end of the lines list + if index >= len(lines): + if direction > 0: + return [] + else: + index -= 1 + while True: + line = lines[index] + parts = line.split(None, 1) + o = parts[0] + if o.startswith('.'): + o = o[1:] + if o == oid or o.startswith(oid_prefix + "."): + if len(parts) > 1: + try: + value = cmk_base.agent_simulator.process(parts[1]) + except: + value = parts[1] # agent simulator missing in precompiled mode + else: + value = "" + # Fix for missing starting oids + rows.append(('.' + o, classic_snmp.strip_snmp_value(value))) + index += direction + if index < 0 or index >= len(lines): + break + else: + break + return rows + def walk_for_export(host_config, oid): if config.is_inline_snmp_host(host_config.hostname):

5 years, 4 months

Move SNMPBackend instantiation to factory

by Lars Michelsen

Module: check_mk Branch: master Commit: c5f8831e3598178e37e0590f1e603e205ca01e95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5f8831e359817… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 21:09:53 2019 +0100 Move SNMPBackend instantiation to factory CMK-1736 Change-Id: I3f4f493528200cb9883e9519a1ac0d211feb448c --- cmk_base/snmp.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 33b7ddb..61ba291 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -290,15 +290,9 @@ def get_single_oid(host_config, oid, check_plugin_name=None, do_snmp_scan=True): console.vverbose(" Getting OID %s: " % oid) for context_name in snmp_contexts: try: - if _enforce_stored_walks or config.is_usewalk_host(host_config.hostname): - value = StoredWalkSNMPBackend().get(host_config, oid, context_name) - - elif config.is_inline_snmp_host(host_config.hostname): - value = inline_snmp.InlineSNMPBackend().get( - host_config, oid, context_name=context_name) - else: - value = classic_snmp.ClassicSNMPBackend().get( - host_config, oid, context_name=context_name) + snmp_backend = SNMPBackendFactory().factory( + host_config, enforce_stored_walks=_enforce_stored_walks) + value = snmp_backend.get(host_config, oid, context_name) if value is not None: break # Use first received answer in case of multiple contextes @@ -316,6 +310,18 @@ def get_single_oid(host_config, oid, check_plugin_name=None, do_snmp_scan=True): return value +class SNMPBackendFactory(object): + @staticmethod + def factory(host_config, enforce_stored_walks): + if enforce_stored_walks or config.is_usewalk_host(host_config.hostname): + return StoredWalkSNMPBackend() + + if config.is_inline_snmp_host(host_config.hostname): + return inline_snmp.InlineSNMPBackend() + + return classic_snmp.ClassicSNMPBackend() + + class StoredWalkSNMPBackend(cmk_base.snmp_utils.ABCSNMPBackend): def get(self, host_config, oid, context_name=None): walk = _get_stored_snmpwalk(host_config.hostname, oid)

5 years, 4 months

Introduce SNMP backend classes

by Lars Michelsen

Module: check_mk Branch: master Commit: be5df1dcdfe8472993f3e0f46030109f3fc0752c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be5df1dcdfe847… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 21:00:38 2019 +0100 Introduce SNMP backend classes The scope of these classes is to implement the SNMP methods get and walk using the different available SNMP engines. For the moment we have 3 of them: - ClassicSNMPBackend: Using the net-snmp commands - InlineSNMPBackend (CEE/CME): Using the net-snmp python bindings - StoredWalkSNMPBackend: Answer queries using stored CMK walks CMK-1736 Change-Id: Iff2860527f9b05c8643b10d147f98d0b05b157ac --- cmk_base/classic_snmp.py | 91 ++++++++++++++-------------- cmk_base/snmp.py | 74 ++++++++++++---------- cmk_base/snmp_utils.py | 17 +++++- tests/integration/cmk_base/snmp/test_snmp.py | 1 + 4 files changed, 104 insertions(+), 79 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=be5df1dcdf…

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019