Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

Removed ooutdated and missleading description

by Marcel Arentz

Module: check_mk Branch: master Commit: af8e3259cd6a32b9951d6a298bf81d8a4faa773b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af8e3259cd6a32… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 21 12:28:07 2018 +0200 Removed ooutdated and missleading description Change-Id: I4cbdf22254d8574065a3fb951f87163928fa3e2f --- web/plugins/sidebar/nagvis_maps.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/plugins/sidebar/nagvis_maps.py b/web/plugins/sidebar/nagvis_maps.py index 020c91a..ef9f815 100644 --- a/web/plugins/sidebar/nagvis_maps.py +++ b/web/plugins/sidebar/nagvis_maps.py @@ -33,9 +33,7 @@ def render_nagvis_maps(): sidebar_snapins["nagvis_maps"] = { "title": _("NagVis Maps"), - "description": _("List of available NagVis maps. This only works with NagVis 1.5 and above. " \ - "At the moment it is neccessarry to authenticate with NagVis first by opening " \ - "a NagVis map in the browser. After this the maplist should be filled."), + "description": _("List of available NagVis maps. This only works with NagVis 1.5 and above. "), "render": render_nagvis_maps, "allowed": [ "user", "admin", "guest" ], "refresh": True,

6 years, 5 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 84e3eb2193353dfdf8568751820759029fcdc060 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e3eb2193353d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 07:56:50 2018 +0200 Minor cleanup Change-Id: Ib43556cc7948f11807737350d68a504240ddb4a1 --- web/plugins/sidebar/bi.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index 804d3c9..65f5083 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -85,9 +85,7 @@ def _build_tree(group, parent, path): def _render_tree(tree): for group, attrs in tree.iteritems(): if attrs.get('__children__'): - html.begin_foldable_container("bi_aggregation_groups", group, False, - HTML(html.render_a(group, href=None, - target="main"))) + html.begin_foldable_container("bi_aggregation_groups", group, False, group) _render_tree(attrs['__children__']) html.end_foldable_container() else:

6 years, 5 months

Sort, so that assertEqual is equal!

by Moritz Kiemer

Module: check_mk Branch: master Commit: 86e07013a2c28983f5dbc0a3246ec8b6152793cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86e07013a2c289… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Jun 22 16:37:48 2018 +0200 Sort, so that assertEqual is equal! Change-Id: I3d31c7ed49ba7828a31cbb94e021e4fdb8e3f10a --- tests/unit/checks/checktestlib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 3cf1e8f..4ce9598 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -222,6 +222,7 @@ class DiscoveryResult(object): self.entries = [] for entry in result: self.entries.append(DiscoveryEntry(entry)) + self.entries.sort(key=repr) def __eq__(self, other_value): return all(entry in other_value for entry in self) and \

6 years, 5 months

6222 FIX Fix exception during event rewriting, causing events for missing expected messages failing to be created

by Konstantin Büttner

Module: check_mk Branch: master Commit: 889e4a4eea56e9b00f42ad8838367cfa753bd672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889e4a4eea56e9… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jun 22 16:02:21 2018 +0200 6222 FIX Fix exception during event rewriting, causing events for missing expected messages failing to be created This issue had been introduced with Werk #5254 Change-Id: I488b51f231596aa412ddec0a740a1f0a3adbf0dc --- .werks/6222 | 11 +++++++++++ cmk/ec/main.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6222 b/.werks/6222 new file mode 100644 index 0000000..1ecc02d --- /dev/null +++ b/.werks/6222 @@ -0,0 +1,11 @@ +Title: Fix exception during event rewriting, causing events for missing expected messages failing to be created +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1529675772 + +This issue had been introduced with Werk #5254 diff --git a/cmk/ec/main.py b/cmk/ec/main.py index f6fd0e4..fcf02ea 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1271,7 +1271,7 @@ class EventServer(ECServerThread): merge_event["text"] = text # Better rewrite (again). Rule might have changed. Also we have changed # the text and the user might have his own text added via set_text. - self.rewrite_event(rule, merge_event, ()) + self.rewrite_event(rule, merge_event, {}) self._history.add(merge_event, "COUNTFAILED") else: # Create artifical event from scratch. Make sure that all important @@ -1295,7 +1295,7 @@ class EventServer(ECServerThread): "match_groups_syslog_application": (), } self._add_rule_contact_groups_to_event(rule, event) - self.rewrite_event(rule, event, ()) + self.rewrite_event(rule, event, {}) self._event_status.new_event(event) self._history.add(event, "COUNTFAILED") cmk.ec.actions.event_has_opened(self._history, self.settings, self._config, self._logger, self, self._event_columns, rule, event)

6 years, 5 months

Skip explicit creation of BasicCheckResult

by Moritz Kiemer

Module: check_mk Branch: master Commit: aeac34f94114a26208d4aa49f54c2166867e85a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeac34f94114a2… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jun 21 08:21:16 2018 +0200 Skip explicit creation of BasicCheckResult We can now create a CheckResult from plain tuples, without the need to create an BasicCheckResult explicitly. This is in analogy to the way we can create BasicCheckResults without explicitly creating PerfValue objects. This leads to more concise tests. Change-Id: Ia321ec61b90d4471fad8cd1487dc174706a84194 --- tests/unit/checks/checktestlib.py | 11 +++++++++-- tests/unit/checks/test_statgrab_cpu_check.py | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 85ad02c..3cf1e8f 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -139,9 +139,16 @@ class CheckResult(object): if isinstance(result, types.GeneratorType): for subresult in result: self.subresults.append(BasicCheckResult(*subresult)) - # creation of a CheckResult via a list of BasicCheckResult for test writing + # creation of a CheckResult via a list of + # tuple or BasicCheckResult for test writing elif isinstance(result, list): - assert all(isinstance(subresult, BasicCheckResult) for subresult in result) + for subresult in result: + assert type(subresult) in (tuple, BasicCheckResult), \ + "type of subresult must be %s or %s - not %r" % \ + (tuple, BasicCheckResult, subresult) + if isinstance(subresult, tuple): + subresult = BasicCheckResult(*subresult) + self.subresults.append(subresult) self.subresults = result else: self.subresults.append(BasicCheckResult(*result)) diff --git a/tests/unit/checks/test_statgrab_cpu_check.py b/tests/unit/checks/test_statgrab_cpu_check.py index a3a47e7..0ef9645 100644 --- a/tests/unit/checks/test_statgrab_cpu_check.py +++ b/tests/unit/checks/test_statgrab_cpu_check.py @@ -1,7 +1,6 @@ import pytest -from checktestlib import BasicCheckResult, CheckResult, \ - assertCheckResultsEqual, BasicItemState, \ - MockItemState, assertMKCounterWrapped +from checktestlib import CheckResult, assertCheckResultsEqual, \ + BasicItemState, MockItemState, assertMKCounterWrapped pytestmark = pytest.mark.checks @@ -52,26 +51,26 @@ def mock_state_function(key, _default): # TODO: These only represent the status quo - check whether they even make sense. # Note that systime and total are being ignored entirely by the check. expected_result_1 = CheckResult([ - BasicCheckResult(0, "user: 40.0%, system: 20.0%", + (0, "user: 40.0%, system: 20.0%", [('user', 40.0, None, None, None, None), ('system', 20.0, None, None, None, None), ('wait', 20.0, None, None, None, None)]), - BasicCheckResult(0, "wait: 20.0%", None), - BasicCheckResult(0, "steal: 0.0%", + (0, "wait: 20.0%", None), + (0, "steal: 0.0%", [('steal', 0.0, None, None, None, None)]), - BasicCheckResult(0, "total: 80.0%", None) + (0, "total: 80.0%", None) ]) expected_result_2 = CheckResult([ - BasicCheckResult(0, "user: -51.6%, system: -105.8%", + (0, "user: -51.6%, system: -105.8%", [('user', -51.61290322580645, None, None, None, None), ('system', -105.80645161290323, None, None, None, None), ('wait', 451.61290322580646, None, None, None, None)]), - BasicCheckResult(0, "wait: 451.6%", None), - BasicCheckResult(0, "steal: 78.7%", + (0, "wait: 451.6%", None), + (0, "steal: 78.7%", [('steal', 78.70967741935483, None, None, None, None)]), - BasicCheckResult(0, "total: 372.9%", None) + (0, "total: 372.9%", None) ])

6 years, 5 months

use new checktestlib objects in 'test_statgrab_cpu_check.py'

by Moritz Kiemer

Module: check_mk Branch: master Commit: 1ba100ce0d13001d7c6198e127927739c840e305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ba100ce0d1300… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jun 21 07:53:58 2018 +0200 use new checktestlib objects in 'test_statgrab_cpu_check.py' Change-Id: I77350fdaaa95715c06e1ea51b8ff2a9b5900784a --- tests/unit/checks/checktestlib.py | 4 + tests/unit/checks/test_statgrab_cpu_check.py | 129 +++++++++++++++++++++------ 2 files changed, 107 insertions(+), 26 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 35aeb20..85ad02c 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -300,6 +300,8 @@ class MockItemState(object): In all of these cases, the sanity of the returned values is checked (i.e. they have to be BasicItemState). + + See for example 'test_statgrab_cpu_check.py'. """ TARGET = 'cmk_base.item_state._cached_item_states.get_item_state' @@ -364,6 +366,8 @@ class assertMKCounterWrapped(object): with assertMKCounterWrapped(): # do a check that raises such an exception run_my_check() + + See for example 'test_statgrab_cpu_check.py'. """ def __init__(self, msg=None): self.msg = msg diff --git a/tests/unit/checks/test_statgrab_cpu_check.py b/tests/unit/checks/test_statgrab_cpu_check.py index 96e3d0d..a3a47e7 100644 --- a/tests/unit/checks/test_statgrab_cpu_check.py +++ b/tests/unit/checks/test_statgrab_cpu_check.py @@ -1,33 +1,110 @@ import pytest -from cmk_base.check_api import MKCounterWrapped -import checktestlib +from checktestlib import BasicCheckResult, CheckResult, \ + assertCheckResultsEqual, BasicItemState, \ + MockItemState, assertMKCounterWrapped pytestmark = pytest.mark.checks -info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], - [u'iowait', u'%d' % int(t*5)], - [u'kernel', u'%d' % int(t*5)], - [u'nice', u'%d' % int(t*5)], - [u'swap', u'0'], - [u'systime', u'%d' % int(t*5)], - [u'total', u'%d' % int(t*30)], - [u'user', u'%d' % int(t*5)]] - -(a)pytest.mark.parametrize("time_to_info,params,predicate", [ -(info_statgrab_cpu_hpux, {}, lambda cr: ("user", 40.0) in cr.perfdata and # TODO: This only represents the status quo - check whether this even makes sense. - ("system", 20.0) in cr.perfdata and # Note that systime and total are being ignored entirely by the check. - ("wait", 20.0) in cr.perfdata - ), +info_statgrab_cpu_hpux = [ + [u'idle', u'300'], + [u'iowait', u'300'], + [u'kernel', u'300'], + [u'nice', u'300'], + [u'swap', u'0'], + [u'systime', u'300'], + [u'total', u'1800'], + [u'user', u'300'], +] + + +# If mock_state is a tuple, it is returned upon +# every call to `get_item_state`. Let's say +# The check ran 23 seconds ago, and all values +# were zero: +mock_state_tuple = (23., 0) + + +# If mock_state is a dictionary, the values will +# be returned according to their key, +# as you would expect. +mock_state_dict = { + 'cpu.util.1' : (3, 200), # user + 'cpu.util.2' : (1, 320), # nice + 'cpu.util.3' : (4, 100),# system + 'cpu.util.4' : (1, -123),# idle + 'cpu.util.5' : (5, 1000),# iowait + 'cpu.util.6' : (9, 3),# irq + 'cpu.util.7' : (2, 33),# softirq + 'cpu.util.8' : (6, 122),# steal + 'cpu.util.9' : (5, 300),# guest + 'cpu.util.10': (3, 300),# guest_nice +} + + +# If mock_state is a function, it must accept two +# arguments, just like dict.get: +def mock_state_function(key, _default): + counter = int(key.split('.')[-1]) + return (23, (counter < 6) * 300) + + +# TODO: These only represent the status quo - check whether they even make sense. +# Note that systime and total are being ignored entirely by the check. +expected_result_1 = CheckResult([ + BasicCheckResult(0, "user: 40.0%, system: 20.0%", + [('user', 40.0, None, None, None, None), + ('system', 20.0, None, None, None, None), + ('wait', 20.0, None, None, None, None)]), + BasicCheckResult(0, "wait: 20.0%", None), + BasicCheckResult(0, "steal: 0.0%", + [('steal', 0.0, None, None, None, None)]), + BasicCheckResult(0, "total: 80.0%", None) +]) + + +expected_result_2 = CheckResult([ + BasicCheckResult(0, "user: -51.6%, system: -105.8%", + [('user', -51.61290322580645, None, None, None, None), + ('system', -105.80645161290323, None, None, None, None), + ('wait', 451.61290322580646, None, None, None, None)]), + BasicCheckResult(0, "wait: 451.6%", None), + BasicCheckResult(0, "steal: 78.7%", + [('steal', 78.70967741935483, None, None, None, None)]), + BasicCheckResult(0, "total: 372.9%", None) +]) + + +(a)pytest.mark.parametrize("info,mockstate,expected_result", [ +(info_statgrab_cpu_hpux, mock_state_tuple, expected_result_1), +(info_statgrab_cpu_hpux, mock_state_dict, expected_result_2), ]) -def test_statgrab_cpu_check(check_manager, time_to_info, params, predicate): +def test_statgrab_cpu_check(check_manager, info, mockstate, expected_result): + check = check_manager.get_check("statgrab_cpu") - # NOTE: We do not mock the time module here, because the check does not depend on any - # absolute rates. The mocking that was included in this test previously had no - # effect, which went unnoticed because it doesn't matter in this case. - try: - list(check.run_check(None, params, time_to_info(0))) - except MKCounterWrapped: - pass - result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) - assert predicate(result) + + # set up mocking of `get_item_state` + with MockItemState(mockstate): + result = CheckResult(check.run_check(None, {}, info)) + assertCheckResultsEqual(result, expected_result) + + +(a)pytest.mark.parametrize("info,mockstate", [ +(info_statgrab_cpu_hpux, mock_state_function), +]) +def test_statgrab_cpu_check_error(check_manager, info, mockstate): + + check = check_manager.get_check("statgrab_cpu") + + with MockItemState(mockstate): + # the mock values are designed to raise an exception. + # to make sure it is raised, use this: + with assertMKCounterWrapped('Too short time difference since last check'): + CheckResult(check.run_check(None, {}, info)) + # # You could omit the error message it you don't care about it: + # with assertMKCounterWrapped() + # CheckResult(check.run_check(None, {}, info)) + + + +

6 years, 5 months

Add HW/SW inventory function and make parse function available.

by Moritz Kiemer

Module: check_mk Branch: master Commit: c28509a3b7e8776d4f0d89c90ad8cc0e39c9d69b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c28509a3b7e877… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu May 24 14:45:54 2018 +0200 Add HW/SW inventory function and make parse function available. Change-Id: I9d2ccb9cffd16f8ecc9c5632016ac9dd238e1759 --- checks/allnet_ip_sensoric | 74 +++++++++++++++++++++----------------------- inventory/allnet_ip_sensoric | 38 +++++++++++++++++++++++ 2 files changed, 73 insertions(+), 39 deletions(-) diff --git a/checks/allnet_ip_sensoric b/checks/allnet_ip_sensoric index 70b48af..91889d2 100644 --- a/checks/allnet_ip_sensoric +++ b/checks/allnet_ip_sensoric @@ -26,8 +26,6 @@ # Example output from agent: -# <<<check_mk>>> -# AgentOS:;ALL5000 # <<<allnet_ip_sensoric:sep(59)>>> # sensor0.alarm0;0 # sensor0.all4000_typ;0 @@ -70,28 +68,28 @@ # system.sys;114854 # system.time;16:08:48 -# parses agent output in a structure like: -# {'sensor0': {'alarm0': '0', -# 'all4000_typ': '0', -# 'function': '1', -# 'limit_high': '50.00', -# 'limit_low': '10.00', -# 'maximum': '28.56', -# 'minimum': '27.43', -# 'name': 'Temperatur intern', -# 'value_float': '27.50', -# 'value_int': '2750', -# 'value_string': '27.50'}, -# [...] -# 'system': {'alarmcount': '4', -# 'date': '30.06.2014', -# 'devicename': 'all5000', -# 'devicetype': 'ALL5000', -# 'sys': '116240', -# 'time': '16:57:50'}} - -def allnet_ip_sensoric_parse(info): +def parse_allnet_ip_sensoric(info): + '''parses agent output in a structure like: + {'sensor0': {'alarm0': '0', + 'all4000_typ': '0', + 'function': '1', + 'limit_high': '50.00', + 'limit_low': '10.00', + 'maximum': '28.56', + 'minimum': '27.43', + 'name': 'Temperatur intern', + 'value_float': '27.50', + 'value_int': '2750', + 'value_string': '27.50'}, + [...] + 'system': {'alarmcount': '4', + 'date': '30.06.2014', + 'devicename': 'all5000', + 'devicetype': 'ALL5000', + 'sys': '116240', + 'time': '16:57:50'}} + ''' parsed = {} for key, value in info: match = re.search('(\w+)\.(\w+)', key) @@ -103,6 +101,7 @@ def allnet_ip_sensoric_parse(info): return parsed + def allnet_ip_sensoric_compose_item(sensor_id, sensor): sensor_id = re.sub("sensor", "", sensor_id) if "name" in sensor.keys(): @@ -120,8 +119,7 @@ def allnet_ip_sensoric_compose_item(sensor_id, sensor): # | | # '----------------------------------------------------------------------' -def inventory_allnet_ip_sensoric_tension(info): - parsed = allnet_ip_sensoric_parse(info) +def inventory_allnet_ip_sensoric_tension(parsed): inventory = [] for sensor in parsed.keys(): if "function" in parsed[sensor].keys() and parsed[sensor]["function"] == "12": @@ -129,8 +127,7 @@ def inventory_allnet_ip_sensoric_tension(info): inventory.append( (item, None) ) return inventory -def check_allnet_ip_sensoric_tension(item, _no_params, info): - parsed = allnet_ip_sensoric_parse(info) +def check_allnet_ip_sensoric_tension(item, _no_params, parsed): sensor_id = "sensor" + re.sub(".+Sensor ", "", item) if sensor_id not in parsed.keys(): @@ -167,16 +164,14 @@ factory_settings["allnet_ip_sensoric_temp_default_levels"] = { "levels" : (35, 40) } -def inventory_allnet_ip_sensoric_temp(info): - parsed = allnet_ip_sensoric_parse(info) +def inventory_allnet_ip_sensoric_temp(parsed): for sensor in parsed.keys(): if (parsed[sensor].get('function') and parsed[sensor]["function"] == "1") \ or (parsed[sensor].get('unit') and parsed[sensor]['unit'] == u'°C'): item = allnet_ip_sensoric_compose_item(sensor, parsed[sensor]) yield item, {} -def check_allnet_ip_sensoric_temp(item, params, info): - parsed = allnet_ip_sensoric_parse(info) +def check_allnet_ip_sensoric_temp(item, params, parsed): sensor_id = "sensor" + re.sub(".+Sensor ", "", item) if sensor_id not in parsed.keys(): @@ -208,8 +203,7 @@ check_info["allnet_ip_sensoric.temp"] = { allnet_ip_sensoric_humidity_default_levels = ( 35, 40, 60, 65 ) -def inventory_allnet_ip_sensoric_humidity(info): - parsed = allnet_ip_sensoric_parse(info) +def inventory_allnet_ip_sensoric_humidity(parsed): inventory = [] for sensor in parsed.keys(): if "function" in parsed[sensor].keys() and parsed[sensor]["function"] == "2": @@ -217,8 +211,7 @@ def inventory_allnet_ip_sensoric_humidity(info): inventory.append( (item, "allnet_ip_sensoric_humidity_default_levels") ) return inventory -def check_allnet_ip_sensoric_humidity(item, params, info): - parsed = allnet_ip_sensoric_parse(info) +def check_allnet_ip_sensoric_humidity(item, params, parsed): sensor_id = "sensor" + re.sub(".+Sensor ", "", item) if sensor_id not in parsed.keys(): return 3, "%s not found in agent output" % item @@ -244,8 +237,7 @@ check_info["allnet_ip_sensoric.humidity"] = { # | |_| | # '----------------------------------------------------------------------' -def inventory_allnet_ip_sensoric_pressure(info): - parsed = allnet_ip_sensoric_parse(info) +def inventory_allnet_ip_sensoric_pressure(parsed): inventory = [] for sensor in parsed.keys(): if "function" in parsed[sensor].keys() and parsed[sensor]["function"] == "16": @@ -253,8 +245,7 @@ def inventory_allnet_ip_sensoric_pressure(info): inventory.append( (item, None) ) return inventory -def check_allnet_ip_sensoric_pressure(item, _no_params, info): - parsed = allnet_ip_sensoric_parse(info) +def check_allnet_ip_sensoric_pressure(item, _no_params, parsed): sensor_id = "sensor" + re.sub(".+Sensor ", "", item) if sensor_id not in parsed.keys(): @@ -274,3 +265,8 @@ check_info["allnet_ip_sensoric.pressure"] = { } #. + +check_info["allnet_ip_sensoric"] = { + "parse_function": parse_allnet_ip_sensoric, +} + diff --git a/inventory/allnet_ip_sensoric b/inventory/allnet_ip_sensoric new file mode 100644 index 0000000..2caac6d --- /dev/null +++ b/inventory/allnet_ip_sensoric @@ -0,0 +1,38 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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. + + +def inv_allnet_ip_sensoric(parsed, inventory_tree): + + model = parsed.get("system", {}).get("devicetype") + if model: + node = inventory_tree.get_dict("hardware.system.") + node["model"] = model + + +inv_info['allnet_ip_sensoric'] = { + 'inv_function' : inv_allnet_ip_sensoric, +}

6 years, 5 months

Remove '<<<check_mk>>>' section from agent output.

by Moritz Kiemer

Module: check_mk Branch: master Commit: 789d48ab9851cf64750ee1667b2b3ba7eb357af6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=789d48ab9851cf… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed May 23 11:36:29 2018 +0200 Remove '<<<check_mk>>>' section from agent output. The section is renamed to '<<<esx_systeminfo>>>' and the keys are changed to the more appropriate 'apiVersion' and 'name'. These are also used in agent_vsphere. Change-Id: Id8ae9d4f3a795bfcd2f51f318a9586e7a4d90e8b --- agents/special/agent_vsphere.pysphere | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 6389333..b3d8fa9 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -250,9 +250,11 @@ if error: esx_version = host.get_api_version() esx_version_num = float(esx_version) -print "<<<check_mk>>>" -print "Version: %s" % esx_version -print "AgentOS: %s " % host.get_server_type() +# use the same section and keys as in +# agent_vsphere +print "<<<esx_systeminfo>>>" +print "apiVersion %s" % esx_version +print "name %s" % host.get_server_type() # Prepare list of all hosts systems all_hosts = host.get_hosts()

6 years, 5 months

Add support for counter mockery

by Moritz Kiemer

Module: check_mk Branch: master Commit: 512377b92168c8b75a20998e550ed24b8da36429 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=512377b92168c8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jun 20 13:30:03 2018 +0200 Add support for counter mockery Change-Id: I30b0c7b373da385f95f6b90663fd0e3970f8011c --- tests/unit/checks/checktestlib.py | 118 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 98bfafc..35aeb20 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -1,4 +1,6 @@ import types +import mock +from cmk_base.item_state import MKCounterWrapped class Tuploid(object): @@ -262,3 +264,119 @@ class BasicItemState(object): # We want to ba able to test time anomalies. +class MockItemState(object): + """Mock the calls to item_state API. + + Due to our rather unorthodox import structure, we cannot mock + cmk_base.item_state.get_item_state directly (it's a global var + in running checks!) + Instead, this context manager mocks + cmk_base.item_state._cached_item_states.get_item_state. + + This will affect get_rate and get_average as well as + get_item_state. + + Usage: + + with MockItemState(mock_state): + # run your check test here + mocked_time_diff, mocked_value = \ + cmk_base.item_state.get_item_state('whatever_key', default="IGNORED") + + There are three different types of arguments to pass to MockItemState: + + 1) Tuple or a BasicItemState: + The argument is assumed to be (time_diff, value). All calls to the + item_state API behave as if the last state had been `value`, recorded + `time_diff` seeconds ago. + + 2) Dictionary containing Tuples or BasicItemStates: + The dictionary will replace the item states. + Basically `get_item_state` gets replaced by the dictionarys GET method. + + 3) Callable object: + The callable object will replace `get_item_state`. It must accept two + arguments (key/default), in same way a dictionary does. + + In all of these cases, the sanity of the returned values is checked + (i.e. they have to be BasicItemState). + """ + TARGET = 'cmk_base.item_state._cached_item_states.get_item_state' + + def __init__(self, mock_state): + self.context = None + self.get_val_function = None + + if hasattr(mock_state, '__call__'): + self.get_val_function = mock_state + return + + type_mock_state = type(mock_state) + allowed_types = (tuple, BasicItemState, dict) + assert type_mock_state in allowed_types, \ + "type must be in %r, or callable - not %r" % \ + (allowed_types, type_mock_state) + + # in dict case check values + if type_mock_state == dict: + msg = "dict values must be in %r - not %r" + allowed_types = (tuple, BasicItemState) + for v in mock_state.values(): + tyv = type(v) + assert tyv in allowed_types, msg % (allowed_types, tyv) + self.get_val_function = mock_state.get + else: + self.get_val_function = lambda key, default: mock_state + + + def __call__(self, user_key, default=None): + # ensure the default value is sane + BasicItemState(default) + val = self.get_val_function(user_key, default) + if not isinstance(val, BasicItemState): + val = BasicItemState(val) + return val.time_diff, val.value + + def __enter__(self): + '''The default context: just mock get_item_state''' + self.context = mock.patch(MockItemState.TARGET, + # I'm the MockObj myself! + new_callable=lambda: self) + return self.context.__enter__() + + def __exit__(self, *exc_info): + return self.context.__exit__(*exc_info) + + +class assertMKCounterWrapped(object): + """Contextmanager in which a MKCounterWrapped exception is expected + + If you can choose to also assert a certain error message: + + with MockItemState((1., -42)): + with assertMKCounterWrapped("value is negative"): + # do a check that raises such an exception + run_my_check() + + Or you can ignore the exact error message: + + with MockItemState((1., -42)): + with assertMKCounterWrapped(): + # do a check that raises such an exception + run_my_check() + """ + def __init__(self, msg=None): + self.msg = msg + + def __enter__(self): + return self + + def __exit__(self, ty, ex, tb): + if ty is AssertionError: + raise + assert ty is not None, "No exception has occurred!" + assert ty == MKCounterWrapped, "%r is not of type %r" % (ex, MKCounterWrapped) + if self.msg is not None: + assert self.msg == str(ex), "%r != %r" % (self.msg, str(ex)) + return True +

6 years, 5 months

Unified winperf_tcp_conn and tcp_conn_stats check plugins

by Simon Betz

Module: check_mk Branch: master Commit: 227a930fa3bcdde1741ab059a9b8bfc15dfafc3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=227a930fa3bcdd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 22 10:41:38 2018 +0200 Unified winperf_tcp_conn and tcp_conn_stats check plugins Change-Id: I775697992f6f65c89a71cd8438ecfa7a7c787cfa --- checks/tcp_conn_stats | 30 +++++++++++++++--- checks/tcp_connections.include | 70 ++++++++++++------------------------------ checks/winperf_tcp_conn | 57 +++++++++++++--------------------- 3 files changed, 66 insertions(+), 91 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index aa99bca..f91d380 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -40,20 +40,40 @@ def parse_tcp_conn_stats(info): + map_counter_keys = { + 1 : "ESTABLISHED", # connection up and passing data + 2 : "SYN_SENT", # session has been requested by us; waiting for reply from remote endpoint + 3 : "SYN_RECV", # session has been requested by a remote endpoint for a socket on which we were listening + 4 : "FIN_WAIT1", # our socket has closed; we are in the process of tearing down the connection + 5 : "FIN_WAIT2", # the connection has been closed; our socket is waiting for the remote endpoint to shut down + 6 : "TIME_WAIT", # socket is waiting after closing for any packets left on the network + 7 : "CLOSED", # socket is not being used (FIXME. What does mean?) + 8 : "CLOSE_WAIT", # remote endpoint has shut down; the kernel is waiting for the application to close the socket + 9 : "LAST_ACK", # our socket is closed; remote endpoint has also shut down; we are waiting for a final acknowledgement + 10 : "LISTEN", # represents waiting for a connection request from any remote TCP and port + 11 : "CLOSING", # our socket is shut down; remote endpoint is shut down; not all data has been sent + } + parsed = {} - for tcp_state, tcp_count in info: + for line in info: + tcp_state = line[0] if len(tcp_state) == 2: - tcp_state = int(tcp_state, 16) # Hex - parsed[tcp_state] = int(tcp_count) + tcp_state = map_counter_keys.get(int(tcp_state, 16)) # Hex + if tcp_state is None: + continue + try: + parsed[tcp_state] = int(line[1]) + except ValueError: + pass return parsed check_info["tcp_conn_stats"] = { 'parse_function' : parse_tcp_conn_stats, - 'check_function' : check_tcp_connections, 'inventory_function' : inventory_tcp_connections, + 'check_function' : check_tcp_connections, 'service_description' : 'TCP Connections', 'has_perfdata' : True, 'group' : 'tcp_conn_stats', - 'includes' : [ "tcp_connections.include" ], + 'includes' : ["tcp_connections.include"], } diff --git a/checks/tcp_connections.include b/checks/tcp_connections.include index 3d7ed62..a2a342f 100644 --- a/checks/tcp_connections.include +++ b/checks/tcp_connections.include @@ -24,31 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -tcp_conn_stats_default_levels = {} - -tcp_connections_state_map = [ - ("ESTABLISHED", 1), # connection up and passing data - ("SYN_SENT", 2), # session has been requested by us; waiting for reply from remote endpoint - ("SYN_RECV", 3), # session has been requested by a remote endpoint for a socket on which we were listening - ("LAST_ACK", 9), # our socket is closed; remote endpoint has also shut down; we are waiting for a final acknowledgement - ("CLOSE_WAIT", 8), # remote endpoint has shut down; the kernel is waiting for the application to close the socket - ("TIME_WAIT", 6), # socket is waiting after closing for any packets left on the network - ("CLOSED", 7), # socket is not being used (FIXME. What does mean?) - ("CLOSING", 11), # our socket is shut down; remote endpoint is shut down; not all data has been sent - ("FIN_WAIT1", 4), # our socket has closed; we are in the process of tearing down the connection - ("FIN_WAIT2", 5), # the connection has been closed; our socket is waiting for the remote endpoint to shut down - ("LISTEN", 10), # represents waiting for a connection request from any remote TCP and port - ("BOUND", None), # Socket did a bound() but TCP stack not yet active (Solaris) - ("IDLE", None), # TCP endpoints are in IDLE state when first created -] -# parsed can be: -# parsed = { -# 1 : 6, -# 6 : 17, -# 8 : 1, -# 10 : 10, -# } # parsed = { # "ESTABLISHED" : 6, # "BOUND" : 17, @@ -57,36 +33,30 @@ tcp_connections_state_map = [ # } +tcp_conn_stats_default_levels = {} + + def inventory_tcp_connections(parsed): - if len(parsed) > 0: + if parsed: return [ (None, 'tcp_conn_stats_default_levels') ] def check_tcp_connections(item, params, parsed): - hit = False - for tcp_state_readable, tcp_state_int_str in tcp_connections_state_map: - num = parsed.get(tcp_state_readable, \ - parsed.get(tcp_state_int_str, 0)) - state = 0 - perf = [tcp_state_readable, num] - if num > 0: # Only check positive counts - hit = True - infotext = "%s: %d" % (tcp_state_readable, num) - levels = params.get(tcp_state_readable) - if levels: - warn, crit = levels - perf.append(warn) - perf.append(crit) - if num >= crit: - state = 2 - elif num >= warn: - state = 1 - if state > 0: - infotext += " (warn/crit at %d/%d)" % (warn, crit) - yield state, infotext, [ tuple(perf) ] - else: - yield 0, None, [ tuple(perf) ] - - if not hit: + if not parsed: yield 0, "Currently no TCP connections" + return + for tcp_state, tcp_count in parsed.iteritems(): + if tcp_count <= 0: + continue + + infotext = "%s: %s" % (tcp_state, tcp_count) + state = 0 + warn, crit = params.get(tcp_state, (None, None)) + if crit is not None and tcp_count >= crit: + state = 2 + elif warn is not None and tcp_count >= warn: + state = 1 + if state: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + yield state, infotext, [(tcp_state, tcp_count, warn, crit)] diff --git a/checks/winperf_tcp_conn b/checks/winperf_tcp_conn index 1d8e425..a4401a9 100644 --- a/checks/winperf_tcp_conn +++ b/checks/winperf_tcp_conn @@ -38,45 +38,30 @@ # 16 18437 counter -def inventory_winperf_tcp_conn(info): - if len(info) > 1: - return [ (None, {}) ] +def parse_winperf_tcp_conn(info): + map_counter_keys = { + "2": "ESTABLISHED", + } - -def check_winperf_tcp_conn(item, params, info): - if len(info) == 1: - raise MKCounterWrapped("Got no information from agent") - - fields = [ - ( 2, "Established", "ESTABLISHED" ), - ] - infotext = "" - worst_state = 0 - perfdata = [] - for offset, name, param_key in fields: - value = saveint(info[offset][1]) - infotext += "%s: %s" % (name, value) - warn, crit = "", "" - if params.get(param_key): - warn, crit = params.get(param_key) - if value >= crit: - worst_state = 2 - infotext += "(!!) (critical at %d)" % crit - elif value >= warn: - worst_state = max(1, worst_state) - infotext += "(!) (warning at %d)" % warn - infotext += ", " - perfdata.append( (name, value, warn, crit) ) - - infotext = infotext[:-2] - return worst_state, infotext, perfdata + parsed = {} + for line in info: + tcp_state = map_counter_keys.get(line[0]) + if tcp_state is None: + continue + try: + parsed[tcp_state] = int(line[1]) + except ValueError: + pass + return parsed check_info["winperf_tcp_conn"] = { - 'check_function': check_winperf_tcp_conn, - 'inventory_function': inventory_winperf_tcp_conn, - 'service_description': 'TCP connections', - 'has_perfdata': True, - 'group': 'tcp_conn_stats', + 'parse_function' : parse_winperf_tcp_conn, + 'inventory_function' : inventory_tcp_connections, + 'check_function' : check_tcp_connections, + 'service_description' : 'TCP connections', + 'has_perfdata' : True, + 'group' : 'tcp_conn_stats', + 'includes' : ["tcp_connections.include"], }

6 years, 5 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018