Checkmk git commits May 2018

checkmk-commits@lists.checkmk.com

10 participants
375 discussions

6152 Notification conditions can now be displayed in notification rule table

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fca2d1b572a4f7a71b3995b048519da7e52d9d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fca2d1b572a4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 16:39:36 2018 +0200 6152 Notification conditions can now be displayed in notification rule table The last column can now expand the number of conditions to the list of match conditions of the rule. Change-Id: Ibeca2812a5358435f2296351ed0a0bef29d96a82 --- .werks/6152 | 11 +++++++++++ web/htdocs/check_mk.css | 4 ++++ web/htdocs/pages.css | 10 ++++++---- web/htdocs/wato.py | 28 +++++++++++++++++++++++----- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.werks/6152 b/.werks/6152 new file mode 100644 index 0000000..3800c55 --- /dev/null +++ b/.werks/6152 @@ -0,0 +1,11 @@ +Title: Notification conditions can now be displayed in notification rule table +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526999940 + +The last column can now expand the number of conditions to the list of match conditions of the rule. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 2acc3b3..6fc8aeb 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -395,6 +395,10 @@ b.treeangle.title { cursor: pointer; } +table.data b.treeangle.title { + color: #000000; +} + img.treeangle+.treeangle.title { display: inline-block; } diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 645cebf..291e2f2 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1361,8 +1361,8 @@ table.data.single tr.data td.invtree table td, table.data.single tr.data td.invtree table th, table.data tr.ac_test_details table td, table.data tr.notification_context table td, -table.data tr.notification_context table th -{ +table.data tr.notification_context table th, +td.rule_conditions table td { border: 1px solid #888; padding: 1px 5px; height: 14px; @@ -1377,12 +1377,14 @@ table.data tr.notification_context table th { td.invtree table td, td.agent_config table.rulesets table td, table.data tr.ac_test_details table td, -table.data tr.notification_context table td { +table.data tr.notification_context table td, +td.rule_conditions table td { background-color: #fff; } td.agent_config table.rulesets table td.title, -table.data tr.notification_context table th { +table.data tr.notification_context table th, +td.rule_conditions table td.title { background-color: #999; color: #fff; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d6cb47d..6ff6b96 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8089,9 +8089,7 @@ def vs_notification_rule(userid = None): title = _("Rule Properties"), elements = rule_option_elements() + section_override - + generic_rule_match_conditions() - + event_rule_match_conditions(flavour="notify") - + notification_rule_match_conditions() + + rule_match_conditions() + section_contacts + [ # Notification @@ -8461,6 +8459,12 @@ def event_rule_match_conditions(flavour): ] +def rule_match_conditions(): + return generic_rule_match_conditions() \ + + event_rule_match_conditions(flavour="notify") \ + + notification_rule_match_conditions() + + def notification_rule_match_conditions(): def transform_ec_rule_id_match(val): if isinstance(val, list): @@ -8607,6 +8611,11 @@ def render_notification_rules(rules, userid="", show_title=False, show_buttons=T analyse=False, start_nr=0, profilemode=False): if not rules: html.message(_("You have not created any rules yet.")) + return + + vs_match_conditions = Dictionary( + elements = rule_match_conditions() + ) if rules: if not show_title: @@ -8715,10 +8724,19 @@ def render_notification_rules(rules, userid="", show_title=False, show_buttons=T html.write("&bullet; %s" % line) html.br() - table.cell(_("Conditions")) + table.cell(_("Conditions"), css="rule_conditions") num_conditions = len([key for key in rule if key.startswith("match_")]) if num_conditions: - html.write_text(_("%d conditions") % num_conditions) + title = _("%d conditions") % num_conditions + html.begin_foldable_container(treename="rule_%d" % nr, + id="%s" % nr, + isopen=False, + title=title, + indent=False, + tree_img="tree_black", + ) + html.write(vs_match_conditions.value_to_text(rule)) + html.end_foldable_container() else: html.i(_("(no conditions)"))

6 years, 3 months

Win-agent: test section plugin group followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: ac449544f0a29a5aa2bab3c48691ddd2500168c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac449544f0a29a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test section plugin group followed by systemtime Check that the plugin group section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the plugin group section. Change-Id: I02895ee28c93fee5db81d1cab58d46db806f12fc --- agents/windows/it/test_section_dotnet_clrmemory.py | 2 +- agents/windows/it/test_section_eventlog.py | 2 +- .../windows/it/test_section_openhardwaremonitor.py | 2 +- agents/windows/it/test_section_plugin_group.py | 52 +++++++++++++++------- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index d9c353c..c7978e7 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -48,7 +48,7 @@ def expected_output(): r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+') if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' return chain(base, repeat(re_str)) diff --git a/agents/windows/it/test_section_eventlog.py b/agents/windows/it/test_section_eventlog.py index 55feef7..ba5e501 100644 --- a/agents/windows/it/test_section_eventlog.py +++ b/agents/windows/it/test_section_eventlog.py @@ -148,7 +148,7 @@ def expected_output_application_events(): [logtitle(l) for l in logs[split_index:]] + [r'[CWOu\.] \w{3} \d{2} \d{2}\:\d{2}:\d{2} \d+\.\d+ .+ .+']) if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' return chain([re.escape(r'<<<%s>>>' % Globals.section)], [logtitle(l) for l in logs[:split_index]], [ r'W \w{3} \d{2} \d{2}\:\d{2}:\d{2} 0\.%d %s %s' % diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index f060fbc..596fcd8 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -51,7 +51,7 @@ def expected_output(): re_str = (r'^\d+,[^,]+,(\/\w+)+,(Power|Clock|Load|Data|Temperature),' r'\d+\.\d{6}') if not Globals.alone: - re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' re_str += r'$' return chain([ re.escape(r'<<<openhardwaremonitor:sep(44)>>>'), diff --git a/agents/windows/it/test_section_plugin_group.py b/agents/windows/it/test_section_plugin_group.py index 8066c52..abcd829 100644 --- a/agents/windows/it/test_section_plugin_group.py +++ b/agents/windows/it/test_section_plugin_group.py @@ -35,23 +35,33 @@ def testconfig_suffixes(request, config): return config +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig_sections(request, testconfig_suffixes): + Globals.alone = request.param == 'alone' + if Globals.alone: + testconfig_suffixes.set('global', 'sections', Globals.plugintype) + else: + testconfig_suffixes.set('global', 'sections', + '%s systemtime' % Globals.plugintype) + return testconfig_suffixes + + @pytest.fixture(params=['sync', 'async', 'async+cached']) -def testconfig(request, testconfig_suffixes): +def testconfig(request, testconfig_sections): Globals.executionmode = request.param - testconfig_suffixes.set('global', 'sections', Globals.plugintype) - testconfig_suffixes.set('global', 'crash_debug', 'yes') + testconfig_sections.set('global', 'crash_debug', 'yes') if request.param != 'sync': - testconfig_suffixes.add_section(Globals.plugintype) - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.add_section(Globals.plugintype) + testconfig_sections.set(Globals.plugintype, 'execution %s' % Globals.pluginname, 'async') - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'timeout %s' % Globals.pluginname, '10') if request.param == 'async+cached': - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'cache_age %s' % Globals.pluginname, '300') - testconfig_suffixes.set(Globals.plugintype, + testconfig_sections.set(Globals.plugintype, 'retry_count %s' % Globals.pluginname, '3') - return testconfig_suffixes + return testconfig_sections @pytest.fixture() @@ -74,7 +84,7 @@ def expected_output(): if Globals.executionmode == 'async+cached' else r'') + re.escape(r'>>>'), r'^$' ] - netstat_pattern = ( + repeating_pattern = ( r'^$' r'|Aktive Verbindungen' r'|Active Connections' @@ -88,8 +98,10 @@ def expected_output(): r'|LISTENING|ESTABLISHED|TIME_WAIT|CLOSE_WAIT)' r'|\-?\d+( \d+)+ [\w]+') if Globals.plugintype == 'plugins': - netstat_pattern += r'|%s' % re.escape(r'<<<>>>') - plugin_variadic = repeat(netstat_pattern) + repeating_pattern += r'|%s' % re.escape(r'<<<>>>') + if not Globals.alone: + repeating_pattern += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' + plugin_variadic = repeat(repeating_pattern) elif Globals.pluginname == 'wmic_if.bat': plugin_fixed += [ re.escape(r'<<<') + r'winperf_if:sep$44$%s' % @@ -98,11 +110,14 @@ def expected_output(): re.escape(r'>>>'), r'^$', r'^$', r'Node,MACAddress,Name,NetConnectionID,NetConnectionStatus,Speed' ] - plugin_variadic = repeat( + re_variadic = ( r'[^,]+,([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5})?,[^,]+,[^,]*,\d*,\d*' - r'|^$' - r'%s' % (r'|%s' % re.escape(r'<<<>>>') - if Globals.plugintype == 'plugins' else '')) + r'|^$') + if Globals.plugintype == 'plugins': + re_variadic += r'|%s' % re.escape(r'<<<>>>') + if not Globals.alone: + re_variadic += r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+' + plugin_variadic = repeat(re_variadic) elif Globals.pluginname == 'windows_if.ps1': plugin_fixed += [ re.escape(r'<<<') + r'winperf_if:sep$9$%s' % @@ -114,7 +129,10 @@ def expected_output(): (r'[^\t]+\s+([0-9A-Fa-f]{2}(:[0-9A-Fa-f]{2}){5})?\s+[^\t]+\s+[^\t]*' r'\s+\d*\s+\d*\s+\{[0-9A-F]+(\-[0-9A-F]+)+\}') ] - plugin_variadic = [] + plugin_variadic = [ + r'%s' % ('' if Globals.alone else + r'|' + re.escape(r'<<<systemtime>>>') + r'|\d+') + ] return chain(main_label, plugin_fixed, plugin_variadic)

6 years, 4 months

6111 FIX heartbeat_crm: return CRIT if the connection to the cluster fails

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 1959b6d02c447559ec24343053130fd10e977543 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1959b6d02c4475… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue May 22 16:02:38 2018 +0200 6111 FIX heartbeat_crm: return CRIT if the connection to the cluster fails Change-Id: I4d0ffca342b07d1ca34917b9beeffc6c7a345ae2 --- .werks/6111 | 10 ++++++ checks/heartbeat_crm | 93 +++++++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/.werks/6111 b/.werks/6111 new file mode 100644 index 0000000..e815b26 --- /dev/null +++ b/.werks/6111 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: return CRIT if the connection to the cluster fails +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526997672 +Class: fix + + diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 966eecb..552c83c 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -136,55 +136,58 @@ def inventory_heartbeat_crm(info): def check_heartbeat_crm(item, params, info): - if len(info) > 0: - if info[0][0].lower().startswith("critical"): - return 2, " ".join(info[0]) - last_updated, dc, numNodes, numResources = heartbeat_crm_parse_general(info) - - # Convert old tuple params (pre 1.2.5i6) - if type(params) == tuple: - params = { - 'max_age' : params[0], - 'dc' : params[1] != "" and params[1] or None, - 'num_nodes' : params[2] != -1 and params[2] or None, - 'num_resources' : params[3] != -1 and params[3] or None, - } - - # Check the freshness of the crm_mon output and terminate with CRITICAL - # when too old information are found - dt = utc_mktime(time.strptime(last_updated, '%a %b %d %H:%M:%S %Y')) - now = time.time() - delta = now - dt - if delta > params['max_age']: - return 3, 'Ignoring reported data (Status output too old: %s)' % get_age_human_readable(delta) - - output = '' - status = 0 - - # Check for correct DC when enabled - if params.get('dc') == None or dc == params['dc']: - output += 'DC: %s, ' % dc + if not len(info) > 0: + return + + first_line = ' '.join(info[0]) + if first_line.lower().startswith("critical") or 'connection to cluster failed' in first_line.lower(): + return 2, first_line + + last_updated, dc, numNodes, numResources = heartbeat_crm_parse_general(info) + + # Convert old tuple params (pre 1.2.5i6) + if type(params) == tuple: + params = { + 'max_age' : params[0], + 'dc' : params[1] != "" and params[1] or None, + 'num_nodes' : params[2] != -1 and params[2] or None, + 'num_resources' : params[3] != -1 and params[3] or None, + } + + # Check the freshness of the crm_mon output and terminate with CRITICAL + # when too old information are found + dt = utc_mktime(time.strptime(last_updated, '%a %b %d %H:%M:%S %Y')) + now = time.time() + delta = now - dt + if delta > params['max_age']: + return 3, 'Ignoring reported data (Status output too old: %s)' % get_age_human_readable(delta) + + status, output = 0, '' + + # Check for correct DC when enabled + if params.get('dc') is None or dc == params['dc']: + output += 'DC: %s, ' % dc + else: + output += 'DC: %s (Expected %s (!!)), ' % (dc, params['dc']) + status = 2 + + # Check for number of nodes when enabled + if params['num_nodes'] is not None: + if numNodes == params['num_nodes']: + output += 'Nodes: %d, ' % numNodes else: - output += 'DC: %s (Expected %s (!!)), ' % (dc, params['dc']) + output += 'Nodes: %d (Expected %d (!!)), ' % (numNodes, params['num_nodes']) status = 2 - # Check for number of nodes when enabled - if params['num_nodes'] != None: - if numNodes == params['num_nodes']: - output += 'Nodes: %d, ' % numNodes - else: - output += 'Nodes: %d (Expected %d (!!)), ' % (numNodes, params['num_nodes']) - status = 2 - - # Check for number of resources when enabled - if params['num_resources'] != None: - if numResources == params['num_resources']: - output += 'Resources: %d, ' % numResources - else: - output += 'Resources: %d (Expected %d (!!)), ' % (numResources, params['num_resources']) - status = 2 + # Check for number of resources when enabled + if params['num_resources'] is not None: + if numResources == params['num_resources']: + output += 'Resources: %d, ' % numResources + else: + output += 'Resources: %d (Expected %d (!!)), ' % (numResources, params['num_resources']) + status = 2 - return (status, output.rstrip(', ')) + return (status, output.rstrip(', ')) check_info["heartbeat_crm"] = {

6 years, 4 months

Win-agent: test openhardwaremonitor followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: a4d1764f76fbd955958aae39cc9cad006d7a4fad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4d1764f76fbd9… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test openhardwaremonitor followed by systemtime Check that the openhardwaremonitor section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the openhardwaremonitor section. Change-Id: I02895ee28c93fee5db81d1cab58d46db806f12fc --- .../windows/it/test_section_openhardwaremonitor.py | 37 +++++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index 30c424a..f060fbc 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -11,16 +11,28 @@ from remote import (actual_output, assert_subprocess, config, remote_ip, remotedir, remotetest, remoteuser, sshopts, write_config) +class Globals(object): + alone = True + + @pytest.fixture def testfile(): return os.path.basename(__file__) @pytest.fixture( - params=['ohm', 'openhardwaremonitor'], - ids=['sections=ohm', 'sections=openhardwaremonitor']) + params=[('ohm', True), ('openhardwaremonitor', True), ('ohm', False), + ('openhardwaremonitor', False)], + ids=[ + 'sections=ohm', 'sections=openhardwaremonitor', + 'sections=ohm_systemtime', 'sections=openhardwaremonitor_systemtime' + ]) def testconfig(request, config): - config.set('global', 'sections', request.param) + Globals.alone = request.param[1] + if Globals.alone: + config.set('global', 'sections', request.param[0]) + else: + config.set('global', 'sections', '%s systemtime' % request.param[0]) config.set('global', 'crash_debug', 'yes') return config @@ -36,13 +48,15 @@ def wait_agent(): @pytest.fixture def expected_output(): - return chain( - [ - re.escape(r'<<<openhardwaremonitor:sep(44)>>>'), - r'Index,Name,Parent,SensorType,Value' - ], - repeat(r'\d+,[A-Za-z ]+,(\/\w+)+,(Power|Clock|Load|Data|Temperature),' - r'\d+\.\d{6}')) + re_str = (r'^\d+,[^,]+,(\/\w+)+,(Power|Clock|Load|Data|Temperature),' + r'\d+\.\d{6}') + if not Globals.alone: + re_str += r'|' + re.escape(r'<<<systemtime>>>') + '|\d+' + re_str += r'$' + return chain([ + re.escape(r'<<<openhardwaremonitor:sep(44)>>>'), + r'Index,Name,Parent,SensorType,Value' + ], repeat(re_str)) def get_ohm_version(ohmdir): @@ -93,5 +107,4 @@ def manage_ohm_binaries(): def test_section_openhardwaremonitor(request, testconfig, expected_output, actual_output, testfile): # request.node.name gives test name - remotetest(expected_output, actual_output, testfile, - request.node.name) + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 4 months

6151 FIX Net-SNMP: Add some patch trying to fix SNMPv3 communication in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: 85dd6acf4530af7a5865dd31a14731043bcce2a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85dd6acf4530af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 16:01:38 2018 +0200 6151 FIX Net-SNMP: Add some patch trying to fix SNMPv3 communication in some cases When using SNMPv3 communication issues with some devices may occur. From the user point of view timeouts are reported by Check_MK originating from Net-SNMP not receiving a valid response. This kind of issue is related to a broken negotiation (related to the maximum message size) between the monitoring and the monitored device. Change-Id: I310a0f59867130183cc5184bc2195f109c306776 --- .werks/6151 | 14 ++++++++++++++ omd/packages/net-snmp/Makefile | 2 +- omd/packages/net-snmp/net-snmp-0b32548.tar.gz | Bin 0 -> 6530869 bytes omd/packages/net-snmp/net-snmp-734f855.tar.gz | Bin 6451953 -> 0 bytes 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6151 b/.werks/6151 new file mode 100644 index 0000000..100290c --- /dev/null +++ b/.werks/6151 @@ -0,0 +1,14 @@ +Title: Net-SNMP: Add some patch trying to fix SNMPv3 communication in some cases +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1526997524 +Class: fix + +When using SNMPv3 communication issues with some devices may occur. From the user point of +view timeouts are reported by Check_MK originating from Net-SNMP not receiving a valid response. + +This kind of issue is related to a broken negotiation (related to the maximum message size) between +the monitoring and the monitored device. diff --git a/omd/packages/net-snmp/Makefile b/omd/packages/net-snmp/Makefile index 5ef4ac0..6127b2c 100644 --- a/omd/packages/net-snmp/Makefile +++ b/omd/packages/net-snmp/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = net-snmp -VERSION = 734f855 +VERSION = 0b32548 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/omd/packages/net-snmp/net-snmp-0b32548.tar.gz b/omd/packages/net-snmp/net-snmp-0b32548.tar.gz new file mode 100644 index 0000000..70a1899 Binary files /dev/null and b/omd/packages/net-snmp/net-snmp-0b32548.tar.gz differ diff --git a/omd/packages/net-snmp/net-snmp-734f855.tar.gz b/omd/packages/net-snmp/net-snmp-734f855.tar.gz deleted file mode 100644 index bc48560..0000000 Binary files a/omd/packages/net-snmp/net-snmp-734f855.tar.gz and /dev/null differ

6 years, 4 months

6149 FIX ps: The linux ps check CPU utilization calculation changed since 1.4.0p27

by Lars Michelsen

Module: check_mk Branch: master Commit: 91a73809de4d34418985263413a794a984543d68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a73809de4d34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 11:57:48 2018 +0200 6149 FIX ps: The linux ps check CPU utilization calculation changed since 1.4.0p27 The calculation of the CPU utilization of processes on linux systems was not taking the number of CPU cores into account for a long time. This results in CPU utilizations reported with more than 100%, up to 100%*CPU-cores. For example in case 3 processes use 3 of 6 cores at 100%, this resulted in a usage of 300%. The intention of the change in 1.4.0p27 was to make the windows and linux ps checks both take the number of CPU cores into account and cap the usage at 100%. The problem with this change is that all possibly existing thresholds that have been configured for the old scheme will not work anymore with the new scheme. We have now reverted the changes version 1.4.0p27 introduced to get the old behavior back. In a future release, we will finally make the switch to the new scheme. But this will be done in a compatible way where the already configured thresholds will still work. Change-Id: Idac9be3065a594958125378a6de8e231b8b81467 --- .werks/6149 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.werks/6149 b/.werks/6149 new file mode 100644 index 0000000..7917062 --- /dev/null +++ b/.werks/6149 @@ -0,0 +1,24 @@ +Title: ps: The linux ps check CPU utilization calculation changed since 1.4.0p27 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526982355 + +The calculation of the CPU utilization of processes on linux systems was not taking the number +of CPU cores into account for a long time. This results in CPU utilizations reported with more +than 100%, up to 100%*CPU-cores. For example in case 3 processes use 3 of 6 cores at 100%, this +resulted in a usage of 300%. + +The intention of the change in 1.4.0p27 was to make the windows and linux ps checks both take +the number of CPU cores into account and cap the usage at 100%. The problem with this change is +that all possibly existing thresholds that have been configured for the old scheme will not +work anymore with the new scheme. + +We have now reverted the changes version 1.4.0p27 introduced to get the old behavior back. + +In a future release, we will finally make the switch to the new scheme. But this will be done +in a compatible way where the already configured thresholds will still work.

6 years, 4 months

6150 FIX docker_container_status: Fix crash when receiving data from multiple hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: ee72f0baac0c00df9a63f9e3f63ba6cbd13d9823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee72f0baac0c00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 22 14:59:03 2018 +0200 6150 FIX docker_container_status: Fix crash when receiving data from multiple hosts Change-Id: I75e20a53769a7b0f420671d979e711bed68c1ae5 --- .werks/6150 | 11 +++++++++++ checks/docker_container_status | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/6150 b/.werks/6150 new file mode 100644 index 0000000..b31a42f --- /dev/null +++ b/.werks/6150 @@ -0,0 +1,11 @@ +Title: docker_container_status: Fix crash when receiving data from multiple hosts +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1526993923 + + diff --git a/checks/docker_container_status b/checks/docker_container_status index f1cb43d..09e47e4 100644 --- a/checks/docker_container_status +++ b/checks/docker_container_status @@ -28,9 +28,17 @@ def parse_docker_container_status(info): + if not info: + return + + # In case there are multiple lines of output sent by the agent only process the first + # line. We assume that this a full JSON object. The rest of the section is skipped. + # When a container got piggyback data from multiple hosts (e.g. a cluster) this results + # in multiple JSON objects handed over to this check. + json_raw_data = info[0] + import json - json_data = "\n".join(" ".join(line) for line in info) - return json.loads(json_data) + return json.loads(json_raw_data) #.

6 years, 4 months

Win-agent: test section mem followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: 2820a82cfb70a0ae12cddf5a9ccd8e019c8c9dd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2820a82cfb70a0… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test section mem followed by systemtime Check that the mem section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the mem section. Change-Id: I6e06825eeca92b95c5d5ea1b50427b183454356b --- agents/windows/it/test_section_mem.py | 46 ++++++++++++++++++++++------------ agents/windows/it/test_section_mrpe.py | 23 ++++++++--------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/agents/windows/it/test_section_mem.py b/agents/windows/it/test_section_mem.py index 3a61f13..6219693 100644 --- a/agents/windows/it/test_section_mem.py +++ b/agents/windows/it/test_section_mem.py @@ -2,36 +2,50 @@ # -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest +import re from remote import actual_output, config, remotetest, wait_agent, write_config +class Globals(object): + section = 'mem' + alone = True + + @pytest.fixture def testfile(): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): - section = 'mem' - config.set('global', 'sections', section) +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig(request, config): + Globals.alone = request.param == 'alone' + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) config.set('global', 'crash_debug', 'yes') return config @pytest.fixture def expected_output(): - return [ - r'<<<mem>>>', - r'MemTotal:\s+\d+\skB', - r'MemFree:\s+\d+\skB', - r'SwapTotal:\s+\d+\skB', - r'SwapFree:\s+\d+\skB', - r'PageTotal:\s+\d+\skB', - r'PageFree:\s+\d+\skB', - r'VirtualTotal:\s+\d+\skB', - r'VirtualFree:\s+\d+\skB' + expected = [ + r'<<<mem>>>', # + r'MemTotal:\s+\d+\skB', # + r'MemFree:\s+\d+\skB', # + r'SwapTotal:\s+\d+\skB', # + r'SwapFree:\s+\d+\skB', # + r'PageTotal:\s+\d+\skB', # + r'PageFree:\s+\d+\skB', # + r'VirtualTotal:\s+\d+\skB', # + r'VirtualFree:\s+\d+\skB' # ] + if not Globals.alone: + expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] + return expected -def test_section_mem(testconfig, expected_output, actual_output, testfile): - remotetest(expected_output, actual_output, testfile) +def test_section_mem(request, testconfig, expected_output, actual_output, + testfile): + # request.node.name gives test name + remotetest(expected_output, actual_output, testfile, request.node.name) diff --git a/agents/windows/it/test_section_mrpe.py b/agents/windows/it/test_section_mrpe.py index 73de0ac..13f79a6 100644 --- a/agents/windows/it/test_section_mrpe.py +++ b/agents/windows/it/test_section_mrpe.py @@ -16,7 +16,7 @@ class Globals(object): param = 'foobar' checkname = 'Dummy' mrpedir = 'mrpe' - includedir = 'test include' # space in directory name! + includedir = 'test include' # space in directory name! cfgfile = 'test.cfg' newline = -1 @@ -49,15 +49,12 @@ def testconfig(request, config): def expected_output(): drive = r'[A-Z]:%s' % re.escape(os.sep) expected = [ - re.escape(r'<<<%s>>>' % Globals.section), - r'$%s$ %s 2 CRIT - This check is always critical' % - (Globals.pluginname, Globals.checkname) - ] + re.escape(r'<<<%s>>>' % Globals.section), + r'$%s$ %s 2 CRIT - This check is always critical' % + (Globals.pluginname, Globals.checkname) + ] if not Globals.alone: - expected += [ - re.escape(r'<<<systemtime>>>'), - r'\d+' - ] + expected += [re.escape(r'<<<systemtime>>>'), r'\d+'] return expected @@ -81,7 +78,8 @@ def manage_plugin(request): cmds = [[ 'ssh', sshopts, '%s@%s' % (remoteuser, remote_ip), - 'if not exist "%s" md "%s"' % (targetdir_windows, targetdir_windows) + 'if not exist "%s" md "%s"' % (targetdir_windows, + targetdir_windows) ], [ 'scp', sshopts, source, '%s@%s:"%s"' % (remoteuser, remote_ip, targetdir) @@ -94,7 +92,7 @@ def manage_plugin(request): if Globals.newline == 2: path = path.replace('\\', '/') cfg.write('check = %s "%s"%s' % (Globals.checkname, path, '\n' - if Globals.newline > 0 else "")) + if Globals.newline > 0 else "")) yield if platform.system() == 'Windows': os.unlink(os.path.join(targetdir, Globals.pluginname)) @@ -105,5 +103,4 @@ def manage_plugin(request): def test_section_mrpe(request, testconfig, expected_output, actual_output, testfile): # request.node.name gives test name - remotetest(expected_output, actual_output, testfile, - request.node.name) + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 4 months

Win-agent: test logfiles followed by systemtime

by Jukka Aro

Module: check_mk Branch: master Commit: 2d8b72848673aa1c8a587ed3eef4361fcc8fa2a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d8b72848673aa… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed May 16 15:36:09 2018 +0200 Win-agent: test logfiles followed by systemtime Check that the logfiles section is correctly formatted until the end by adding section systemtime after it. This is necessary for ensuring that e. g. the newline is not left out at the end of the logfiles section. Change-Id: I6e06825eeca92b95c5d5ea1b50427b183454356b --- agents/windows/it/test_section_logfiles.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/agents/windows/it/test_section_logfiles.py b/agents/windows/it/test_section_logfiles.py index 3de7288..6637934 100644 --- a/agents/windows/it/test_section_logfiles.py +++ b/agents/windows/it/test_section_logfiles.py @@ -16,6 +16,7 @@ class Globals(object): config_param_in_use = None utf_encoding = None section = 'logfiles' + alone = True testlog1 = os.path.join(remotedir, 'test1.log') testlog2 = os.path.join(remotedir, 'test2.log') testentry1 = 'foobar' @@ -63,13 +64,23 @@ def testfile(): return os.path.basename(__file__) -(a)pytest.fixture(params=['default', 'from_start', 'rotated', 'nocontext']) +(a)pytest.fixture( + params=[('default', True), ('from_start', True), ('rotated', True), + ('nocontext', True), ('default', False)], + ids=[ + 'default_alone', 'from_start_alone', 'rotated_alone', + 'nocontext_alone', 'default_with_systemtime' + ]) def testconfig(request, config): - config.set('global', 'sections', Globals.section) + Globals.alone = request.param[1] + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) config.set('global', 'crash_debug', 'yes') config.add_section(Globals.section) - Globals.config_param_in_use = request.param - tag = '' if request.param == 'default' else '%s ' % request.param + Globals.config_param_in_use = request.param[0] + tag = '' if request.param[0] == 'default' else '%s ' % request.param[0] config.set(Globals.section, 'textfile', '%s%s|%s%s' % (tag, Globals.testlog1, tag, Globals.testlog2)) return config @@ -111,6 +122,8 @@ def expected_output_no_statefile(): r'\. %s' % Globals.testentry1, r'C %s' % Globals.testentry2 ] + if not Globals.alone: + expected_output += [re.escape(r'<<<systemtime>>>'), r'\d+'] return expected_output @@ -129,6 +142,8 @@ def expected_output_with_statefile(): if Globals.config_param_in_use != 'nocontext': expected_output.append(r'\. %s' % Globals.testentry1) expected_output.append(r'C %s' % Globals.testentry2) + if not Globals.alone: + expected_output += [re.escape(r'<<<systemtime>>>'), r'\d+'] return expected_output

6 years, 4 months

Update pipenv if necessary.

by Sven Panne

Module: check_mk Branch: master Commit: 19131304cd999d80cf3a02912dd7e08f2fff8cb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19131304cd999d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 22 15:08:15 2018 +0200 Update pipenv if necessary. Change-Id: I323aae4fabb42c64555df815c04a538bf33e920b --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2c62dd..560bbf4 100644 --- a/Makefile +++ b/Makefile @@ -418,7 +418,7 @@ setup: python-pip \ chrpath \ enchant - sudo pip install pipenv + sudo pip install -U pipenv $(MAKE) -C omd setup ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/locale setup

6 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2018