Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6895 FIX hp_msa_volume: Use volume-name as item identifier

by Florian Kromer

Module: check_mk Branch: master Commit: 6ecd3d28ecff8dc92d3df8b5d995c3e8d87e9f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ecd3d28ecff8d… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Nov 19 15:37:58 2018 +0100 6895 FIX hp_msa_volume: Use volume-name as item identifier Previously the durable-id has been used as identifier of items for the check hp_msa_volume (and its sub checks io and df). The durable-id is not guaranteed to be unique for different controllers of a volume. This werk changes the unique identifier for items from durable-id to volume-name. As soon as a discovery is executed the hp_msa_volume check items appear volume-name. CMK-1129 Change-Id: I72c5630d6c3bdbbadd85bb0a9ba920da69f60c01 --- .werks/6895 | 16 + checks/hp_msa_volume | 73 ++-- .../datasets/hp_msa_volume_regression.py | 394 ++------------------- tests/unit/checks/test_hp_msa_volume.py | 138 ++++++++ 4 files changed, 232 insertions(+), 389 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6ecd3d28ec…

5 years, 12 months

6754 FIX if_lancom: Fixed correct interface discovery for newer lancom router

by Marcel Arentz

Module: check_mk Branch: master Commit: ee9bb1f0cc6b23926a14ed3f5fab4d3b4e874fb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee9bb1f0cc6b23… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Nov 22 11:18:42 2018 +0100 6754 FIX if_lancom: Fixed correct interface discovery for newer lancom router Newer lancom devices to not authenticate himself as a lancom device in the snmp info. This is fixed for now, so the sepcial check plugin for lancom interfaces are working correctly again. This change concerns at least the R800V series and a rediscovery may be needed. Change-Id: I9fea100a0d777f23c54d3bb72543e17d82a1f1bc --- .werks/6754 | 14 ++++++++++++++ checks/if_lancom | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6754 b/.werks/6754 new file mode 100644 index 0000000..93a046c --- /dev/null +++ b/.werks/6754 @@ -0,0 +1,14 @@ +Title: if_lancom: Fixed correct interface discovery for newer lancom router +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1542881754 +Class: fix + +Newer lancom devices to not authenticate himself as a lancom device in the +snmp info. This is fixed for now, so the sepcial check plugin for lancom +interfaces are working correctly again. + +This change concerns at least the R800V series and a rediscovery may be needed. diff --git a/checks/if_lancom b/checks/if_lancom index 61f8d0c..9b363ce 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -95,7 +95,8 @@ check_info["if_lancom"] = { ], # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 'snmp_scan_function': lambda oid: ("LANCOM" in oid(".1.3.6.1.2.1.1.1.0") or "ELSA" in oid( - ".1.3.6.1.2.1.1.1.0") or "T-Systems" in oid(".1.3.6.1.2.1.1.1.0")) and (not if64_disabled( + ".1.3.6.1.2.1.1.1.0") or "T-Systems" in oid(".1.3.6.1.2.1.1.1.0")) or "LAN R800V" in oid( + ".1.3.6.1.2.1.1.1.0") and (not if64_disabled( host_name())) and oid(".1.3.6.1.2.1.31.1.1.1.6.*") is not None, 'group': 'if', 'default_levels_variable': 'if_default_levels',

5 years, 12 months

[FEED-3048] - fixed crash when output contains "out-of-range" UTF-16 chars

by Sergey Kipnis

Module: check_mk Branch: master Commit: c996562c08bd56b96d6462a8f02d770bdd6222ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c996562c08bd56… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Nov 20 16:58:32 2018 +0100 [FEED-3048] - fixed crash when output contains "out-of-range" UTF-16 chars - extended error info - fixed potential crash in wmi section 6863 FIX Fixed crash in Windows Agent on MS Exchange Servers Some Windows checks may produce invalid UTF-16 symbols or symbols which are difficult to convert into UTF-8. Now the lines containing such symbols are removed from Windows Agent output. Change-Id: I93fd856fa3176b91e27274d72df8b3419dc07e1d --- .werks/6863 | 12 ++++++++++++ agents/windows/sections/SectionPS.cc | 26 +++++++++++++++++--------- agents/windows/sections/SectionWinperf.cc | 18 +++++++++++++----- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/.werks/6863 b/.werks/6863 new file mode 100644 index 0000000..76d04b4 --- /dev/null +++ b/.werks/6863 @@ -0,0 +1,12 @@ +Title: Fixed crash in Windows Agent on MS Exchange Servers +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542729746 +Class: fix + +Some Windows checks may produce invalid UTF-16 symbols or symbols +which are difficult to convert into UTF-8. Now the lines containing such symbols +are removed from Windows Agent output. diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index f00af66..1d6098b 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -260,15 +260,23 @@ bool SectionPS::outputWMI(std::ostream &out) { load_uint32(L"PagefileUsage"); // according to MSDN ThreadCount // is 32 bit UNSIGNED - outputProcess( - out, std::stoull(result.get<std::string>(L"VirtualSize")), - std::stoull(result.get<std::string>(L"WorkingSetSize")), - pagefile_usage, uptime, - std::stoull(result.get<std::wstring>(L"UserModeTime")), - std::stoull(result.get<std::wstring>(L"KernelModeTime")), - process_id, handle_count, thread_count, user, - to_utf8(process_name)); - + try { + outputProcess( + out, std::stoull(result.get<std::string>(L"VirtualSize")), + std::stoull(result.get<std::string>(L"WorkingSetSize")), + pagefile_usage, uptime, + std::stoull(result.get<std::wstring>(L"UserModeTime")), + std::stoull(result.get<std::wstring>(L"KernelModeTime")), + process_id, handle_count, thread_count, user, + to_utf8(process_name)); + + } catch (const std::range_error &e) { + // catch possible exception when UTF-16 is in not valid range + // for Linux toolchain, see FEED-3048 + Error(_logger) + << "Exception: " << e.what() + << " UTF-16 -> UTF-8 conversion error. Skipping line in PS."; + } more = result.next(); } return true; diff --git a/agents/windows/sections/SectionWinperf.cc b/agents/windows/sections/SectionWinperf.cc index a3d5662..766d173 100644 --- a/agents/windows/sections/SectionWinperf.cc +++ b/agents/windows/sections/SectionWinperf.cc @@ -60,12 +60,20 @@ bool SectionWinperf::produceOutputInner(std::ostream &out, counterObject.instances(); // output instances - if any if (instances.size() > 0) { - out << instances.size() << " instances:"; - for (std::wstring name : counterObject.instanceNames()) { - std::replace(name.begin(), name.end(), L' ', L'_'); - out << " " << Utf8(name); + try { + out << instances.size() << " instances:"; + for (std::wstring name : counterObject.instanceNames()) { + std::replace(name.begin(), name.end(), L' ', L'_'); + out << " " << Utf8(name); + } + out << "\n"; + } catch (const std::range_error &e) { + // catch possible exception when UTF-16 is in not valid + // range for Linux toolchain, see FEED-3048 + Error(_logger) + << "Exception: " << e.what() + << " UTF-16 -> UTF-8 conversion error. Skipping line Win Perf."; } - out << "\n"; } // output counters

5 years, 12 months

agent_vsphere: sort IDs and add FIXME

by Moritz Kiemer

Module: check_mk Branch: master Commit: cf64d8903e8576296e2eac55d395d67844e0cd0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf64d8903e8576… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Nov 21 10:58:47 2018 +0100 agent_vsphere: sort IDs and add FIXME This was the third time I have been looking for IDs in the unsorted mess. Change-Id: Iafb42583f230dc4c534a052709ee09b8c793f681 --- agents/special/agent_vsphere | 102 ++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 4be5696..560a4dc 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -706,74 +706,76 @@ def convert_hostname(h): def get_counters(esx_version_num): + # FIXME: (CMK-1346) The argument 'esx_version_num' is is a string now + # => the comparison below is broken, as + # >>> "6.7" > 7.1 + # True + # Not a Problem though -- invalid IDs seem to be ignored. + # So make this a simple global constant. needed_ids = [ + # disk.read/write/deviceLatency/numberRead/numberWrite + # 'disk.usage': 131073, + # 'disk.numberRead': 131076, + 131076, + # 'disk.numberWrite': 131077, + 131077, + # 'disk.read': 131078, + 131078, + 131079, + # 'disk.deviceReadLatency': 131083, + # 'disk.kernelReadLatency': 131084, + # 'disk.totalReadLatency': 131085, + # 'disk.queueReadLatency': 131086, + # 'disk.deviceWriteLatency': 131087, + # 'disk.kernelWriteLatency': 131088, + # 'disk.totalWriteLatency': 131089, + # 'disk.queueWriteLatency': 131090, + # 'disk.deviceLatency': 131091, + 131091, + # 'disk.kernelLatency': 131092, + # 'disk.totalLatency': 131093, + # 'disk.queueLatency': 131094, + # 'disk.maxTotalLatency': 131095, + # 'disk.maxQueueDepth': 131096, + # 'disk.numberReadAveraged': 131097, + # 'disk.numberWriteAveraged': 131098, # sys.uptime 262144, + # sys.resourceMem* + # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, # mem.* # 65635, 65537, 65577, 65625, 65545, 65611, 65573, 65615, 65582, # 65549, 65630, 65622, 65618, 65621, 65561, 65623, 65632, 65557, # 65628, 65633, 65541, 65643, 65586, 65553, 65569, 65589, 65639, # 65620, 65599, 65580, 65619, 65603, - # 'disk.deviceLatency': 131091, - # 'disk.deviceReadLatency': 131083, - # 'disk.deviceWriteLatency': 131087, - # 'disk.kernelLatency': 131092, - # 'disk.kernelReadLatency': 131084, - # 'disk.kernelWriteLatency': 131088, - # 'disk.maxQueueDepth': 131096, - # 'disk.maxTotalLatency': 131095, - # 'disk.numberRead': 131076, - # 'disk.numberReadAveraged': 131097, - # 'disk.numberWrite': 131077, - # 'disk.numberWriteAveraged': 131098, - # 'disk.queueLatency': 131094, - # 'disk.queueReadLatency': 131086, - # 'disk.queueWriteLatency': 131090, - # 'disk.read': 131078, - # 'disk.totalLatency': 131093, - # 'disk.totalReadLatency': 131085, - # 'disk.totalWriteLatency': 131089, - # 'disk.usage': 131073, # datastore counters - # 'datastore.datastoreIops': 655367, - # 'datastore.datastoreMaxQueueDepth': 655376, - # 'datastore.datastoreNormalReadLatency': 655372, - # 'datastore.datastoreNormalWriteLatency': 655373, - # 'datastore.datastoreReadBytes': 655368, - # 'datastore.datastoreReadIops': 655370, - # 'datastore.datastoreReadLoadMetric': 655377, - # 'datastore.datastoreReadOIO': 655374, - # 'datastore.datastoreWriteBytes': 655369, - # 'datastore.datastoreWriteIops': 655371, - # 'datastore.datastoreWriteLoadMetric': 655378, - # 'datastore.datastoreWriteOIO': 655375, - # 'datastore.maxTotalLatency': 655379, # 'datastore.numberReadAveraged': 655360, # 'datastore.numberWriteAveraged': 655361, # 'datastore.read': 655362, - # 'datastore.sizeNormalizedDatastoreLatency': 655366, - # 'datastore.totalReadLatency': 655364, - # 'datastore.totalWriteLatency': 655365, - # 'datastore.write': 655363, 655362, + # 'datastore.write': 655363, 655363, + # 'datastore.totalReadLatency': 655364, + # 'datastore.totalWriteLatency': 655365, + # 'datastore.sizeNormalizedDatastoreLatency': 655366, + 655366, + # 'datastore.datastoreIops': 655367, + # 'datastore.datastoreReadBytes': 655368, + # 'datastore.datastoreWriteBytes': 655369, + # 'datastore.datastoreReadIops': 655370, 655370, + # 'datastore.datastoreWriteIops': 655371, 655371, - 655366, - - # disk.read/write/deviceLatency/numberRead/numberWrite - 131078, - 131079, - 131091, - 131076, - 131077, + # 'datastore.datastoreNormalReadLatency': 655372, + # 'datastore.datastoreNormalWriteLatency': 655373, + # 'datastore.datastoreReadOIO': 655374, + # 'datastore.datastoreWriteOIO': 655375, + # 'datastore.datastoreMaxQueueDepth': 655376, + # 'datastore.datastoreReadLoadMetric': 655377, + # 'datastore.datastoreWriteLoadMetric': 655378, + # 'datastore.maxTotalLatency': 655379, ] - #needed_ids = [ - # # sys.resourceMem* - # 262151, 262155, 262169, 262152, 262154, 262153, 262157, 262156, 262168, - #] - # Seems as this is not available in ESX 5.0 but we saw it on 5.1 if esx_version_num > 5.0: # sys.resourceMemConsumed

5 years, 12 months

Refactoring: Extraction to independent functions

by Óscar Nájera

Module: check_mk Branch: master Commit: 3bf154bd1f7b3e83c555c352ea8eabc74da3befa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bf154bd1f7b3e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Nov 20 15:43:43 2018 +0100 Refactoring: Extraction to independent functions In cmk_base/prediction.py isolate and test - level_bounds_estimator - estimate_levels Change-Id: Ib3c98881d0445c45ffb1aac8c03235cea43eb058 --- cmk/gui/plugins/wato/utils/__init__.py | 16 ++++----- cmk_base/prediction.py | 61 +++++++++++++++++++++------------- tests/unit/cmk_base/test_prediction.py | 61 ++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 32 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index 4692cb6..c35fc37 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -906,14 +906,14 @@ def PredictiveLevels(**args): ])), ("stdev", _("In relation to standard deviation"), Tuple(elements=[ - Percentage( + Float( title=_("Warning at"), unit=_("times the standard deviation above the predicted value"), - default_value=2), - Percentage( + default_value=2.0), + Float( title=_("Critical at"), unit=_("times the standard deviation above the predicted value"), - default_value=4), + default_value=4.0), ])), ])), ("levels_upper_min", @@ -955,14 +955,14 @@ def PredictiveLevels(**args): ])), ("stdev", _("In relation to standard deviation"), Tuple(elements=[ - Percentage( + Float( title=_("Warning at"), unit=_("times the standard deviation below the predicted value"), - default_value=2), - Percentage( + default_value=2.0), + Float( title=_("Critical at"), unit=_("times the standard deviation below the predicted value"), - default_value=4), + default_value=4.0), ])), ])), ]) diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index 13bba2b..a260dec 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -297,31 +297,44 @@ def get_levels(hostname, service_description, dsname, params, cf, levels_factor= # print prediction.keys() reference = dict(zip(prediction["columns"], prediction["points"][index])) # print "Reference: %s" % reference + return estimate_levels(reference, params, levels_factor) + + +def estimate_levels(reference, params, levels_factor): ref_value = reference["average"] - stdev = reference["stdev"] - levels = [] if not ref_value: # No reference data available - levels = ((None, None), (None, None)) - else: - for what, sig in [("upper", 1), ("lower", -1)]: - p = "levels_" + what - if p in params: - how, (warn, crit) = params[p] - if how == "absolute": - this_levels = (ref_value + (sig * warn * levels_factor), - ref_value + (sig * crit * levels_factor)) - elif how == "relative": - this_levels = (ref_value + sig * (ref_value * warn / 100), - ref_value + sig * (ref_value * crit / 100)) - else: # how == "stdev": - this_levels = (ref_value + sig * (stdev * warn), - ref_value + sig * (stdev * crit)) - - if what == "upper" and "levels_upper_min" in params: - limit_warn, limit_crit = params["levels_upper_min"] - this_levels = (max(limit_warn, this_levels[0]), max(limit_crit, this_levels[1])) - levels.append(this_levels) - else: - levels.append((None, None)) + return ref_value, [(None, None), (None, None)] + stdev = reference["stdev"] + levels = [] + for what, sig in [("upper", 1), ("lower", -1)]: + p = "levels_" + what + if p in params: + this_levels = estimate_level_bounds(ref_value, stdev, sig, params[p], levels_factor) + + if what == "upper" and "levels_upper_min" in params: + limit_warn, limit_crit = params["levels_upper_min"] + this_levels = (max(limit_warn, this_levels[0]), max(limit_crit, this_levels[1])) + levels.append(this_levels) + else: + levels.append((None, None)) return ref_value, levels + + +def estimate_level_bounds(ref_value, stdev, sig, params, levels_factor): + how, (warn, crit) = params + if how == "absolute": + return ( + ref_value + (sig * warn * levels_factor), + ref_value + (sig * crit * levels_factor), + ) + elif how == "relative": + return ( + ref_value + sig * (ref_value * warn / 100.0), + ref_value + sig * (ref_value * crit / 100.0), + ) + # how == "stdev": + return ( + ref_value + sig * (stdev * warn), + ref_value + sig * (stdev * crit), + ) diff --git a/tests/unit/cmk_base/test_prediction.py b/tests/unit/cmk_base/test_prediction.py new file mode 100644 index 0000000..e313f73 --- /dev/null +++ b/tests/unit/cmk_base/test_prediction.py @@ -0,0 +1,61 @@ +import pytest + +from cmk_base import prediction + + +(a)pytest.mark.parametrize("ref_value, stdev, sig, params, levels_factor, result", [ + (2, 0.5, 1, ("absolute", (3, 5)), 0.5, (3.5, 4.5)), + (2, 0.5, -1, ("relative", (20, 50)), 0.5, (1.6, 1)), + (2, 0.5, -1, ("stdev", (2, 4)), 0.5, (1, 0)), +]) +def test_estimate_level_bounds(ref_value, stdev, sig, params, levels_factor, result): + assert prediction.estimate_level_bounds(ref_value, stdev, sig, params, levels_factor) == result + + +(a)pytest.mark.parametrize("reference, params, levels_factor, result", [ + ( + { + 'average': 5, + 'stdev': 2 + }, + { + 'levels_lower': ('absolute', (2, 4)) + }, + 1, + (5, [(None, None), (3, 1)]), + ), + ( + { + 'average': 15, + 'stdev': 2, + }, + { + 'levels_upper': ('stddev', (2, 4)), + 'levels_lower': ('stddev', (3, 5)), + }, + 1, + (15, [(19, 23), (9, 5)]), + ), + ( + { + 'average': 2, + 'stdev': 3, + }, + { + 'levels_upper': ('relative', (20, 40)), + 'levels_upper_min': (2, 4), + }, + 1, + (2, [(2.4, 4), (None, None)]), + ), + ( + { + 'average': None + }, + {}, + 1, + (None, [(None, None), (None, None)]), + ), +]) +def test_estimate_levels(reference, params, levels_factor, result): + assert prediction.estimate_levels(reference, params, levels_factor) == result

5 years, 12 months

Fixed site deletion after refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 44207a8eefc503a05ce30186afb1bc89f478d8b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44207a8eefc503… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 11:01:22 2018 +0100 Fixed site deletion after refactoring Change-Id: I9a38212e70f5bedfebafb3e0ee43efe8e11ca4d5 --- cmk/gui/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index da5ef92..f92aa20 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -8997,7 +8997,7 @@ def find_usages_of_contact_group(name): global_config = load_configuration_settings() # Used in default_user_profile? - config_variable = config_variable_registry['default_user_profile'] + config_variable = config_variable_registry['default_user_profile']() domain = config_variable.domain() configured = global_config.get('default_user_profile', {}) default_value = domain().default_globals()["default_user_profile"]

5 years, 12 months

Refactored all configuration variable registrations to plugin registry API

by Lars Michelsen

Module: check_mk Branch: master Commit: 459a02a9958e6001b299e80d5b375da8bfb62fe1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=459a02a9958e60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 21 09:55:36 2018 +0100 Refactored all configuration variable registrations to plugin registry API Change-Id: I38bd88c2b39b56738da7e54e1f272211fba501c7 --- cmk/gui/plugins/wato/__init__.py | 1 + cmk/gui/plugins/wato/check_mk_configuration.py | 3495 ++++++++++++-------- cmk/gui/plugins/wato/globals_notification.py | 353 +- cmk/gui/plugins/wato/omd_configuration.py | 547 +-- cmk/gui/plugins/wato/utils/__init__.py | 1 + cmk/gui/wato/mkeventd.py | 1454 ++++---- .../plugins/wato/test_check_mk_configuration.py | 38 + tests/unit/cmk/gui/test_watolib.py | 15 +- 8 files changed, 3498 insertions(+), 2406 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=459a02a995…

5 years, 12 months

Fixed issue with new site API tests

by Lars Michelsen

Module: check_mk Branch: master Commit: a988bfca66babaafbfc42a2f777816a6f9341a7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a988bfca66baba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 09:36:27 2018 +0100 Fixed issue with new site API tests Change-Id: Ieb154ae13824e5755f72d1b023c4283e37d996cd --- tests/integration/cmk/gui/test_webapi.py | 45 ++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 83518ad..7a553bd 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -6,11 +6,12 @@ import time import os import json import base64 +import copy from PIL import Image from StringIO import StringIO import cmk -from testlib import web, APIError +from testlib import web, APIError # pylint: disable=unused-import def test_global_settings(site, web): @@ -129,34 +130,46 @@ def test_get_all_sites(web, site): def test_set_site(web, site): - response = web.get_site(site.id) - assert site.id == response["site_id"] + original_site = web.get_site(site.id) + assert site.id == original_site["site_id"] + + new_site_id = "testsite" + new_site_config = copy.deepcopy(original_site["site_config"]) + new_site_config["socket"] = "tcp:1.2.3.4:6557" - sitename = "testsite" - site_config = response["site_config"] - site_config["socket"] = "tcp:1.2.3.4:6557" try: - web.set_site(sitename, site_config) - response = web.get_site(sitename) - assert sitename in response["site_id"] + web.set_site(new_site_id, new_site_config) + + new_response = web.get_site(new_site_id) + assert new_site_id == new_response["site_id"] + assert new_response["site_config"] == new_site_config + + original_response = web.get_site(site.id) + assert site.id == original_response["site_id"] + assert original_response == original_site finally: - web.delete_site(sitename) + web.delete_site(new_site_id) def test_set_all_sites(web, site): response = web.get_all_sites() del response["configuration_hash"] - sitename = "testsite" - response["sites"][sitename] = response["sites"][site.id] - response["sites"][sitename]["socket"] = "tcp:1.2.3.4:6557" + new_site_id = "testsite" + + new_site_config = copy.deepcopy(response["sites"][site.id]) + new_site_config["socket"] = "tcp:1.2.3.4:6557" + + response["sites"][new_site_id] = new_site_config try: web.set_all_sites(response) - response = web.get_site(sitename) - assert sitename in response["site_id"] + + response = web.get_site(new_site_id) + assert new_site_id == response["site_id"] + assert response["site_config"] == new_site_config finally: - web.delete_site(sitename) + web.delete_site(new_site_id) def test_write_host_tags(web, site):

5 years, 12 months

6911 FIX Fixed terminating process on multiple restart requests

by Lars Michelsen

Module: check_mk Branch: master Commit: fab632128b3de6b057c0b53b9ed87ad82c1e39b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab632128b3de6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 09:45:56 2018 +0100 6911 FIX Fixed terminating process on multiple restart requests When sending multiple restart requests (using SIGUSR1) in a short time to the livestatus proxy daemon this could lead to a stopped livestatus proxy process. In this situation the process had to be started manually again. Change-Id: Ib036d8f3db1bc7455a3e6f295338d198179fbf4a --- .werks/6911 | 12 ++++++++++++ cmk/gui/watolib.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6911 b/.werks/6911 new file mode 100644 index 0000000..81c3c89 --- /dev/null +++ b/.werks/6911 @@ -0,0 +1,12 @@ +Title: Fixed terminating process on multiple restart requests +Level: 1 +Component: liveproxy +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1542876290 +Class: fix + +When sending multiple restart requests (using SIGUSR1) in a short time to the livestatus proxy +daemon this could lead to a stopped livestatus proxy process. In this situation the process +had to be started manually again. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index f1e2aa6..da5ef92 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -63,6 +63,7 @@ import copy import socket import time import threading +import signal from hashlib import sha256 from pathlib2 import Path @@ -4207,7 +4208,7 @@ class ConfigDomainLiveproxy(ConfigDomain): pidfile = cmk.paths.livestatus_unix_socket + "proxyd.pid" try: pid = int(file(pidfile).read().strip()) - os.kill(pid, 10) + os.kill(pid, signal.SIGUSR1) except IOError as e: if e.errno == 2: # No such file or directory pass

5 years, 12 months

Structured data: Removed dead code

by Simon Betz

Module: check_mk Branch: master Commit: b9ad91c00f0bb1ef91932d68a8e324c34104af05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9ad91c00f0bb1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 22 05:55:36 2018 +0100 Structured data: Removed dead code Change-Id: I83682fa5077541dbc6e8e81660c5a549020f7a47 --- cmk/structured_data.py | 13 -- .../cmk/structured_data/test_structured_data.py | 135 --------------------- 2 files changed, 148 deletions(-) diff --git a/cmk/structured_data.py b/cmk/structured_data.py index 606972a..4e3611c 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -34,19 +34,6 @@ import pprint import cmk.store as store from cmk.exceptions import MKGeneralException -# TODO add type annotations for mypy -# Example: -# def f(): -# # type: () -> bool -# """DOCSTRING""" -# ... do something -# return True -# def g(x): -# # type: (int) -> int -# """DOCSTRING""" -# ... do something -# return x*x - # ____ ____ # / \ / \ max. 1 per type # | SD | -------> | NA | ------------------------. diff --git a/tests/unit/cmk/structured_data/test_structured_data.py b/tests/unit/cmk/structured_data/test_structured_data.py index d0f19b5..602ab3f 100644 --- a/tests/unit/cmk/structured_data/test_structured_data.py +++ b/tests/unit/cmk/structured_data/test_structured_data.py @@ -553,138 +553,3 @@ def test_delta_structured_data_tree_serialization(two_tree_filenames): new_raw_delta_tree = new_delta_tree.get_raw_tree() assert raw_delta_tree == new_raw_delta_tree - - -#. -# .--Performance---------------------------------------------------------. -# | ____ __ | -# | | _ \ ___ _ __ / _| ___ _ __ _ __ ___ __ _ _ __ ___ ___ | -# | | |_) / _ \ '__| |_ / _ \| '__| '_ ` _ \ / _` | '_ \ / __/ _ \ | -# | | __/ __/ | | _| (_) | | | | | | | | (_| | | | | (_| __/ | -# | |_| \___|_| |_| \___/|_| |_| |_| |_|\__,_|_| |_|\___\___| | -# | | -# '----------------------------------------------------------------------' - -#(a)pytest.mark.parametrize("trees,stats,entries,results", [ -# (("tree_old_large_ora_tablespaces", -# "tree_new_large_ora_tablespaces_fixed_len", -# "tree_new_large_ora_tablespaces_variable_len"), -# (1.2, 0.5, 0.002), -# (82523, 82523, 82517), -# ((0, 16272, 0), (16270, 0, 16272)), -# ), -#]) -#def test_structured_data_StructuredDataTree_performance(trees, stats, entries, results): -# tree_old_name, tree_new_fixed_name, tree_new_variable_name = trees -# time_loading_tree, time_delta_tree, time_count_entries = stats -# tree_old_entries, tree_new_fixed_entries, tree_new_variable_entries = entries -# compare_fixed_result, compare_variable_result = results -# -# # ---loading tree--------------------------------------------------------- -# -# #TODO testing -# start = time.clock() -# tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# #TODO testing -# start = time.clock() -# tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# #TODO testing -# start = time.clock() -# tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_loading_tree -# -# # ---count entries-------------------------------------------------------- -# -# #TODO testing -# start = time.clock() -# entries_old = tree_old.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_old = tree_old.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_old_entries == entries_old -# -# #TODO testing -# start = time.clock() -# entries_new_fixed = tree_new_fixed.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_new_fixed = tree_new_fixed.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_new_fixed_entries == entries_new_fixed -# -# #TODO testing -# start = time.clock() -# entries_new_variable = tree_new_variable.count_entries() -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #entries_new_variable = tree_new_variable.count_entries() -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert run_time < time_count_entries -# assert tree_new_variable_entries == entries_new_variable -# -# # ---delta tree computation----------------------------------------------- -# -# #TODO testing -# start = time.clock() -# n,c,r,d = tree_new_fixed.compare_with(tree_old) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #n,c,r,d = tree_new_fixed.compare_with(tree_old) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert compare_fixed_result == (n,c,r) -# assert run_time < time_delta_tree -# -# #TODO testing -# start = time.clock() -# n,c,r,d = tree_new_variable.compare_with(tree_old) -# run_time = time.clock() - start -# #cpu_tracking.start("busy") -# #n,c,r,d = tree_new_variable.compare_with(tree_old) -# #cpu_tracking.end() -# #phase_times = cpu_tracking.get_times() -# #total_times = phase_times["TOTAL"] -# #run_time = total_times[4] -# assert compare_variable_result == (n,c,r) -# assert run_time < time_delta_tree -# -##.

5 years, 12 months

← Newer
1
...
8
9
10
11
12
13
14
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018