Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

FIX 7007 ps: Fixed discovery of processes if backslashes are used in regex pattern

by Simon Betz

Module: check_mk Branch: master Commit: 3798208ad07a7dfc77715f4d1a33e34accfc395c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3798208ad07a7d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 16 17:19:53 2019 +0100 FIX 7007 ps: Fixed discovery of processes if backslashes are used in regex pattern Change-Id: I67edfbc00fbb828db778bfa6b832d7e1fd424cfa --- .werks/7007 | 11 +++++++++ checks/eval_regex.include | 31 +++++++++++++++++++++++++ checks/fileinfo | 2 +- checks/logwatch | 2 +- checks/ps.include | 54 ++++++++++++++++++++------------------------ tests/unit/checks/test_ps.py | 23 +++++++++++++++---- 6 files changed, 86 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3798208ad0…

5 years, 8 months

Fixed 'TypeError' in SNMP datasource

by Simon Betz

Module: check_mk Branch: master Commit: f837247d94e6caf891ae81d916a8f3f685b52fe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f837247d94e6ca… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 16 17:23:45 2019 +0100 Fixed 'TypeError' in SNMP datasource Change-Id: Ifb1daf7396050150d587f2ee6056dfc0a59684d9 --- cmk_base/data_sources/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index a0ec428..dd8b51e 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -195,7 +195,7 @@ class SNMPDataSource(DataSource): # This checks data is configured to be persisted (snmp_check_interval) and recent enough. # Skip gathering new data here. The persisted data will be added latera - if section_name in self._persisted_sections: + if self._persisted_sections and section_name in self._persisted_sections: self._logger.debug( "%s: Skip fetching data (persisted info exists)" % (check_plugin_name)) continue

5 years, 8 months

Improved get_inventory integration test.

by Sven Panne

Module: check_mk Branch: master Commit: e250ae07f6b20813c1ac6b9f3e7cb5894baebc09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e250ae07f6b208… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 16 15:21:54 2019 +0100 Improved get_inventory integration test. Change-Id: Ib334b6df50547d8c440ab35bc89589d3d4de826b --- tests/integration/cmk/gui/test_webapi.py | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 6e7eee5..ae95a23 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -762,14 +762,31 @@ def test_get_graph_hover(web, graph_test_config): def test_get_inventory(web): + host_name = "test-host" + inventory_dir = "var/check_mk/inventory" try: - web.add_host( - "test-host", attributes={ - "ipaddress": "127.0.0.1", - }) + web.add_host(host_name, attributes={"ipaddress": "127.0.0.1"}) + # NOTE: Deleting the host deletes the file, too. + web.site.makedirs(inventory_dir) + web.site.write_file( + os.path.join(inventory_dir, host_name), + "{'hardware': {'memory': {'ram': 10000, 'foo': 1}, 'blubb': 42}}") + + inv = web.get_inventory([host_name]) + assert inv[host_name] == { + u'hardware': { + u'memory': { + u'foo': 1, + u'ram': 10000 + }, + u'blubb': 42 + } + } - inv = web.get_inventory(["test-host"]) + inv = web.get_inventory([host_name], paths=['.hardware.memory.']) + assert inv[host_name] == {u'hardware': {u'memory': {u'foo': 1, u'ram': 10000}}} - assert inv["test-host"] == {} + inv = web.get_inventory([host_name], paths=['.hardware.mumpf.']) + assert inv[host_name] == {} finally: - web.delete_host("test-host") + web.delete_host(host_name)

5 years, 8 months

vsphere: make rule option "Additional display snapshots on" optional

by Florian Kromer

Module: check_mk Branch: master Commit: 561fdb46c91ab5a9129899b7ed25cd258e053a1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561fdb46c91ab5… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Jan 16 13:07:56 2019 +0100 vsphere: make rule option "Additional display snapshots on" optional CMK-1491 Change-Id: I2901f9405f7c13071993e960442c18cefd60eda4 --- cmk/gui/plugins/wato/datasource_programs.py | 51 ++++++++++++++--------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index e091740..b2dd7b9 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -24,43 +24,41 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import cmk.gui.bi as bi import cmk.gui.watolib as watolib -from cmk.gui.i18n import _ from cmk.gui.exceptions import MKUserError +from cmk.gui.i18n import _ +from cmk.gui.plugins.wato import ( + IndividualOrStoredPassword, + RulespecGroup, + monitoring_macro_help, + register_rule, + rulespec_group_registry, +) from cmk.gui.valuespec import ( - HTTPUrl, - ListChoice, + ID, + Alternative, + CascadingDropdown, Checkbox, - ListOf, - FixedValue, Dictionary, - Integer, - TextAscii, - Password, - Alternative, - ListOfStrings, DropdownChoice, - Transform, - TextUnicode, - Tuple, - ID, - CascadingDropdown, + FixedValue, Float, + HTTPUrl, + Integer, + ListChoice, + ListOf, + ListOfStrings, + MonitoringState, + Password, RegExp, RegExpUnicode, - MonitoringState, -) - -from cmk.gui.plugins.wato import ( - rulespec_group_registry, - RulespecGroup, - register_rule, - monitoring_macro_help, - IndividualOrStoredPassword, + TextAscii, + TextUnicode, + Transform, + Tuple, ) -import cmk.gui.bi as bi - @rulespec_group_registry.register class RulespecGroupDatasourcePrograms(RulespecGroup): @@ -293,6 +291,7 @@ register_rule( "timeout", "vm_pwr_display", "host_pwr_display", + "snapshot_display", "vm_piggyname", ], ),

5 years, 8 months

lnx_thermal: Consider all possible trip points

by Florian Kromer

Module: check_mk Branch: master Commit: ab8068a5a45249acea4b6e619cf70eaab069443d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab8068a5a45249… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Jan 14 09:59:25 2019 +0100 lnx_thermal: Consider all possible trip points CMK-1506 Change-Id: Idd1c2fdbdd081c9124898e4c9a5c0e3cc734021d --- checks/lnx_thermal | 120 +++++++++++++-------- .../checks/generictests/datasets/lnx_thermal.py | 30 +++++- tests/unit/checks/test_lnx_thermal.py | 15 ++- 3 files changed, 112 insertions(+), 53 deletions(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 356fecf..f165b68 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -41,57 +41,87 @@ factory_settings["lnx_thermal_default_levels"] = { } -@discover -def inventory_lnx_thermal(line): - return line[0].replace('thermal_zone', 'Zone ') - - -def check_lnx_thermal(item, params, info): +def parse_lnx_thermal(info): + """ + Supported format: + - Temperature is either the 3rd or 4th element in an info row. + - After temperature follows pairwise trip point temperature and trip point type. + - Considered trip points are critical, passive, hot. + - A known, not considered trip point is active. + - In case trip point values are 0 or negative (known default values) they are ignored. + """ + if not info: + return {} + parsed = {} for line in info: - if line[0].replace('thermal_zone', 'Zone ') == item or\ - line[0].replace('thermal_zone', '') == item: - # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive'] - - # Some devices report an empty value for the 3rd field (type). Trying to fix those lines. - # -> thermal_zone1 pkg-temp-0 44000 0 passive 0 passive - try: - int(line[2]) - int(line[3]) - line = line[:2] + [''] + line[2:] - except: - pass # -> regular line - - # convert values from millidegree - temp = int(line[3]) / 1000.0 - - # parse trip points - dev_warn = None - dev_crit = None - if len(line) > 4: - trip_points = dict(zip(line[5::2], [int(x) / 1000.0 for x in line[4::2]])) - for tp_name, level in trip_points.iteritems(): - # ignore active cooling device trip points (means enabling a fan or similar) - if tp_name == 'active': - continue - if level != 0: - if tp_name in ['hot', 'critical']: - dev_crit = level - else: - dev_warn = level - - # If only one relevant trip point is found, use that for both warn and crit - if (dev_warn is not None) != (dev_crit is not None): - dev_warn = dev_crit = max(dev_warn, dev_crit) - - if dev_warn and dev_crit: - dev_levels = (dev_warn, dev_crit) + zone_identifier = 0 + temperature_3rd_element_idx = 2 + temperature_4th_element_idx = 3 + temperature_factor = 1000.0 + zone_raw = line[zone_identifier] + try: + int(line[temperature_3rd_element_idx]) # may raise an exception + temperature = int(line[temperature_3rd_element_idx]) / temperature_factor + trip_points = dict(zip(line[4::2], [int(x) / temperature_factor for x in line[3::2]])) + except ValueError: + temperature = int(line[temperature_4th_element_idx]) / temperature_factor + trip_points = dict(zip(line[5::2], [int(x) / temperature_factor for x in line[4::2]])) + zone_formatted = zone_raw.replace('thermal_zone', 'Zone ') + parsed[zone_formatted] = {} + temperature_and_trip_points = ('temperature', 'passive', 'critical', 'hot') + for key in temperature_and_trip_points: + parsed[zone_formatted].setdefault(key, None) + parsed[zone_formatted]['temperature'] = temperature + for tp_name, tp_value in trip_points.items(): + if tp_name in trip_points and tp_value > 0: + parsed[zone_formatted][tp_name] = tp_value else: - dev_levels = None + # ignore trip point types not supported yet + pass + return parsed + + +def inventory_lnx_thermal(parsed): + for item in parsed.keys(): + yield item, {} + + +def check_lnx_thermal(item, params, parsed): + """ + - Trip points hot and critical are considered for the device crit level. In case both trip + points are given the lower value is considered for the device crit level. + - Trip point passive is considered for the device warn level. + - In case both hot and critical trip points are given the lower trip point value + is considered for the device crit level. + - Trip point temperatures are provided via performance data. + """ + temperature = parsed.get(item).get('temperature') + warn_level = parsed.get(item).get('passive') + hot_value = parsed.get(item).get('hot') + critical_value = parsed.get(item).get('critical') + + if not temperature: + return 3, "Item not found or invalid agent data." + + if hot_value and critical_value: + crit_level = min(hot_value, critical_value) + else: + crit_level = hot_value or critical_value + + if not crit_level or not warn_level: + crit_level = crit_level or warn_level + warn_level = warn_level or crit_level + + if warn_level and crit_level: + levels = (warn_level, crit_level) + else: + levels = None - return check_temperature(temp, params, "lnx_thermal_%s" % item, dev_levels=dev_levels) + return check_temperature(temperature, params, "lnx_thermal_%s" % item, dev_levels=levels) check_info['lnx_thermal'] = { + "parse_function": parse_lnx_thermal, "inventory_function": inventory_lnx_thermal, "check_function": check_lnx_thermal, "service_description": "Temperature %s", diff --git a/tests/unit/checks/generictests/datasets/lnx_thermal.py b/tests/unit/checks/generictests/datasets/lnx_thermal.py index a8838ce..cc54922 100644 --- a/tests/unit/checks/generictests/datasets/lnx_thermal.py +++ b/tests/unit/checks/generictests/datasets/lnx_thermal.py @@ -2,9 +2,21 @@ checkname = 'lnx_thermal' info = [['thermal_zone0', 'enabled', 'acpitz', '57000', '127000', 'critical'], ['thermal_zone1', 'enabled', 'acpitz', '65000', '100000', 'critical', '95500', 'passive'], - ['thermal_zone2', 'pkg-temp-0', '44000', '0', 'passive', '0', 'passive']] + ['thermal_zone2', 'pkg-temp-0', '44000', '0', 'passive', '0', 'passive'], + [ + 'thermal_zone3', '-', 'TSKN', '48000', '0', 'passive', '0', 'passive', '127000', + 'critical', '87000', 'hot', '77000', 'passive', '127000', 'active' + ], ['thermal_zone4', '-', 'INT3400 Thermal', '20000'], + [ + 'thermal_zone5', '-', 'iwlwifi', '27000', '-32768000', 'passive', '-32768000', + 'passive', '-32768000', 'passive', '-32768000', 'passive', '-32768000', 'passive', + '-32768000', 'passive', '-32768000', 'passive', '-32768000', 'passive' + ]] -discovery = {'': [('Zone 0', {}), ('Zone 1', {}), ('Zone 2', {})]} +discovery = { + '': [('Zone 0', {}), ('Zone 1', {}), ('Zone 2', {}), ('Zone 3', {}), ('Zone 4', {}), + ('Zone 5', {})] +} checks = { '': [('Zone 0', { @@ -18,5 +30,17 @@ checks = { ('Zone 2', { 'device_levels_handling': 'devdefault', 'levels': (70.0, 80.0) - }, [(0, u'44.0 \xb0C', [('temp', 44.0, 70.0, 80.0, None, None)])])] + }, [(0, u'44.0 \xb0C', [('temp', 44.0, 70.0, 80.0, None, None)])]), + ('Zone 3', { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, [(0, u'48.0 \xb0C', [('temp', 48.0, 77.0, 87.0, None, None)])]), + ('Zone 4', { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, [(0, u'20.0 \xb0C', [('temp', 20.0, 70.0, 80.0, None, None)])]), + ('Zone 5', { + 'device_levels_handling': 'devdefault', + 'levels': (70.0, 80.0) + }, [(0, u'27.0 \xb0C', [('temp', 27.0, 70.0, 80.0, None, None)])])] } diff --git a/tests/unit/checks/test_lnx_thermal.py b/tests/unit/checks/test_lnx_thermal.py index 49497d4..bbbbee9 100644 --- a/tests/unit/checks/test_lnx_thermal.py +++ b/tests/unit/checks/test_lnx_thermal.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals + import pytest +from checktestlib import DiscoveryResult, assertDiscoveryResultsEqual + # Mark all tests in this file as check related tests pytestmark = pytest.mark.checks - def splitter(text, split_symbol=None): return [line.split(split_symbol) for line in text.split("\n")] @@ -27,9 +29,11 @@ result_discovery = [[('Zone %s' % i, {}) for i in [0, 1, 3, 5]], @pytest.mark.parametrize("info, result", zip(agent_info, result_discovery)) -def test_parse(check_manager, info, result): +def test_parse_and_discovery_function(check_manager, info, result): check = check_manager.get_check("lnx_thermal") - assert list(check.run_discovery(info)) == result + parsed = check.run_parse(info) + discovery = DiscoveryResult(check.run_discovery(parsed)) + assertDiscoveryResultsEqual(check, discovery, DiscoveryResult(result)) result_check = [ @@ -50,7 +54,8 @@ result_check = [ @pytest.mark.parametrize("info, discovered, checked", zip(agent_info, result_discovery, result_check)) -def test_parse(check_manager, info, discovered, checked): +def test_check_functions_perfdata(check_manager, info, discovered, checked): check = check_manager.get_check("lnx_thermal") + parsed = check.run_parse(info) for (item, params), result in zip(discovered, checked): - assert check.run_check(item, params, info) == result + assert check.run_check(item, {}, parsed) == result

5 years, 8 months

Cleaned up some redefined-outer-name findings

by Lars Michelsen

Module: check_mk Branch: master Commit: c76cc5dd9aefcaab99e74ba4bc956ac8a535132d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c76cc5dd9aefca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 14 23:03:01 2019 +0100 Cleaned up some redefined-outer-name findings Change-Id: If622177fc9d3e645fcd4b0fd009a53cb6adc44bc --- active_checks/check_bi_aggr | 10 +- active_checks/check_cpu_peaks | 6 +- active_checks/check_form_submit | 14 +- active_checks/check_mail | 16 +- active_checks/check_mail_loop | 16 +- active_checks/check_mailboxes | 6 +- active_checks/check_traceroute | 19 +- active_checks/check_uniserv | 4 +- agents/plugins/apache_status | 22 +- agents/plugins/mk_sap | 55 +- agents/plugins/mtr | 30 +- agents/plugins/nginx_status | 24 +- agents/plugins/plesk_backups | 18 +- agents/special/agent_ddn_s2a | 10 +- agents/special/agent_hivemanager | 4 +- agents/special/agent_innovaphone | 16 +- agents/special/agent_ucs_bladecenter | 10 +- agents/special/agent_vsphere | 39 +- bin/mkbackup | 26 +- cmk/ec/main.py | 12 +- cmk/gui/config.py | 14 +- cmk/gui/plugins/metrics/check_mk.py | 738 ++++++++++++++----------- cmk/gui/plugins/views/icons/__init__.py | 4 +- cmk/gui/plugins/wato/ac_tests.py | 6 +- cmk/gui/plugins/wato/check_mk_configuration.py | 4 +- cmk/gui/wato/pages/services.py | 2 - cmk/gui/watolib/activate_changes.py | 12 +- cmk/gui/watolib/config_domains.py | 57 +- cmk/gui/watolib/host_attributes.py | 6 +- cmk/gui/watolib/snapshots.py | 1 - livestatus/api/python/livestatus.py | 2 +- 31 files changed, 635 insertions(+), 568 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c76cc5dd9a…

5 years, 8 months

Introduce HW/SW inventory web API call.

by Sven Panne

Module: check_mk Branch: master Commit: c03e54a0d7a0ecd943973e1c60a29674439dabb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c03e54a0d7a0ec… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jan 14 16:17:35 2019 +0100 Introduce HW/SW inventory web API call. CMK-1404 Change-Id: I0a707bdd2360048fe13c4719418c994af15fa880 --- cmk/gui/inventory.py | 6 ++-- cmk/gui/plugins/webapi/inventory.py | 55 ++++++++++++++++++++++++++++++++ tests/integration/cmk/gui/test_webapi.py | 14 ++++++++ tests/testlib/__init__.py | 17 ++++++++++ tests/unit/cmk/gui/test_webapi_unit.py | 3 +- 5 files changed, 91 insertions(+), 4 deletions(-) diff --git a/cmk/gui/inventory.py b/cmk/gui/inventory.py index 0df4855..daa600c 100644 --- a/cmk/gui/inventory.py +++ b/cmk/gui/inventory.py @@ -380,14 +380,14 @@ def page_host_inv_api(): if hosts: result = {} for host_name in hosts: - result[host_name] = _inventory_of_host(host_name, request) + result[host_name] = inventory_of_host(host_name, request) else: host_name = request.get("host") if host_name is None: raise MKUserError("host", _("You need to provide a \"host\".")) - result = _inventory_of_host(host_name, request) + result = inventory_of_host(host_name, request) if not result and not has_inventory(host_name): raise MKGeneralException(_("Found no inventory data for this host.")) @@ -417,7 +417,7 @@ def has_inventory(hostname): return os.path.exists(inventory_path) -def _inventory_of_host(host_name, request): +def inventory_of_host(host_name, request): site = request.get("site") if not _may_see(host_name, site): raise MKAuthException(_("Sorry, you are not allowed to access the host %s.") % host_name) diff --git a/cmk/gui/plugins/webapi/inventory.py b/cmk/gui/plugins/webapi/inventory.py new file mode 100644 index 0000000..992a1f6 --- /dev/null +++ b/cmk/gui/plugins/webapi/inventory.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# .------------------------------------------------------------------------. +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | |_____| | +# | _____ _ _ | +# | | ____|_ __ | |_ ___ _ __ _ __ _ __(_)___ ___ | +# | | _| | '_ \| __/ _ \ '__| '_ \| '__| / __|/ _ \ | +# | | |___| | | | || __/ | | |_) | | | \__ \ __/ | +# | |_____|_| |_|\__\___|_| | .__/|_| |_|___/\___| | +# | |_| | +# | _____ _ _ _ _ | +# | | ____|__| (_) |_(_) ___ _ __ | +# | | _| / _` | | __| |/ _ \| '_ \ | +# | | |__| (_| | | |_| | (_) | | | | | +# | |_____\__,_|_|\__|_|\___/|_| |_| | +# | | +# | mathias-kettner.com mathias-kettner.de | +# '------------------------------------------------------------------------' +# This file is part of the Check_MK Enterprise Edition (CEE). +# Copyright by Mathias Kettner and Mathias Kettner GmbH. All rights reserved. +# +# Distributed under the Check_MK Enterprise License. +# +# You should have received a copy of the Check_MK Enterprise License +# along with Check_MK. If not, email to mk(a)mathias-kettner.de +# or write to the postal address provided at www.mathias-kettner.de + +from cmk.gui.inventory import inventory_of_host + +from cmk.gui.plugins.webapi import ( + api_call_collection_registry, + APICallCollection, +) + + +(a)api_call_collection_registry.register +class APICallInventory(APICallCollection): + def get_api_calls(self): + return { + "get_inventory": { + "handler": self._get_inventory, + "required_keys": ["hosts"], + "optional_keys": ["site", "paths"], + "locking": False, + } + } + + def _get_inventory(self, request): + return {host_name: inventory_of_host(host_name, request) \ + for host_name in request.get("hosts")} diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 3940a7f..f844d23 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -745,3 +745,17 @@ def test_get_graph_hover(web, graph_test_config): assert curve_value["rendered_value"][1] == "n/a" #assert isinstance(curve_value["rendered_value"][0], (int, float)) #assert curve_value["rendered_value"][1] != "" + + +def test_get_inventory(web): + try: + web.add_host( + "test-host", attributes={ + "ipaddress": "127.0.0.1", + }) + + inv = web.get_inventory(["test-host"]) + + assert inv["test-host"] == {} + finally: + web.delete_host("test-host") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 4afd1e4..44cb4f2 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1684,6 +1684,23 @@ class CMKWebSession(WebSession): return result + def get_inventory(self, hosts, site=None, paths=None): + request = { + "hosts": hosts, + } + if site is not None: + request["site"] = site + if paths is not None: + request["paths"] = paths + result = self._api_request("webapi.py?action=get_inventory", { + "request": json.dumps(request), + }) + + assert isinstance(result, dict) + for host in hosts: + assert isinstance(result[host], dict) + return result + class CMKEventConsole(CMKWebSession): def __init__(self, site): diff --git a/tests/unit/cmk/gui/test_webapi_unit.py b/tests/unit/cmk/gui/test_webapi_unit.py index 6b5ad6d..15305f6 100644 --- a/tests/unit/cmk/gui/test_webapi_unit.py +++ b/tests/unit/cmk/gui/test_webapi_unit.py @@ -1,4 +1,4 @@ -# Needed to make the test load all webapi plugins (incl. CEE) +# force loading of web API plugins import cmk.gui.webapi # pylint: disable=unused-import from cmk.gui.plugins.webapi.utils import api_call_collection_registry @@ -46,6 +46,7 @@ def test_registered_api_call_collections(): 'get_graph', 'get_host', 'get_hosttags', + 'get_inventory', 'get_ruleset', 'get_rulesets_info', 'get_site',

5 years, 8 months

Various tiny fixes/improvements for stuff related to web API tests.

by Sven Panne

Module: check_mk Branch: master Commit: 200a7041a897d92a4c91ac31454d27ffd7d96e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=200a7041a897d9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 16 10:58:45 2019 +0100 Various tiny fixes/improvements for stuff related to web API tests. Change-Id: Ieef3b4fc2dc5523d421ee7d074d7478caebeae95 --- tests/integration/cmk/gui/test_webapi.py | 148 +++++++++++++++++-------------- tests/testlib/__init__.py | 5 +- 2 files changed, 84 insertions(+), 69 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index f844d23..6e7eee5 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -1,14 +1,15 @@ #!/usr/bin/env python # encoding: utf-8 -import pytest -import time -import os -import json import base64 import copy -from PIL import Image +import json +import os from StringIO import StringIO +import time + +import pytest +from PIL import Image import cmk from testlib import web, APIError # pylint: disable=unused-import @@ -31,16 +32,17 @@ def test_add_host(web): def test_add_host_folder_create(web): - web.add_host( - "test-host", - attributes={ - "ipaddress": "127.0.0.1", - }, - create_folders=True, - folder="asd/eee", - ) - - web.delete_host("test-host") + try: + web.add_host( + "test-host", + attributes={ + "ipaddress": "127.0.0.1", + }, + create_folders=True, + folder="asd/eee", + ) + finally: + web.delete_host("test-host") def test_add_host_no_folder_create(web): @@ -188,13 +190,17 @@ def test_get_all_sites(web, site): assert site.id in response["sites"] -(a)pytest.mark.parametrize("sock_spec", [ - "tcp:1.2.3.4:6557", - ("tcp", { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }), -]) +(a)pytest.mark.parametrize( + "sock_spec", + [ + "tcp:1.2.3.4:6557", + ( + "tcp", + { + "address": ("1.2.3.4", 6557), + #"tls": ("plain_text", {}), + }), + ]) def test_set_site(web, site, sock_spec): original_site = web.get_site(site.id) assert site.id == original_site["site_id"] @@ -204,10 +210,12 @@ def test_set_site(web, site, sock_spec): new_site_config["socket"] = sock_spec expected_site_config = copy.deepcopy(original_site["site_config"]) - expected_site_config["socket"] = ("tcp", { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }) + expected_site_config["socket"] = ( + "tcp", + { + "address": ("1.2.3.4", 6557), + #"tls": ("plain_text", {}), + }) try: web.set_site(new_site_id, new_site_config) @@ -223,13 +231,17 @@ def test_set_site(web, site, sock_spec): web.delete_site(new_site_id) -(a)pytest.mark.parametrize("sock_spec", [ - "tcp:1.2.3.4:6557", - ("tcp", { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }), -]) +(a)pytest.mark.parametrize( + "sock_spec", + [ + "tcp:1.2.3.4:6557", + ( + "tcp", + { + "address": ("1.2.3.4", 6557), + #"tls": ("plain_text", {}), + }), + ]) def test_set_all_sites(web, site, sock_spec): response = web.get_all_sites() del response["configuration_hash"] @@ -240,10 +252,12 @@ def test_set_all_sites(web, site, sock_spec): new_site_config["socket"] = sock_spec expected_site_config = copy.deepcopy(copy.deepcopy(response["sites"][site.id])) - expected_site_config["socket"] = ("tcp", { - "address": ("1.2.3.4", 6557), - #"tls": ("plain_text", {}), - }) + expected_site_config["socket"] = ( + "tcp", + { + "address": ("1.2.3.4", 6557), + #"tls": ("plain_text", {}), + }) response["sites"][new_site_id] = new_site_config @@ -326,7 +340,7 @@ def test_add_group(web, group_type): assert group_alias == all_groups[group_id]["alias"] if cmk.is_managed_edition(): - assert provider == all_groups[group_id]["provider"] + assert all_groups[group_id]["provider"] == "provider" finally: all_groups = web.get_all_groups(group_type) if group_id in all_groups: @@ -355,7 +369,7 @@ def test_edit_group(web, group_type): assert group_alias2 == all_groups[group_id]["alias"] if cmk.is_managed_edition(): - assert "provider" == all_groups[group_id]["customer"] + assert all_groups[group_id]["customer"] == "provider" finally: web.delete_group(group_type, group_id) @@ -442,7 +456,7 @@ def test_get_all_users(web): } expected_users = set(["cmkadmin", "automation"] + users.keys()) try: - response = web.add_htpasswd_users(users) + _response = web.add_htpasswd_users(users) all_users = web.get_all_users() assert not expected_users - set(all_users.keys()) finally: @@ -494,7 +508,6 @@ def test_edit_htpasswd_users(web): assert all_users["monroe"]["alias"] == "ms. monroe" finally: web.delete_htpasswd_users(users.keys()) - pass def test_discover_servics(web): @@ -532,33 +545,34 @@ def graph_test_config(web, site): web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) assert "Cannot calculate graph recipes" in "%s" % e - # Now add the host - web.add_host( - "test-host-get-graph", attributes={ - "ipaddress": "127.0.0.1", - }) - web.discover_services("test-host-get-graph") - web.activate_changes() - site.schedule_check("test-host-get-graph", "Check_MK", 0) + try: + # Now add the host + web.add_host( + "test-host-get-graph", attributes={ + "ipaddress": "127.0.0.1", + }) + web.discover_services("test-host-get-graph") + web.activate_changes() + site.schedule_check("test-host-get-graph", "Check_MK", 0) - # Wait for RRD file creation - # Isn't this a bug that the graph is not instantly available? - timeout = 10 - print "Checking for graph..." - while timeout and not site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"): - try: - web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) - except Exception: - pass - timeout -= 1 - time.sleep(1) + # Wait for RRD file creation + # Isn't this a bug that the graph is not instantly available? + timeout = 10 print "Checking for graph..." - assert site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"), \ - "RRD %s is still missing" % "var/check_mk/rrd/test-host-get-graph/Check_MK.rrd" - - yield - - web.delete_host("test-host-get-graph") + while timeout and not site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"): + try: + web.get_regular_graph("test-host-get-graph", "Check_MK", 0, expect_error=True) + except Exception: + pass + timeout -= 1 + time.sleep(1) + print "Checking for graph..." + assert site.file_exists("var/check_mk/rrd/test-host-get-graph/Check_MK.rrd"), \ + "RRD %s is still missing" % "var/check_mk/rrd/test-host-get-graph/Check_MK.rrd" + + yield + finally: + web.delete_host("test-host-get-graph") web.activate_changes() @@ -605,7 +619,7 @@ def test_get_graph_notification_image(web, graph_test_config): # Provides a json list containing base64 encoded PNG images of the current 24h graphs encoded_graph_list = json.loads(result.text) - assert type(encoded_graph_list) == list + assert isinstance(encoded_graph_list, list) assert len(encoded_graph_list) > 0 for encoded_graph_image in encoded_graph_list: diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 44cb4f2..beb556e 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -72,10 +72,11 @@ def current_branch_name(): def get_cmk_download_credentials(): + cred = "%s/.cmk-credentials" % os.environ["HOME"] try: - return tuple(file("%s/.cmk-credentials" % os.environ["HOME"]).read().strip().split(":")) + return tuple(file(cred).read().strip().split(":")) except IOError: - raise Exception("Missing ~/.cmk-credentials file (Create with content: USER:PASSWORD)") + raise Exception("Missing %s file (Create with content: USER:PASSWORD)" % cred) def wait_until(condition, timeout=1, interval=0.1):

5 years, 8 months

lparstat_aix: bring back legacy default levels

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0773a54f1505d4dab6a34910fca70e2af4bb03eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0773a54f1505d4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 16 07:15:51 2019 +0100 lparstat_aix: bring back legacy default levels Change-Id: I0aefb3402e9d1073b81fa3071889e659e33cb1c8 --- checks/lparstat_aix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/checks/lparstat_aix b/checks/lparstat_aix index b1ae2f0..d6faaec 100644 --- a/checks/lparstat_aix +++ b/checks/lparstat_aix @@ -30,6 +30,10 @@ # | Joerg Linge 2009 <joerg.linge(a)pnp4nagios.org> Copyright 2010 | # +------------------------------------------------------------------+ +# Legacy default params for services discovered before 1.6 +lparstat_default_levels = {} +kernel_util_default_levels = {} + def parse_lparstat_aix(info): if not info:

5 years, 8 months

caching.py: minor performance improvements

by Andreas Boesl

Module: check_mk Branch: master Commit: 8f51c35c1cf0e5191dce75cefa352d30b915bf6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f51c35c1cf0e5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 16 10:32:15 2019 +0100 caching.py: minor performance improvements Change-Id: Ic0deead0258365682b4bb73a311bff2d6e48dc4e --- cmk_base/caching.py | 60 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/cmk_base/caching.py b/cmk_base/caching.py index eb553e2..fa2de29 100644 --- a/cmk_base/caching.py +++ b/cmk_base/caching.py @@ -87,41 +87,43 @@ class Cache(object): self._populated = False -# Just a small wrapper round a dict to get some caching specific functionality -# for analysis etc. class DictCache(dict, Cache): - def __init__(self, *args, **kwargs): - super(DictCache, self).__init__(*args, **kwargs) - self._num_hits = 0 - self._num_misses = 0 - self._num_sets = 0 - - def __getitem__(self, y): - try: - result = super(DictCache, self).__getitem__(y) - self._num_hits += 1 - return result - except KeyError: - self._num_misses += 1 - raise - - def __setitem__(self, i, y): - self._num_sets += 1 - super(DictCache, self).__setitem__(i, y) - - def get_stats(self): - return { - "sets": self._num_sets, - "hits": self._num_hits, - "misses": self._num_misses, - "items": len(self), - } - def clear(self): super(DictCache, self).clear() self.set_not_populated() +## Just a small wrapper round a dict to get some caching specific functionality +## for analysis etc. +#class DictCacheStats(DictCache): +# def __init__(self, *args, **kwargs): +# super(DictCacheStats, self).__init__(*args, **kwargs) +# self._num_hits = 0 +# self._num_misses = 0 +# self._num_sets = 0 +# +# def __getitem__(self, y): +# try: +# result = super(DictCacheStats, self).__getitem__(y) +# self._num_hits += 1 +# return result +# except KeyError: +# self._num_misses += 1 +# raise +# +# def __setitem__(self, i, y): +# self._num_sets += 1 +# super(DictCacheStats, self).__setitem__(i, y) +# +# def get_stats(self): +# return { +# "sets": self._num_sets, +# "hits": self._num_hits, +# "misses": self._num_misses, +# "items": len(self), +# } + + class SetCache(set, Cache): def clear(self): super(SetCache, self).clear()

5 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019