Checkmk git commits May 2019

checkmk-commits@lists.checkmk.com

11 participants
334 discussions

7457 FIX Fixed filtering inventory tree by paths through web API

by Simon Betz

Module: check_mk Branch: master Commit: bd467c750118269e5309e770d90ed9e2ff707e39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd467c75011826… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 17:17:09 2019 +0200 7457 FIX Fixed filtering inventory tree by paths through web API CMK-1577 Change-Id: I12131921fc9480ce6a8736f3ebbcafc004009b5c --- .werks/7457 | 10 +++++ cmk/gui/inventory.py | 16 ++++---- cmk/gui/plugins/views/inventory.py | 18 ++++----- cmk/utils/structured_data.py | 45 ++++++++++++---------- .../utils/structured_data/test_structured_data.py | 36 +++++++++++++++++ 5 files changed, 87 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bd467c7501…

5 years, 5 months

Fix initial service discovery after host creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 07bf3ee77021f575314604a5f9764eac5bf7d70a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07bf3ee77021f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 3 14:23:08 2019 +0200 Fix initial service discovery after host creation When a host was created the GUI did a service discovery in previous versions, at least for non SNMP devices. This is now done for all hosts again. CMK-1851 Change-Id: I4204179dce9e82bdfb5663e81d2db4e62656d7d1 --- cmk/gui/wato/__init__.py | 1 - cmk/gui/wato/pages/hosts.py | 17 ++++++++++++----- cmk/gui/wato/pages/services.py | 9 ++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 6d4a4d2..beea148 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -245,7 +245,6 @@ from cmk.gui.wato.pages.rulesets import ( from cmk.gui.wato.pages.search import ModeSearch from cmk.gui.wato.pages.services import ( ModeDiscovery, - ModeFirstDiscovery, ModeAjaxExecuteCheck, ) from cmk.gui.wato.pages.sites import ( diff --git a/cmk/gui/wato/pages/hosts.py b/cmk/gui/wato/pages/hosts.py index 5463e7f..f50ac8f 100644 --- a/cmk/gui/wato/pages/hosts.py +++ b/cmk/gui/wato/pages/hosts.py @@ -41,7 +41,7 @@ from cmk.gui.plugins.wato.utils.context_buttons import host_status_button from cmk.gui.globals import html from cmk.gui.i18n import _ -from cmk.gui.exceptions import MKUserError, MKAuthException, MKGeneralException +from cmk.gui.exceptions import MKUserError, MKAuthException, MKGeneralException, HTTPRedirect from cmk.gui.valuespec import ListOfStrings, Hostname from cmk.gui.wato.pages.folders import delete_host_after_confirm @@ -327,19 +327,26 @@ class CreateHostMode(HostMode): self._host = watolib.Folder.current().host(hostname) + inventory_url = watolib.folder_preserving_link([ + ("mode", "inventory"), + ("host", self._host.name()), + ("_scan", "1"), + ]) + if not self._host.is_ping_host(): create_msg = _('Successfully created the host. Now you should do a ' '<a href="%s">service discovery</a> in order to auto-configure ' - 'all services to be checked on this host.') % \ - watolib.folder_preserving_link([("mode", "inventory"), ("host", self._host.name())]) + 'all services to be checked on this host.') % inventory_url else: create_msg = None if html.request.var("services"): - return "inventory" - elif html.request.var("diag_host"): + raise HTTPRedirect(inventory_url) + + if html.request.var("diag_host"): html.request.set_var("_try", "1") return "diag_host", create_msg + return "folder", create_msg def _show_host_name(self): diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 605cf60..65fedb6 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -178,15 +178,18 @@ class ModeDiscovery(WatoMode): self._host.need_permission("read") + action = DiscoveryAction.NONE if config.user.may("wato.services"): show_checkboxes = config.user.load_file("discovery_checkboxes", False) + if html.request.var("_scan") == "1": + action = DiscoveryAction.SCAN else: show_checkboxes = False show_parameters = not config.user.load_file("parameter_column", False) self._options = DiscoveryOptions( - action=DiscoveryAction.NONE, + action=action, show_checkboxes=show_checkboxes, show_parameters=show_parameters, ignore_errors=bool(html.request.var("ignoreerrors")), @@ -1565,10 +1568,6 @@ class DiscoveryPageRenderer(object): ] -class ModeFirstDiscovery(ModeDiscovery): - pass - - @page_registry.register_page("wato_ajax_execute_check") class ModeAjaxExecuteCheck(AjaxPage): def _from_vars(self):

5 years, 5 months

cisco_cpu_multiitem: cleanup

by Moritz Kiemer

Module: check_mk Branch: master Commit: 65699e0b82e21da0f1852dfc73a663f6d17059d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65699e0b82e21d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 09:14:18 2019 +0200 cisco_cpu_multiitem: cleanup Change-Id: I6306a3f941b31381e7b0c237b231bd3aa1a9f4ac --- checks/cisco_cpu_multiitem | 64 +++++++++------------- .../datasets/cisco_cpu_multiitem_regression.py | 2 +- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/checks/cisco_cpu_multiitem b/checks/cisco_cpu_multiitem index d5c344c..dd38a85 100644 --- a/checks/cisco_cpu_multiitem +++ b/checks/cisco_cpu_multiitem @@ -31,64 +31,50 @@ factory_settings['cisco_cpu_multiitem_default_levels'] = { def parse_cisco_cpu_multiitem(info): ph_idx_to_desc = {} - parsed = {} for idx, desc in info[1]: if desc.lower().startswith("cpu "): desc = desc[4:] ph_idx_to_desc[idx] = desc + parsed = {} for idx, util in info[0]: - if idx in ph_idx_to_desc: - name = ph_idx_to_desc[idx] - else: - name = idx - parsed[name] = { - 'util': float(util), - } + name = ph_idx_to_desc.get(idx, idx) + try: + parsed[name] = {'util': float(util)} + except ValueError: + pass return parsed -def inventory_cisco_cpu_multiitem(parsed): - for name in parsed: - yield name, {} - - -def check_cisco_cpu_multiitem(item, params, parsed): +@get_parsed_item_data +def check_cisco_cpu_multiitem(_no_item, params, data): warn, crit = params['levels'] - if item in parsed: - util = parsed[item]['util'] - - state = 0 - if util >= crit: - state = 2 - elif util >= warn: - state = 1 - - infotext = "%s%% utilization in the last 5 minutes" % util - if state > 0: - infotext += " (warn/crit at %s%%/%s%%)" % (warn, crit) - - yield state, infotext, [("util", util, warn, crit, 0, 100)] + value = data['util'] + state, infotext = check_levels( + value, + None, (warn, crit), + human_readable_func=get_percent_human_readable, + infoname="Utilization in the last 5 minutes")[:2] + yield state, infotext, [("util", value, warn, crit, 0, 100)] - else: - yield 3, "No information about the CPU utilization available" check_info["cisco_cpu_multiitem"] = { 'parse_function' : parse_cisco_cpu_multiitem, 'check_function' : check_cisco_cpu_multiitem, - 'inventory_function' : inventory_cisco_cpu_multiitem, + 'inventory_function' : discover(), "group" : "cpu_utilization_multiitem", "default_levels_variable" : "cisco_cpu_multiitem_default_levels", 'service_description' : 'CPU utilization %s', 'has_perfdata' : True, - 'snmp_info' : [('.1.3.6.1.4.1.9.9.109.1.1.1', [ - '1.2', # cpmCPUTotalPhysicalIndex - '1.8', # cpmCPUTotal5minRev - ]), - ('.1.3.6.1.2.1.47.1.1.1', [ - OID_END, #OID index - '1.7', # entPhysicalName - ])], + 'snmp_info' : [ + ('.1.3.6.1.4.1.9.9.109.1.1.1', [ + '1.2', # cpmCPUTotalPhysicalIndex + '1.8', # cpmCPUTotal5minRev + ]), + ('.1.3.6.1.2.1.47.1.1.1', [ + OID_END, #OID index + '1.7', # entPhysicalName + ])], 'snmp_scan_function' : lambda oid: 'cisco' in oid('.1.3.6.1.2.1.1.1.0').lower() and \ oid('.1.3.6.1.4.1.9.9.109.1.1.1.*') is None, } diff --git a/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py b/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py index eb7f457..d4995fe 100644 --- a/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py +++ b/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py @@ -14,5 +14,5 @@ discovery = {'': [(u'0', {})]} checks = {'': [(u'0', {'levels': (80.0, 90.0)}, [(0, - '24.0% utilization in the last 5 minutes', + 'Utilization in the last 5 minutes: 24.0%', [('util', 24.0, 80.0, 90.0, 0, 100)])])]}

5 years, 5 months

cisco_cpu_multiitem: add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: 37ef14d5d25c4d004e022eea02aa3eda7af7df98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37ef14d5d25c4d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri May 3 09:10:41 2019 +0200 cisco_cpu_multiitem: add test Change-Id: I4556039f04f8fd2c378b468f30f34e9c837033df --- .../datasets/cisco_cpu_multiitem_regression.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py b/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py new file mode 100644 index 0000000..eb7f457 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/cisco_cpu_multiitem_regression.py @@ -0,0 +1,18 @@ +# yapf: disable + + +checkname = 'cisco_cpu_multiitem' + + +info = [[[u'0', u'24']], + []] + + +discovery = {'': [(u'0', {})]} + + +checks = {'': [(u'0', + {'levels': (80.0, 90.0)}, + [(0, + '24.0% utilization in the last 5 minutes', + [('util', 24.0, 80.0, 90.0, 0, 100)])])]}

5 years, 5 months

7296 FIX oracle_dataguard_stats: Add missing metric definitions

by Florian Kromer

Module: check_mk Branch: master Commit: 950df178f57220c06addb2cb22a3342a3b1165d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950df178f57220… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu May 2 13:27:04 2019 +0200 7296 FIX oracle_dataguard_stats: Add missing metric definitions CMK-1768 Change-Id: I841c8424068f7ee58d1137625603e3df5166d29d --- .werks/7296 | 10 +++++ cmk/gui/plugins/metrics/check_mk.py | 18 ++++++++ .../datasets/oracle_dataguard_stats.py | 49 ++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/.werks/7296 b/.werks/7296 new file mode 100644 index 0000000..831774d --- /dev/null +++ b/.werks/7296 @@ -0,0 +1,10 @@ +Title: oracle_dataguard_stats: Add missing metric definitions +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556796336 +Class: fix + +CMK-1768 diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 140f899..fbfcb3f 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -497,6 +497,24 @@ metric_info["writing"] = { "color": "21/a", } +metric_info["apply_finish_time"] = { + "title": _("Apply Finish Time"), + "unit": "s", + "color": "11/a", +} + +metric_info["transport_lag"] = { + "title": _("Transport Lag"), + "unit": "s", + "color": "16/a", +} + +metric_info["apply_lag"] = { + "title": _("Apply Lag"), + "unit": "s", + "color": "21/a", +} + metric_info["rtt"] = { "title": _("Round trip time"), "unit": "s", diff --git a/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py b/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py new file mode 100644 index 0000000..951596d --- /dev/null +++ b/tests/unit/checks/generictests/datasets/oracle_dataguard_stats.py @@ -0,0 +1,49 @@ +# yapf: disable + + +checkname = 'oracle_dataguard_stats' + + +info = [['TESTDB', + 'TESTDBU2', + 'PHYSICAL STANDBYapply finish time', + '+00 00:00:00.000', + 'NOT ALLOWED', + 'ENABLED', + 'MAXIMUM', + 'PERFORMANCE', + 'DISABLED', + '', + '', + '', + 'APPLYING_LOG'], + ['TUX12C', 'TUXSTDB', 'PHYSICAL STANDBY', 'transport lag', '+00 00:00:00'], + ['TUX12C', 'TUXSTDB', 'PHYSICAL STANDBY', 'apply lag', '+00 00:28:57'], + ['TUX12C', + 'TUXSTDB', + 'PHYSICAL STANDBY', + 'apply finish time', + '+00 00:00:17.180'], + ['TUX12C', 'TUXSTDB', 'PHYSICAL STANDBY', 'estimated startup time', '20']] + + +discovery = {'': [('TESTDB.TESTDBU2', {}), ('TUX12C.TUXSTDB', {})]} + + +checks = {'': [('TESTDB.TESTDBU2', + {'apply_lag': (3600, 14400)}, + [(0, 'Database Role physical standbyapply finish time', []), + (0, 'Protection Mode performance', []), + (0, 'Broker maximum', [])]), + ('TUX12C.TUXSTDB', + {'apply_lag': (3600, 14400)}, + [(0, 'Database Role physical standby', []), + (0, + 'apply finish time 17.0 s', + [('apply_finish_time', 17, None, None, None, None)]), + (0, + 'transport lag 0.00 s', + [('transport_lag', 0, None, None, None, None)]), + (0, + 'apply lag 28 m', + [('apply_lag', 1737, 3600, 14400, None, None)])])]} \ No newline at end of file

5 years, 5 months

agent_aws: Fixed querying ApplicationELB and NetworkELB

by Simon Betz

Module: check_mk Branch: master Commit: b091b3b845716c9aaf2c1f3be5f59a32e2dad9dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b091b3b845716c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 2 13:19:47 2019 +0200 agent_aws: Fixed querying ApplicationELB and NetworkELB Change-Id: I8e880d4efe9b883bbb721184bfebeae814bc473c --- cmk/special_agents/agent_aws.py | 17 ++++++-- .../agent_aws/test_agent_aws_elbv2.py | 47 ++++++++++++++++++++-- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index eac5bd9..2287596 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -1896,9 +1896,20 @@ class ELBSummaryGeneric(AWSSectionGeneric): if load_balancer['LoadBalancerName'] in self._names ] response = self._client.describe_load_balancers(LoadBalancerNames=self._names) + else: + if colleague_contents.content: + return colleague_contents.content + response = self._client.describe_load_balancers() - return self._get_response_content(response, 'LoadBalancerDescriptions') + + if self._resource == "elb": + response_key = "LoadBalancerDescriptions" + elif self._resource == "elbv2": + response_key = "LoadBalancers" + else: + response_key = None + return self._get_response_content(response, response_key) def _matches_tag_conditions(self, tagging): if self._names is not None: @@ -2256,7 +2267,7 @@ class ELBv2Application(AWSSectionCloudwatch): return 300 def _get_colleague_contents(self): - colleague = self._received_results.get('elb_summary') + colleague = self._received_results.get('elbv2_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) @@ -2342,7 +2353,7 @@ class ELBv2Network(AWSSectionCloudwatch): return 300 def _get_colleague_contents(self): - colleague = self._received_results.get('elb_summary') + colleague = self._received_results.get('elbv2_summary') if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py index a4c39b3..7ad17d0 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elbv2.py @@ -2,12 +2,14 @@ import pytest from agent_aws_fake_clients import ( + FakeCloudwatchClient, ELBv2DescribeLoadBalancersIB, ELBv2DescribeTargetGroupsIB, ELBv2DescribeListenersIB, ELBv2DescribeRulesIB, ELBv2DescribeAccountLimitsIB, ELBv2DescribeTargetHealthIB, + ELBDescribeTagsIB, ) from cmk.special_agents.agent_aws import ( @@ -16,6 +18,8 @@ from cmk.special_agents.agent_aws import ( ELBv2Limits, ELBSummaryGeneric, ELBv2TargetGroups, + ELBv2Application, + ELBv2Network, ) @@ -26,6 +30,11 @@ class FakeELBv2Client(object): 'NextMarker': 'string', } + def describe_tags(self, LoadBalancerNames=None): + return { + 'TagDescriptions': ELBDescribeTagsIB.create_instances(amount=1), + } + def describe_target_groups(self, LoadBalancerArn=None): return { 'TargetGroups': ELBv2DescribeTargetGroupsIB.create_instances(amount=1), @@ -65,6 +74,7 @@ def get_elbv2_sections(): config.add_service_tags('elbv2_tags', tags) fake_elbv2_client = FakeELBv2Client() + fake_cloudwatch_client = FakeCloudwatchClient() elbv2_limits_distributor = ResultDistributor() elbv2_summary_distributor = ResultDistributor() @@ -73,16 +83,21 @@ def get_elbv2_sections(): elbv2_summary = ELBSummaryGeneric( fake_elbv2_client, region, config, elbv2_summary_distributor, resource='elbv2') elbv2_target_groups = ELBv2TargetGroups(fake_elbv2_client, region, config) + elbv2_application = ELBv2Application(fake_cloudwatch_client, region, config) + elbv2_network = ELBv2Network(fake_cloudwatch_client, region, config) elbv2_limits_distributor.add(elbv2_summary) elbv2_summary_distributor.add(elbv2_target_groups) - return elbv2_limits, elbv2_summary, elbv2_target_groups + elbv2_summary_distributor.add(elbv2_application) + elbv2_summary_distributor.add(elbv2_network) + return elbv2_limits, elbv2_summary, elbv2_target_groups, elbv2_application, elbv2_network return _create_elbv2_sections def test_agent_aws_elbv2_limits(get_elbv2_sections): - elbv2_limits, _elbv2_summary, _elbv2_target_groups = get_elbv2_sections(None, (None, None)) + elbv2_limits, _elbv2_summary, _elbv2_target_groups, _elbv2_application, _elbv2_network = get_elbv2_sections( + None, (None, None)) _elbv2_limits_results = elbv2_limits.run().results assert elbv2_limits.cache_interval == 300 @@ -90,7 +105,8 @@ def test_agent_aws_elbv2_limits(get_elbv2_sections): def test_agent_aws_elbv2_summary(get_elbv2_sections): - elbv2_limits, elbv2_summary, _elbv2_target_groups = get_elbv2_sections(None, (None, None)) + elbv2_limits, elbv2_summary, _elbv2_target_groups, _elbv2_application, _elbv2_network = get_elbv2_sections( + None, (None, None)) _elbv2_limits_results = elbv2_limits.run().results _elbv2_summary_results = elbv2_summary.run().results @@ -99,10 +115,33 @@ def test_agent_aws_elbv2_summary(get_elbv2_sections): def test_agent_aws_elbv2_target_groups(get_elbv2_sections): - elbv2_limits, elbv2_summary, elbv2_target_groups = get_elbv2_sections(None, (None, None)) + elbv2_limits, elbv2_summary, elbv2_target_groups, _elbv2_application, _elbv2_network = get_elbv2_sections( + None, (None, None)) _elbv2_limits_results = elbv2_limits.run().results _elbv2_summary_results = elbv2_summary.run().results _elbv2_target_groups_results = elbv2_target_groups.run().results assert elbv2_target_groups.cache_interval == 300 assert elbv2_target_groups.name == "elbv2_target_groups" + + +def test_agent_aws_elbv2_application(get_elbv2_sections): + elbv2_limits, elbv2_summary, _elbv2_target_groups, elbv2_application, _elbv2_network = get_elbv2_sections( + None, (None, None)) + _elbv2_limits_results = elbv2_limits.run().results + _elbv2_summary_results = elbv2_summary.run().results + _elbv2_application_results = elbv2_application.run().results + + assert elbv2_application.cache_interval == 300 + assert elbv2_application.name == "elbv2_application" + + +def test_agent_aws_elbv2_network(get_elbv2_sections): + elbv2_limits, elbv2_summary, _elbv2_target_groups, _elbv2_application, elbv2_network = get_elbv2_sections( + None, (None, None)) + _elbv2_limits_results = elbv2_limits.run().results + _elbv2_summary_results = elbv2_summary.run().results + _elbv2_network_results = elbv2_network.run().results + + assert elbv2_network.cache_interval == 300 + assert elbv2_network.name == "elbv2_network"

5 years, 5 months

agent_aws: factor out caching mechanism to utils

by Moritz Kiemer

Module: check_mk Branch: master Commit: db9d9bde89589ffcab90df4ba2020f1a31f242d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db9d9bde89589f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Apr 26 12:27:33 2019 +0200 agent_aws: factor out caching mechanism to utils Change-Id: Ia9310577515fbbd0326d2e9ccef99713ff9bbf85 --- cmk/special_agents/agent_aws.py | 85 ++--------------- cmk/special_agents/utils.py | 105 +++++++++++++++++++++ .../cmk/special_agents/test_utils_datacache.py | 68 +++++++++++++ 3 files changed, 183 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=db9d9bde89…

5 years, 5 months

7439 FIX PagerDuty notification when Host Check Command queries a service

by Óscar Nájera

Module: check_mk Branch: master Commit: 987a63cdee84e4decbe3d980a5e22feba1d32c78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=987a63cdee84e4… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu May 2 14:05:29 2019 +0200 7439 FIX PagerDuty notification when Host Check Command queries a service PagerDuty notification plugin tried to parse perfdata and include it on the Notification payload. This led to some buggy behavior on host problems when using a Host check command. Since this information is not Processed by PagerDuty only showed, we drop the perfdata information out of the notification. Also for consistency as other notification plugins don't include this information either. FEED-3479 Change-Id: Iddb84b8e6b1000f9b2bfb136dbd84e54287468f7 --- .werks/7439 | 15 +++++++++++++++ cmk/notification_plugins/pagerduty.py | 14 -------------- tests/unit/cmk/notifications/test_pagerduty.py | 5 ----- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.werks/7439 b/.werks/7439 new file mode 100644 index 0000000..6cd59e2 --- /dev/null +++ b/.werks/7439 @@ -0,0 +1,15 @@ +Title: PagerDuty notification when Host Check Command queries a service +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1556798474 +Class: fix + +PagerDuty notification plugin tried to parse perfdata and include it on the +Notification payload. This led to some buggy behavior on host problems when +using a Host check command. Since this information is not Processed by +PagerDuty only showed, we drop the perfdata information out of the +notification. Also for consistency as other notification plugins don't +include this information either. diff --git a/cmk/notification_plugins/pagerduty.py b/cmk/notification_plugins/pagerduty.py index 80cbaed..bcfad13 100644 --- a/cmk/notification_plugins/pagerduty.py +++ b/cmk/notification_plugins/pagerduty.py @@ -54,17 +54,6 @@ def pagerduty_severity(state): }[state] -def perf_values(data): - entry = ['Value', 'warn_level', 'crit_level', 'min', 'max'] - return ",".join([e + '=' + v for e, v in zip(entry, data.split(";")) if v]) - - -def construct_perfdata(data): - data = (item.split("=") for item in data.split()) - data = {k: perf_values(v) for k, v in data} - return data - - def pagerduty_msg(context): # type: (Dict) -> Dict """Build the PagerDuty incident payload""" @@ -76,13 +65,11 @@ def pagerduty_msg(context): incident_key = '{SERVICEDESC}/{HOSTNAME}:{HOSTADDRESS}'.format(**context).replace(" ", "") incident = "{SERVICESTATE}: {SERVICEDESC} on {HOSTNAME}".format(**context) output = context["SERVICEOUTPUT"] - perfdata = construct_perfdata(context["SERVICEPERFDATA"]) incident_url = service_url else: state = context["HOSTSTATE"] incident_key = '{HOSTNAME}:{HOSTADDRESS}'.format(**context).replace(" ", "") incident = '{HOSTNAME} is {HOSTSTATE}'.format(**context) - perfdata = construct_perfdata(context["HOSTPERFDATA"]) output = context["HOSTOUTPUT"] incident_url = host_url @@ -98,7 +85,6 @@ def pagerduty_msg(context): "info": output, "host": context.get('HOSTNAME'), "host_address": context.get('HOSTADDRESS'), - "perfdata": perfdata, } } } diff --git a/tests/unit/cmk/notifications/test_pagerduty.py b/tests/unit/cmk/notifications/test_pagerduty.py index 3cdc5c7..924ab72 100644 --- a/tests/unit/cmk/notifications/test_pagerduty.py +++ b/tests/unit/cmk/notifications/test_pagerduty.py @@ -31,10 +31,6 @@ from cmk.notification_plugins.pagerduty import pagerduty_msg "host": "site1", "host_address": "127.0.0.1", "info": "Service Down", - "perfdata": { - "last_updated": "Value=20.599114", - "new_files": "Value=0" - } }, "severity": "critical", "source": "127.0.0.1", @@ -67,7 +63,6 @@ from cmk.notification_plugins.pagerduty import pagerduty_msg "host": "win7vm", "host_address": "10.3.1.239", "info": "Packet received via smart PING", - "perfdata": {} }, "severity": "info", "source": "10.3.1.239",

5 years, 5 months

Removed left over BUILD_PACKAGES

by Lars Michelsen

Module: check_mk Branch: master Commit: c5d7e055564d7dd8d742791246fa877386b4c97d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d7e055564d7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 23:44:48 2019 +0200 Removed left over BUILD_PACKAGES Change-Id: I08ed2c84b8364e2dbaf43b7ee894ab01efc3d8f2 --- omd/distros/SLES_12SP4.mk | 51 ----------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/omd/distros/SLES_12SP4.mk b/omd/distros/SLES_12SP4.mk index 84b4c0e..937bf98 100644 --- a/omd/distros/SLES_12SP4.mk +++ b/omd/distros/SLES_12SP4.mk @@ -1,55 +1,4 @@ DISTRO_CODE = sles12sp4 -BUILD_PACKAGES = -BUILD_PACKAGES += tar # needed for "make rpm" -BUILD_PACKAGES += rpm-devel # needed for "make rpm" -BUILD_PACKAGES += unzip # unpack src files of packages -BUILD_PACKAGES += groff # needed for building rrdtool -BUILD_PACKAGES += libltdl7 # needed for gearman -BUILD_PACKAGES += libtool # needed for gearman -BUILD_PACKAGES += boost-devel -BUILD_PACKAGES += fping -BUILD_PACKAGES += samba-client # otherwise path to smblient missing in util.pm -BUILD_PACKAGES += rpcbind # otherwise missing path in util.pm -BUILD_PACKAGES += bind-utils # check_dns -BUILD_PACKAGES += freetype2-devel -BUILD_PACKAGES += gcc -BUILD_PACKAGES += gcc-c++ -BUILD_PACKAGES += gd-devel -BUILD_PACKAGES += git -BUILD_PACKAGES += glib2-devel -BUILD_PACKAGES += libcurl-devel # needed by perl modules / thruk -BUILD_PACKAGES += libexpat-devel -BUILD_PACKAGES += libevent-devel -BUILD_PACKAGES += libgnutls-devel -BUILD_PACKAGES += libjpeg62-devel -BUILD_PACKAGES += libmysqlclient-devel -BUILD_PACKAGES += libopenssl-devel -BUILD_PACKAGES += libpng16-devel # Perl::GD -BUILD_PACKAGES += libXpm-devel # Perl::GD -BUILD_PACKAGES += libvpx-devel # Perl::GD -BUILD_PACKAGES += libtiff-devel # Perl::GD -BUILD_PACKAGES += libuuid-devel -BUILD_PACKAGES += libxml2-devel -BUILD_PACKAGES += sqlite3-devel # needed by Python (for sqlite3 module) -BUILD_PACKAGES += tk-devel # needed by Python (for Tkinter module) -BUILD_PACKAGES += make -BUILD_PACKAGES += mysql -BUILD_PACKAGES += net-snmp -BUILD_PACKAGES += openldap2-devel -BUILD_PACKAGES += pango-devel -BUILD_PACKAGES += patch -BUILD_PACKAGES += postgresql-devel -BUILD_PACKAGES += readline-devel -BUILD_PACKAGES += apache2-devel -BUILD_PACKAGES += freeradius-client-devel -BUILD_PACKAGES += libbz2-devel # needed for msitools -BUILD_PACKAGES += libgsf-devel # needed for msitools -BUILD_PACKAGES += libpcap-devel # needed buy CMC -BUILD_PACKAGES += rrdtool-devel # needed for CMC -BUILD_PACKAGES += libffi-devel # needed for pyOpenSSL (and dependant) compilations -BUILD_PACKAGES += krb5-devel # needed for pykerberos / requests-kerberos python modules -BUILD_PACKAGES += flex # needed for heirloom-pkgtools -BUILD_PACKAGES += openssh # needed for check_by_ssh OS_PACKAGES = OS_PACKAGES += cronie # needed for sites cron jobs OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan

5 years, 5 months

Remove ancient REDHAT_* files (which were symlinks before); We use CENTOS_* for building

by Lars Michelsen

Module: check_mk Branch: master Commit: ff672d2fdea0aff1a01a22e8f6fbfb004f328810 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff672d2fdea0af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 2 23:36:17 2019 +0200 Remove ancient REDHAT_* files (which were symlinks before); We use CENTOS_* for building Change-Id: Ica9c59c14d590d967625ec55f1abe5e1ecea8087 --- omd/distros/REDHAT_5.mk | 53 --------------------------------------------- omd/distros/REDHAT_6.mk | 55 ----------------------------------------------- omd/distros/REDHAT_7.mk | 57 ------------------------------------------------- 3 files changed, 165 deletions(-) diff --git a/omd/distros/REDHAT_5.mk b/omd/distros/REDHAT_5.mk deleted file mode 100644 index 4748f13..0000000 --- a/omd/distros/REDHAT_5.mk +++ /dev/null @@ -1,53 +0,0 @@ -DISTRO_CODE = el5 -OS_PACKAGES = -OS_PACKAGES += time # needed for mk-job -OS_PACKAGES += traceroute # needed for Check_MK parent scan -OS_PACKAGES += curl -OS_PACKAGES += dialog -OS_PACKAGES += expat -OS_PACKAGES += gd -OS_PACKAGES += graphviz -OS_PACKAGES += graphviz-gd -OS_PACKAGES += httpd -OS_PACKAGES += libevent -OS_PACKAGES += libtool-ltdl -OS_PACKAGES += pango -OS_PACKAGES += binutils # Needed by Check_MK Agent Bakery -OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery -OS_PACKAGES += php -OS_PACKAGES += php-cli -OS_PACKAGES += php-xml -OS_PACKAGES += php-mbstring -OS_PACKAGES += php-pdo -OS_PACKAGES += php-gd -OS_PACKAGES += readline -OS_PACKAGES += rsync -OS_PACKAGES += uuid -OS_PACKAGES += xinetd -OS_PACKAGES += radiusclient-ng -OS_PACKAGES += libpcap # needed for ICMP of CMC -OS_PACKAGES += glib2 # needed by msitools/Agent Bakery -OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting -OS_PACKAGES += libgsf # needed by msitools/Agent Bakery -OS_PACKAGES += cpio # needed for Agent bakery (solaris pkgs) -OS_PACKAGES += bind-utils # needed for check_dns -#OS_PACKAGES += pyOpenSSL # needed for Agent Bakery (deployment) -OS_PACKAGES += libffi # needed for pyOpenSSL and dependant -USERADD_OPTIONS = -M -ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s -PACKAGE_INSTALL = yum -y makecache ; yum -y install -ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on -APACHE_CONF_DIR = /etc/httpd/conf.d -APACHE_INIT_NAME = httpd -APACHE_USER = apache -APACHE_GROUP = apache -APACHE_BIN = /usr/sbin/httpd -APACHE_CTL = /usr/sbin/apachectl -APACHE_MODULE_DIR = /usr/lib/httpd/modules -APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules -HTPASSWD_BIN = /usr/bin/htpasswd -PHP_FCGI_BIN = /usr/bin/php-cgi -APACHE_ENMOD = true %s -BECOME_ROOT = su -c -MOUNT_OPTIONS = -INIT_CMD = /etc/init.d/%(name)s %(action)s diff --git a/omd/distros/REDHAT_6.mk b/omd/distros/REDHAT_6.mk deleted file mode 100644 index 3f2ea45..0000000 --- a/omd/distros/REDHAT_6.mk +++ /dev/null @@ -1,55 +0,0 @@ -DISTRO_CODE = el6 -OS_PACKAGES = -OS_PACKAGES += time # needed for mk-job -OS_PACKAGES += traceroute # needed for Check_MK parent scan -OS_PACKAGES += curl -OS_PACKAGES += dialog -OS_PACKAGES += expat -OS_PACKAGES += graphviz -OS_PACKAGES += graphviz-gd -OS_PACKAGES += httpd -OS_PACKAGES += libevent -OS_PACKAGES += libtool-ltdl -OS_PACKAGES += pango -OS_PACKAGES += php -OS_PACKAGES += php-cli -OS_PACKAGES += php-xml -OS_PACKAGES += php-mbstring -OS_PACKAGES += php-pdo -OS_PACKAGES += php-gd -OS_PACKAGES += readline -OS_PACKAGES += rsync -OS_PACKAGES += rpcbind -OS_PACKAGES += uuid -OS_PACKAGES += xinetd -OS_PACKAGES += cronie -OS_PACKAGES += freeradius-utils -OS_PACKAGES += perl-Time-HiRes # needed for PNP4Nagios -OS_PACKAGES += libpcap # needed for ICMP of CMC -OS_PACKAGES += glib2 # needed by msitools/Agent Bakery -OS_PACKAGES += bind-utils # needed for check_dns -OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting -OS_PACKAGES += libgsf # needed by msitools/Agent Bakery -OS_PACKAGES += cpio # needed for Agent bakery (solaris pkgs) -OS_PACKAGES += binutils # Needed by Check_MK Agent Bakery -OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery -#OS_PACKAGES += pyOpenSSL # needed for Agent Bakery (deployment) -OS_PACKAGES += libffi # needed for pyOpenSSL and dependant -USERADD_OPTIONS = -M -ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s -PACKAGE_INSTALL = yum -y makecache ; yum -y install -ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on -APACHE_CONF_DIR = /etc/httpd/conf.d -APACHE_INIT_NAME = httpd -APACHE_USER = apache -APACHE_GROUP = apache -APACHE_BIN = /usr/sbin/httpd -APACHE_CTL = /usr/sbin/apachectl -APACHE_MODULE_DIR = /usr/lib/httpd/modules -APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules -HTPASSWD_BIN = /usr/bin/htpasswd -PHP_FCGI_BIN = /usr/bin/php-cgi -APACHE_ENMOD = true %s -BECOME_ROOT = su -c -MOUNT_OPTIONS = -INIT_CMD = /etc/init.d/%(name)s %(action)s diff --git a/omd/distros/REDHAT_7.mk b/omd/distros/REDHAT_7.mk deleted file mode 100644 index 8e6acdb..0000000 --- a/omd/distros/REDHAT_7.mk +++ /dev/null @@ -1,57 +0,0 @@ -DISTRO_CODE = el7 -OS_PACKAGES = -OS_PACKAGES += time # needed for mk-job -OS_PACKAGES += traceroute # needed for Check_MK parent scan -OS_PACKAGES += curl -OS_PACKAGES += dialog -OS_PACKAGES += expat -OS_PACKAGES += graphviz -OS_PACKAGES += graphviz-gd -OS_PACKAGES += httpd -OS_PACKAGES += libevent -OS_PACKAGES += libdbi -OS_PACKAGES += libtool-ltdl -OS_PACKAGES += rpcbind -OS_PACKAGES += pango -OS_PACKAGES += perl-Locale-Maketext-Simple -OS_PACKAGES += perl-IO-Zlib -OS_PACKAGES += php -OS_PACKAGES += php-cli -OS_PACKAGES += php-xml -OS_PACKAGES += php-mbstring -OS_PACKAGES += php-pdo -OS_PACKAGES += php-gd -OS_PACKAGES += readline -OS_PACKAGES += rsync -OS_PACKAGES += uuid -OS_PACKAGES += xinetd -OS_PACKAGES += cronie -OS_PACKAGES += freeradius-utils -OS_PACKAGES += libpcap # needed for ICMP of CMC -OS_PACKAGES += glib2 # needed by msitools/Agent Bakery -OS_PACKAGES += bind-utils # needed for check_dns -OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting -OS_PACKAGES += libgsf # needed by msitools/Agent Bakery -OS_PACKAGES += cpio # needed for Agent bakery (solaris pkgs) -OS_PACKAGES += binutils # Needed by Check_MK Agent Bakery -OS_PACKAGES += rpm-build # Needed by Check_MK Agent Bakery -#OS_PACKAGES += pyOpenSSL # needed for Agent Bakery (deployment) -OS_PACKAGES += libffi # needed for pyOpenSSL and dependant -USERADD_OPTIONS = -M -ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s -PACKAGE_INSTALL = yum -y makecache ; yum -y install -ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on -APACHE_CONF_DIR = /etc/httpd/conf.d -APACHE_INIT_NAME = httpd -APACHE_USER = apache -APACHE_GROUP = apache -APACHE_BIN = /usr/sbin/httpd -APACHE_CTL = /usr/sbin/apachectl -APACHE_MODULE_DIR = /usr/lib/httpd/modules -APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules -HTPASSWD_BIN = /usr/bin/htpasswd -PHP_FCGI_BIN = /usr/bin/php-cgi -APACHE_ENMOD = true %s -BECOME_ROOT = su -c -MOUNT_OPTIONS = -INIT_CMD = /usr/bin/systemctl %(action)s %(name)s.service

5 years, 5 months

← Newer
1
...
26
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2019