Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

agent_aws: Separated 'filter by names or tags' argument

by Simon Betz

Module: check_mk Branch: master Commit: bd0c8a347c869f75677ba18ff9bd8cba2e35b082 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd0c8a347c869f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 9 12:01:04 2019 +0200 agent_aws: Separated 'filter by names or tags' argument Change-Id: Ie11e4fff79d8badda23359f592604140b55cda89 --- cmk/special_agents/agent_aws.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index 7f50f5d..259f2d6 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -2369,7 +2369,8 @@ AWSServiceAttributes = NamedTuple("AWSServiceAttributes", [ ("key", str), ("title", str), ("global_service", bool), - ("filter_by_names_or_tags", bool), + ("filter_by_names", bool), + ("filter_by_tags", bool), ("limits", bool), ]) @@ -2378,37 +2379,43 @@ AWSServices = [ key="ce", title="Costs and usage", global_service=True, - filter_by_names_or_tags=False, + filter_by_names=False, + filter_by_tags=False, limits=False), AWSServiceAttributes( key="ec2", title="Elastic Compute Cloud (EC2)", global_service=False, - filter_by_names_or_tags=True, + filter_by_names=True, + filter_by_tags=True, limits=True), AWSServiceAttributes( key="ebs", title="Elastic Block Storage (EBS)", global_service=False, - filter_by_names_or_tags=True, + filter_by_names=True, + filter_by_tags=True, limits=True), AWSServiceAttributes( key="s3", title="Simple Storage Service (S3)", global_service=False, - filter_by_names_or_tags=True, + filter_by_names=True, + filter_by_tags=True, limits=True), AWSServiceAttributes( key="elb", title="Elastic Load Balancing (ELB)", global_service=False, - filter_by_names_or_tags=True, + filter_by_names=True, + filter_by_tags=True, limits=True), AWSServiceAttributes( key="rds", title="Relational Database Service (RDS)", global_service=False, - filter_by_names_or_tags=True, + filter_by_names=True, + filter_by_tags=True, limits=True), ] @@ -2449,9 +2456,10 @@ def parse_arguments(argv): ["%-15s %s" % (e.key, e.title) for e in AWSServices if not e.global_service])) for service in AWSServices: - if service.filter_by_names_or_tags: + if service.filter_by_names: parser.add_argument( '--%s-names' % service.key, nargs='+', help="Names for %s" % service.title) + if service.filter_by_tags: parser.add_argument( '--%s-tag-key' % service.key, nargs=1,

5 years, 6 months

Execute label discovery during regular check execution

by Lars Michelsen

Module: check_mk Branch: master Commit: 416602c49d74f60a9dca72ff985b7656077d9cfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416602c49d74f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:35:38 2019 +0200 Execute label discovery during regular check execution This is done in the way the structured status data inventory is done. CMK-1818 Change-Id: I309208b6e45d36d35e04cd4fdd99288ae64e6a28 --- cmk/gui/plugins/wato/inventory.py | 8 +++++--- cmk_base/checking.py | 16 +++------------- cmk_base/inventory.py | 31 +++++++++++++++++++++++++------ 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/wato/inventory.py b/cmk/gui/plugins/wato/inventory.py index aec3f69..8f971e1 100644 --- a/cmk/gui/plugins/wato/inventory.py +++ b/cmk/gui/plugins/wato/inventory.py @@ -120,10 +120,12 @@ class RulespecActiveChecksCmkInv(HostRulespec): )), ("host_label_inventory", DropdownChoice( - title=_("Host label inventory"), + title=_("Host label discovery"), + help=_("All hosts configured via this ruleset will try to find new " + "host labels during every check cycle."), choices=[ - (True, _("Do automatic host label inventory")), - (False, _("Do not perform automatic host label inventory")), + (True, _("Do automatic host label discovery")), + (False, _("Do not perform automatic host label discovery")), ], default_value=True, )), diff --git a/cmk_base/checking.py b/cmk_base/checking.py index f1ac1e0..08d9a8f 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -245,24 +245,14 @@ def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names else: missing_sections.add(cmk_base.check_utils.section_name_of(check_plugin_name)) - if config.do_status_data_inventory_for(hostname): - import cmk_base.inventory as inventory - inventory.do_status_data_inventory(sources, multi_host_sections, hostname, ipaddress) - else: - _cleanup_status_data(hostname) + import cmk_base.inventory as inventory + inventory.do_inventory_actions_during_checking_for(sources, multi_host_sections, hostname, + ipaddress) missing_section_list = sorted(list(missing_sections)) return num_success, missing_section_list -def _cleanup_status_data(hostname): - filepath = "%s/%s" % (cmk.utils.paths.status_data_dir, hostname) - if os.path.exists(filepath): # Remove empty status data files. - os.remove(filepath) - if os.path.exists(filepath + ".gz"): - os.remove(filepath + ".gz") - - def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, item, params, description): # Make a bit of context information globally available, so that functions diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 4090ec7..6ca87b4 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -167,19 +167,38 @@ def do_inv_check(hostname, options): return status, infotexts, long_infotexts, perfdata -def do_status_data_inventory(sources, multi_host_sections, hostname, ipaddress): - if config.is_cluster(hostname): - return - # cmk_base/modes/check_mk.py loads check plugins but not inventory plugins +def do_inventory_actions_during_checking_for(sources, multi_host_sections, hostname, ipaddress): + do_status_data_inventory = not config.is_cluster(hostname) \ + and config.do_status_data_inventory_for(hostname) + + do_host_label_discovery = config.do_host_label_discovery_for(hostname) + + if not do_status_data_inventory: + _cleanup_status_data(hostname) + + if not do_status_data_inventory and not do_host_label_discovery: + return # nothing to do here + + # This is called during checking, but the inventory plugins are not loaded yet import cmk_base.inventory_plugins as inventory_plugins inventory_plugins.load_plugins(check_api.get_check_api_context, get_inventory_context) + _do_inv_for( sources, multi_host_sections=multi_host_sections, hostname=hostname, ipaddress=ipaddress, - do_status_data_inv=True, - do_host_label_discovery=False) + do_status_data_inv=do_status_data_inventory, + do_host_label_discovery=do_host_label_discovery, + ) + + +def _cleanup_status_data(hostname): + filepath = "%s/%s" % (cmk.utils.paths.status_data_dir, hostname) + if os.path.exists(filepath): # Remove empty status data files. + os.remove(filepath) + if os.path.exists(filepath + ".gz"): + os.remove(filepath + ".gz") def _do_inv_for(sources, multi_host_sections, hostname, ipaddress, do_status_data_inv,

5 years, 6 months

Moved NagiosCore and related classes to a separate file.

by Sven Panne

Module: check_mk Branch: master Commit: 1e3bf96c89a5816ad83ebdbcaeda1f3ef4c27fa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e3bf96c89a581… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 9 10:03:30 2019 +0200 Moved NagiosCore and related classes to a separate file. Cleaned up some funny #includes on the way. Change-Id: I2847466d56ee159d965fdb9720a6d46388fcdb09 --- livestatus/src/DowntimesOrComments.h | 4 +- livestatus/src/LogCache.cc | 1 - livestatus/src/Logfile.cc | 1 + livestatus/src/Logfile.h | 4 +- livestatus/src/Makefile.am | 1 + livestatus/src/NagiosCore.cc | 283 ++++++++++++++++++++++++++++++ livestatus/src/NagiosCore.h | 179 +++++++++++++++++++ livestatus/src/Query.cc | 1 + livestatus/src/Query.h | 4 +- livestatus/src/Store.cc | 3 - livestatus/src/module.cc | 322 +---------------------------------- 11 files changed, 477 insertions(+), 326 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1e3bf96c89…

5 years, 6 months

Fix label links to set the correct context

by Lars Michelsen

Module: check_mk Branch: master Commit: 2620bb0c53a01a4f557b5c211e23c171e28d8915 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2620bb0c53a01a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:10:22 2019 +0200 Fix label links to set the correct context Change-Id: If2910a71b9a41a7e557454aa971f97000153c623 --- cmk/gui/view_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/view_utils.py b/cmk/gui/view_utils.py index c43ee4e..69f2349 100644 --- a/cmk/gui/view_utils.py +++ b/cmk/gui/view_utils.py @@ -164,7 +164,7 @@ def _render_tag_group(tg_id, tag, object_type, with_link, label_type): else: raise NotImplementedError() - url = html.makeuri([ + url = html.makeuri_contextless([ ("filled_in", "filter"), ("search", "Search"), ("view_name", "searchhost" if object_type == "host" else "searchsvc"),

5 years, 6 months

Add pathlib path declaration to fix test

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c183c688ae2272065a3249d45c3d423c56858c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c183c688ae227… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:04:29 2019 +0200 Add pathlib path declaration to fix test Change-Id: Ic97ad617efc48acab44030bd6897c63a9b169c52 --- tests/integration/cmk/utils/test_paths.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/cmk/utils/test_paths.py b/tests/integration/cmk/utils/test_paths.py index 7871234..edb14f7 100644 --- a/tests/integration/cmk/utils/test_paths.py +++ b/tests/integration/cmk/utils/test_paths.py @@ -5,6 +5,8 @@ import cmk.utils.paths pathlib_paths = [ "discovered_host_labels_dir", + "piggyback_dir", + "piggyback_source_dir", ]

5 years, 6 months

Add new expected automations

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b54b1a509c1f66531539ba213dbf4f363d1724b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b54b1a509c1f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:02:46 2019 +0200 Add new expected automations Change-Id: I9ab91a677b766867b8531b76417709261416e63d --- tests/unit/cmk_base/test_unit_automations.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/cmk_base/test_unit_automations.py b/tests/unit/cmk_base/test_unit_automations.py index 7e6189b..d509d13 100644 --- a/tests/unit/cmk_base/test_unit_automations.py +++ b/tests/unit/cmk_base/test_unit_automations.py @@ -7,6 +7,7 @@ import cmk_base.config as config def test_registered_automations(site): needed_automations = [ 'active-check', + 'analyse-host', 'analyse-service', 'delete-hosts', 'diag-host', @@ -15,6 +16,7 @@ def test_registered_automations(site): 'get-check-information', 'get-check-manpage', 'get-configuration', + 'get-labels-of', 'get-real-time-checks', 'get-service-configurations', 'inventory',

5 years, 6 months

Only add service labels in case the service was found by self._get_service_info

by Lars Michelsen

Module: check_mk Branch: master Commit: 9651ef812e76c84da1d834ed499e93fa1b1567e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9651ef812e76c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:08:25 2019 +0200 Only add service labels in case the service was found by self._get_service_info Change-Id: Idfe18d6e83cdc50b884a72e889a4e89d78305978 --- cmk_base/automations/check_mk.py | 3 ++- tests/integration/cmk_base/test_automations.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 7520a73..2a7ea40 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -575,7 +575,8 @@ class AutomationAnalyseServices(Automation): servicedesc = args[1].decode("utf-8") service_info = self._get_service_info(config_cache, hostname, servicedesc) - service_info["labels"] = config_cache.labels_of_service(hostname, servicedesc) + if service_info: + service_info["labels"] = config_cache.labels_of_service(hostname, servicedesc) return service_info # Determine the type of the check, and how the parameters are being diff --git a/tests/integration/cmk_base/test_automations.py b/tests/integration/cmk_base/test_automations.py index 728f32b..6fc4dda 100644 --- a/tests/integration/cmk_base/test_automations.py +++ b/tests/integration/cmk_base/test_automations.py @@ -1,7 +1,8 @@ +# pylint: disable=redefined-outer-name import re import ast import subprocess -import pytest +import pytest # type: ignore from testlib import web, repo_path # pylint: disable=unused-import

5 years, 6 months

Made automation registration test a unit test

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ce1973663ea404dc088714c4cf4672944fb6383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ce1973663ea40… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 15:02:22 2019 +0200 Made automation registration test a unit test Change-Id: Iecc672a1673fdb4d3bfd2d6818047a7b4d80aac0 --- tests/integration/cmk_base/test_automations.py | 60 -------------------------- tests/unit/cmk_base/test_unit_automations.py | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 60 deletions(-) diff --git a/tests/integration/cmk_base/test_automations.py b/tests/integration/cmk_base/test_automations.py index b9786a9..728f32b 100644 --- a/tests/integration/cmk_base/test_automations.py +++ b/tests/integration/cmk_base/test_automations.py @@ -67,66 +67,6 @@ def test_cfg(web, site): #. -# .--Registration--------------------------------------------------------. -# | ____ _ _ _ _ | -# | | _ \ ___ __ _(_)___| |_ _ __ __ _| |_(_) ___ _ __ | -# | | |_) / _ \/ _` | / __| __| '__/ _` | __| |/ _ \| '_ \ | -# | | _ < __/ (_| | \__ \ |_| | | (_| | |_| | (_) | | | | | -# | |_| \_\___|\__, |_|___/\__|_| \__,_|\__|_|\___/|_| |_| | -# | |___/ | -# +----------------------------------------------------------------------+ -# | Check for the loaded automation plugins | -# '----------------------------------------------------------------------' - - -def test_registered_automations(site): - import cmk_base.automations - automations = cmk_base.automations.automations._automations - - needed_automations = [ - 'active-check', - 'analyse-service', - 'delete-hosts', - 'diag-host', - 'get-agent-output', - 'get-autochecks', - 'get-check-information', - 'get-check-manpage', - 'get-configuration', - 'get-real-time-checks', - 'get-service-configurations', - 'inventory', - 'notification-analyse', - 'notification-get-bulks', - 'notification-replay', - 'reload', - 'rename-hosts', - 'restart', - 'scan-parents', - 'set-autochecks', - 'try-inventory', - 'update-dns-cache', - ] - - if site.version.is_enterprise_edition(): - needed_automations += [ - 'bake-agents', - 'get-package-info', - 'get-package', - 'create-package', - 'edit-package', - 'install-package', - 'remove-package', - 'release-package', - 'remove-unpackaged-file', - ] - - all_automations = sorted(automations.keys()) - - assert sorted(needed_automations) == all_automations - - -#. # .--Autom.calls---------------------------------------------------------. # | _ _ _ _ | # | / \ _ _| |_ ___ _ __ ___ ___ __ _| | |___ | diff --git a/tests/unit/cmk_base/test_unit_automations.py b/tests/unit/cmk_base/test_unit_automations.py index 1789606..7e6189b 100644 --- a/tests/unit/cmk_base/test_unit_automations.py +++ b/tests/unit/cmk_base/test_unit_automations.py @@ -1,7 +1,53 @@ +import cmk +import cmk_base.automations import cmk_base.automations.check_mk as automations import cmk_base.config as config +def test_registered_automations(site): + needed_automations = [ + 'active-check', + 'analyse-service', + 'delete-hosts', + 'diag-host', + 'get-agent-output', + 'get-autochecks', + 'get-check-information', + 'get-check-manpage', + 'get-configuration', + 'get-real-time-checks', + 'get-service-configurations', + 'inventory', + 'notification-analyse', + 'notification-get-bulks', + 'notification-replay', + 'reload', + 'rename-hosts', + 'restart', + 'scan-parents', + 'set-autochecks', + 'try-inventory', + 'update-dns-cache', + ] + + if cmk.is_enterprise_edition(): + needed_automations += [ + 'bake-agents', + 'get-package-info', + 'get-package', + 'create-package', + 'edit-package', + 'install-package', + 'remove-package', + 'release-package', + 'remove-unpackaged-file', + ] + + registered_automations = cmk_base.automations.automations._automations.keys() + + assert sorted(needed_automations) == sorted(registered_automations) + + def test_static_check_rules_of_host(monkeypatch): as_automation = automations.AutomationAnalyseServices() assert as_automation.static_check_rules_of("checkgroup_ding", "test-host") == []

5 years, 6 months

Fix handling of tables using group headers since 62917296f4

by Lars Michelsen

Module: check_mk Branch: master Commit: 270e2bb6395b32da5b79dc8ac84ea78ef9a3da84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=270e2bb6395b32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 14:51:10 2019 +0200 Fix handling of tables using group headers since 62917296f4 Change-Id: I8948f7b25649d5d6db7f3290894833844f93535c --- cmk/gui/table.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 4dbb95a..aad9f8c 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -362,7 +362,10 @@ class Table(object): def _get_empty_columns(self, rows, num_cols): empty_columns = [True] * num_cols - for row_spec, _css, _state, _fixed, _attrs in rows: + for row_spec, _css, state, _fixed, _attrs in rows: + if state == "header": + continue # Don't care about group headers + for col_index, (cell_content, _css_classes, _colspan) in enumerate(row_spec): empty_columns[col_index] &= not cell_content return empty_columns

5 years, 6 months

Reenable help toggle on service discovery page

by Lars Michelsen

Module: check_mk Branch: master Commit: a2758c92b7f2971a8e0517260f4dfccd34e9626f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2758c92b7f297… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 14:58:06 2019 +0200 Reenable help toggle on service discovery page Change-Id: I8f00c68212a4c89d81f6eca7d5073608d2f56497 --- cmk/gui/htmllib.py | 7 +++++-- cmk/gui/wato/pages/services.py | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 94b4bb3..10b534b 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1524,15 +1524,18 @@ class html(HTMLGenerator): def help(self, text): self.write_html(self.render_help(text)) - # Embed help box, whose visibility is controlled by a global button in the page. def render_help(self, text): + """Embed help box, whose visibility is controlled by a global button in the page.""" if text and text.strip(): - self.have_help = True + self.enable_help_toggle() style = "display: %s;" % ("block" if self.help_visible else "none") c = self.render_div(text.strip(), class_="help", style=style) return c return "" + def enable_help_toggle(self): + self.have_help = True + # # Debugging, diagnose and logging # diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 4e37754..0fb5979 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -233,6 +233,10 @@ class ModeDiscovery(WatoMode): ("varname", "ignored_checks")]), "check_parameters") def page(self): + # This is needed to make the discovery page show the help toggle + # button. The help texts on this page are only added dynamically via + # AJAX. + html.enable_help_toggle() self._async_progress_msg_container() self._service_container() html.javascript("cmk.service_discovery.start(%s, %s, %s)" %

5 years, 6 months

← Newer
1
...
33
34
35
36
37
38
39
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019