Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e5ca0a1987af67295fbcfa64b162eeb300e5210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e5ca0a1987af6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 1 11:55:20 2019 +0100 Fix displaying of background job titles * Made gui_title a classmethod because it is needed in a context where no specific job is instantiated and the title is not a object but a class attribute * Add a regression test for this issue * Add a test for ensuring the desired job classes are registered Change-Id: I2298a284d184d57ecac463c58abea793f0e155f1 --- cmk/gui/gui_background_job.py | 4 ++-- cmk/gui/userdb.py | 6 +++--- cmk/gui/wato/__init__.py | 4 ++-- cmk/gui/wato/pages/host_rename.py | 4 ++-- cmk/gui/wato/pages/parentscan.py | 4 ++-- cmk/gui/wato/pages/services.py | 4 ++-- cmk/gui/watolib/bulk_discovery.py | 6 +++--- tests/unit/cmk/gui/test_background_job.py | 30 ++++++++++++++++++++++++++++-- 8 files changed, 44 insertions(+), 18 deletions(-) diff --git a/cmk/gui/gui_background_job.py b/cmk/gui/gui_background_job.py index 3d2b0cf..f608b00 100644 --- a/cmk/gui/gui_background_job.py +++ b/cmk/gui/gui_background_job.py @@ -542,10 +542,10 @@ class JobRenderer(object): def show_job_class_infos(cls, job_class_infos, **kwargs): """Renders all jobs from the job_class_infos in a single multi-table""" html.open_table(css="job_table data") - for job_class, jobs_info in sorted(job_class_infos.items(), key=lambda x: x[0].gui_title): + for job_class, jobs_info in sorted(job_class_infos.items(), key=lambda x: x[0].gui_title()): html.open_tr() html.open_td(colspan=len(cls.get_headers())) - html.h3(job_class.gui_title) + html.h3(job_class.gui_title()) html.close_td() html.close_tr() diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 9dc10ac..1099fe9 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -1393,13 +1393,13 @@ def ajax_sync(): class UserSyncBackgroundJob(gui_background_job.GUIBackgroundJob): job_prefix = "user_sync" - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("User synchronization") def __init__(self): kwargs = {} - kwargs["title"] = self.gui_title + kwargs["title"] = self.gui_title() kwargs["deletable"] = False kwargs["stoppable"] = False diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a81b5ad..9ae56e0 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -694,8 +694,8 @@ cmk.gui.pages.register_page_handler("fetch_agent_output", lambda: PageFetchAgent class FetchAgentOutputBackgroundJob(cmk.gui.plugins.wato.utils.WatoBackgroundJob): job_prefix = "agent-output-" - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("Fetch agent output") def __init__(self, site_id, host_name, ty): diff --git a/cmk/gui/wato/pages/host_rename.py b/cmk/gui/wato/pages/host_rename.py index 2286ccd..68b009d 100644 --- a/cmk/gui/wato/pages/host_rename.py +++ b/cmk/gui/wato/pages/host_rename.py @@ -75,8 +75,8 @@ from cmk.gui.plugins.wato import ( class RenameHostsBackgroundJob(WatoBackgroundJob): job_prefix = "rename-hosts" - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("Host renaming") def __init__(self, title=None): diff --git a/cmk/gui/wato/pages/parentscan.py b/cmk/gui/wato/pages/parentscan.py index 1b57482..8190ba0 100644 --- a/cmk/gui/wato/pages/parentscan.py +++ b/cmk/gui/wato/pages/parentscan.py @@ -53,8 +53,8 @@ ParentScanResult = collections.namedtuple("ParentScanResult", class ParentScanBackgroundJob(WatoBackgroundJob): job_prefix = "parent_scan" - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("Parent scan") def __init__(self): diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 187f936..bd0efac 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -372,8 +372,8 @@ class ServiceDiscoveryBackgroundJob(WatoBackgroundJob): housekeeping_max_age_sec = 86400 # 1 day housekeeping_max_count = 20 - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("Service discovery") def __init__(self, host_name): diff --git a/cmk/gui/watolib/bulk_discovery.py b/cmk/gui/watolib/bulk_discovery.py index b9d4003..cf7041d 100644 --- a/cmk/gui/watolib/bulk_discovery.py +++ b/cmk/gui/watolib/bulk_discovery.py @@ -127,13 +127,13 @@ def vs_bulk_discovery(render_form=False, include_subfolders=True): class BulkDiscoveryBackgroundJob(WatoBackgroundJob): job_prefix = "bulk_discovery" - @property - def gui_title(self): + @classmethod + def gui_title(cls): return _("Bulk Discovery") def __init__(self): kwargs = {} - kwargs["title"] = _("Bulk discovery") + kwargs["title"] = self.gui_title() kwargs["lock_wato"] = False kwargs["deletable"] = False kwargs["stoppable"] = False diff --git a/tests/unit/cmk/gui/test_background_job.py b/tests/unit/cmk/gui/test_background_job.py index 3630500..90c4440 100644 --- a/tests/unit/cmk/gui/test_background_job.py +++ b/tests/unit/cmk/gui/test_background_job.py @@ -8,6 +8,8 @@ import testlib # type: ignore import cmk.utils.paths import cmk.gui.background_job as background_job import cmk.gui.gui_background_job as gui_background_job +# Loads all GUI modules +import cmk.gui.modules # pylint: disable=unused-import import cmk.gui.log @@ -19,6 +21,27 @@ def debug_logging(): cmk.gui.log.set_log_levels({"cmk.web": cmk.gui.log._logging.INFO}) +def test_registered_background_jobs(): + assert sorted(gui_background_job.job_registry.keys()) == sorted([ + 'ParentScanBackgroundJob', + 'BakeAgentsBackgroundJob', + 'DummyBackgroundJob', + 'RenameHostsBackgroundJob', + 'ReportingBackgroundJob', + 'RenameHostBackgroundJob', + 'FetchAgentOutputBackgroundJob', + 'BulkDiscoveryBackgroundJob', + 'UserSyncBackgroundJob', + 'ServiceDiscoveryBackgroundJob', + ]) + + +def test_registered_background_jobs_attributes(): + for job_class in gui_background_job.job_registry.values(): + assert isinstance(job_class.job_prefix, str) + assert isinstance(job_class.gui_title(), unicode) + + @pytest.fixture(autouse=True) def job_base_dir(tmpdir, monkeypatch): var_dir = Path("%s" % tmpdir) @@ -39,11 +62,14 @@ def job_base_dir(tmpdir, monkeypatch): @gui_background_job.job_registry.register class DummyBackgroundJob(gui_background_job.GUIBackgroundJob): job_prefix = "dummy_job" - gui_title = u"Dummy Job" + + @classmethod + def gui_title(cls): + return u"Dummy Job" def __init__(self): kwargs = {} - kwargs["title"] = self.gui_title + kwargs["title"] = self.gui_title() kwargs["deletable"] = False kwargs["stoppable"] = True self.finish_hello_event = multiprocessing.Event()

5 years, 4 months

aws_ec2_security_groups: New check which monitors AWS/EC2 security groups

by Simon Betz

Module: check_mk Branch: master Commit: 8c8d530347c112505ca33c747a71e74bbf2f2275 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8d530347c112… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 1 15:00:29 2019 +0100 aws_ec2_security_groups: New check which monitors AWS/EC2 security groups Change-Id: I4587c6634086ec9dee164196b3b6ea675f4ba3ad --- agents/special/agent_aws | 31 +++++++++++++++++++++++ checkman/aws_ec2_security_groups | 16 ++++++++++++ checks/aws_ec2_security_groups | 54 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 0bc1ccf..a1fedff 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -442,6 +442,34 @@ class EC2Summary(AWSSectionGeneric): return [AWSSectionResult("", [computed_content.content])] +class EC2SecurityGroups(AWSSectionGeneric): + @property + def name(self): + return "ec2_security_groups" + + @property + def interval(self): + return 300 + + def _get_colleague_contents(self): + colleague = self._received_results.get('ec2_summary') + if colleague and colleague.content: + return AWSColleagueContents(colleague.content, colleague.cache_timestamp) + return AWSColleagueContents({}, 0) + + def _fetch_raw_content(self, colleague_contents): + return colleague_contents.content + + def _compute_content(self, raw_content, colleague_contents): + return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) + + def _create_results(self, computed_content): + return [ + AWSSectionResult(piggyback_hostname, rows.get('SecurityGroups', [])) + for piggyback_hostname, rows in computed_content.content.iteritems() + ] + + class EC2(AWSSectionCloudwatch): @property def name(self): @@ -1179,12 +1207,14 @@ class AWSSectionsGeneric(AWSSections): #---sections-------------------------------------------------------- elb_health = ELBHealth(elb_client, hostname, region) + ec2_security_groups = EC2SecurityGroups(None, hostname, region) ec2 = EC2(cloudwatch_client, hostname, region) ebs = EBS(cloudwatch_client, hostname, region) elb = ELB(cloudwatch_client, hostname, region) s3 = S3(cloudwatch_client, hostname, region) #---register sections to distributors------------------------------- + ec2_summary_distributor.add(ec2_security_groups) ec2_summary_distributor.add(ec2) ec2_summary_distributor.add(ebs_summary) ec2_summary_distributor.add(ebs) @@ -1212,6 +1242,7 @@ class AWSSectionsGeneric(AWSSections): # |-- elb if 'ec2' in services: self._sections.append(ec2_summary) + self._sections.append(ec2_security_groups) self._sections.append(ec2) if 'ebs' in services: diff --git a/checkman/aws_ec2_security_groups b/checkman/aws_ec2_security_groups new file mode 100644 index 0000000..0c4f757 --- /dev/null +++ b/checkman/aws_ec2_security_groups @@ -0,0 +1,16 @@ +title: AWS EC2 Security Groups +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors the security groups attached to AWS EC2 + instances. + To make this check work you have to configure the related + special agent {Amazon Web Services (AWS)}. + + During discovery the security groups are remembered and if + one changes the check state will be CRIT. + +inventory: + One service is created. diff --git a/checks/aws_ec2_security_groups b/checks/aws_ec2_security_groups new file mode 100644 index 0000000..81d4519 --- /dev/null +++ b/checks/aws_ec2_security_groups @@ -0,0 +1,54 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inventory_aws_ec2_security_groups(parsed): + if parsed: + return [(None, "%r" % [group['GroupId'] for group in parsed])] + + +def check_aws_ec2_security_groups(item, params, parsed): + for group in parsed: + state = 0 + descr = group.get('Description') + if descr: + prefix = "[%s] " % descr + else: + prefix = "" + infotext = "%s%s: %s" % (prefix, group['GroupName'], group['GroupId']) + if group['GroupId'] not in params: + infotext += " (has changed)" + state = 2 + yield state, infotext + + +check_info['aws_ec2_security_groups'] = { + 'parse_function': parse_aws, + 'inventory_function': inventory_aws_ec2_security_groups, + 'check_function': check_aws_ec2_security_groups, + 'service_description': 'AWS/EC2 Security Groups', + 'includes': ['aws.include'], +}

5 years, 4 months

aws_ec2: Fixed KeyError: 'Instances'

by Simon Betz

Module: check_mk Branch: master Commit: e70c81d6cbf593d174490c81062a56047568deba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e70c81d6cbf593… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 1 15:33:58 2019 +0100 aws_ec2: Fixed KeyError: 'Instances' Change-Id: I6ff834ed0ff4e98fabb0eaa21112fb45b459dd11 --- checks/aws_ec2_summary | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/checks/aws_ec2_summary b/checks/aws_ec2_summary index 62c0b0c..b54c5a4 100644 --- a/checks/aws_ec2_summary +++ b/checks/aws_ec2_summary @@ -30,14 +30,6 @@ def inventory_aws_ec2_summary(parsed): return [(None, {})] -def _extract_aws_ec2_security_groups(metrics): - # metrics is dict with key 'SecurityGroups' - return ", ".join([ - "%s: %s" % (pair['GroupId'], pair['GroupName']) - for pair in metrics.get('SecurityGroups', []) - ]) - - def _extract_aws_ec2_tags(metrics): # metrics is dict with key 'Tags' return ", ".join(["%s: %s" % (pair['Key'], pair['Value']) for pair in metrics.get('Tags', [])]) @@ -46,16 +38,16 @@ def _extract_aws_ec2_tags(metrics): def check_aws_ec2_summary(item, params, parsed): instances_by_state = {} long_output = [] - for reservation in parsed: - for instance in reservation['Instances']: + for instances in parsed: + for instance_name, instance in instances.iteritems(): instance_id = instance['InstanceId'] instance_state = instance['State']['Name'] instances_by_state.setdefault(instance_state, []).append(instance_id) - long_output_info = ["Instance: %s, Status: %s" % (instance_id, instance_state)] - security_groups = _extract_aws_ec2_security_groups(instance) - if security_groups: - long_output_info.append("[Security groups] %s" % security_groups) + prefix = "" + if instance_name != instance_id: + prefix = "[%s] " % instance_name + long_output_info = ["%s%s: %s" % (prefix, instance_id, instance_state)] tags = _extract_aws_ec2_tags(instance) if tags: long_output_info.append("[Tags] %s" % tags)

5 years, 4 months

agent_aws: Simplified 'security group to EC2 instance' mapping

by Simon Betz

Module: check_mk Branch: master Commit: 7a733a42bb6317b082ca6c78631d1c2f3d67f255 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a733a42bb6317… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 1 14:51:52 2019 +0100 agent_aws: Simplified 'security group to EC2 instance' mapping Change-Id: Ib23b3dd8f4616cfb47a0f7c4cfacdcf07c58e931 --- agents/special/agent_aws | 130 +++++++++++++++-------------------------------- 1 file changed, 41 insertions(+), 89 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 7b01f2a..0bc1ccf 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -375,51 +375,6 @@ class CostsAndUsage(AWSSectionGeneric): #. -# .--security groups-----------------------------------------------------. -# | _ _ | -# | ___ ___ ___ _ _ _ __(_) |_ _ _ | -# | / __|/ _ \/ __| | | | '__| | __| | | | | -# | \__ \ __/ (__| |_| | | | | |_| |_| | | -# | |___/\___|\___|\__,_|_| |_|\__|\__, | | -# | |___/ | -# | | -# | __ _ _ __ ___ _ _ _ __ ___ | -# | / _` | '__/ _ \| | | | '_ \/ __| | -# | | (_| | | | (_) | |_| | |_) \__ \ | -# | \__, |_| \___/ \__,_| .__/|___/ | -# | |___/ |_| | -# '----------------------------------------------------------------------' - - -class SecurityGroups(AWSSectionGeneric): - @property - def name(self): - return "security_groups" - - @property - def interval(self): - return 300 - - def _get_colleague_contents(self): - return AWSColleagueContents(None, 0) - - def _fetch_raw_content(self, colleague_contents): - # TODO Filter - response = self._client.describe_security_groups() - try: - return response['SecurityGroups'] - except KeyError as e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - return [] - - def _compute_content(self, raw_content, colleague_contents): - return AWSComputedContent(raw_content.content, raw_content.cache_timestamp) - - def _create_results(self, computed_content): - return [AWSSectionResult("", computed_content.content)] - - -#. # .--EC2-----------------------------------------------------------------. # | _____ ____ ____ | # | | ____/ ___|___ \ | @@ -449,39 +404,42 @@ class EC2Summary(AWSSectionGeneric): # TODO Filter response = self._client.describe_instances() try: - return response['Reservations'] + instances = { + self._extract_instance_name_from_tags(instance): instance + for reservation in response['Reservations'] + for instance in reservation.get('Instances', []) + } except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) - return {} + instances = {} + + # TODO Filter + response = self._client.describe_security_groups() + try: + security_groups = {group['GroupId']: group for group in response['SecurityGroups']} + except KeyError as e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + security_groups = {} + return instances, security_groups def _compute_content(self, raw_content, colleague_contents): - reservations = raw_content.content - for security_group in colleague_contents.content: - for reservation in reservations: - if security_group['OwnerId'] == reservation['OwnerId']: - reservation.setdefault('SecurityGroups', []).append(security_group) - return AWSComputedContent({ - "Reservations": reservations, - "mapping": self._map_instance_id_to_name(reservations), - }, raw_content.cache_timestamp) - - def _map_instance_id_to_name(self, reservations): - mapping = {} - for reservation in reservations: - for instance in reservation.get('Instances', []): - instance_id = instance['InstanceId'] - instance_name = self._extract_instance_name_from_tags(instance, instance_id) - mapping.setdefault(instance_id, instance_name) - return mapping - - def _extract_instance_name_from_tags(self, instance, instance_id): + instances, security_groups = raw_content.content + + for instance in instances.itervalues(): + for security_group in instance.get('SecurityGroups', []): + security_group_id = security_group['GroupId'] + if security_group_id in security_groups: + security_group.update(security_groups[security_group_id]) + return AWSComputedContent(instances, raw_content.cache_timestamp) + + def _extract_instance_name_from_tags(self, instance): for tag in instance.get('Tags', []): if tag.get('Key') == 'Name': return tag['Value'] - return instance_id + return instance['InstanceId'] def _create_results(self, computed_content): - return [AWSSectionResult("", computed_content.content['Reservations'])] + return [AWSSectionResult("", [computed_content.content])] class EC2(AWSSectionCloudwatch): @@ -496,14 +454,14 @@ class EC2(AWSSectionCloudwatch): def _get_colleague_contents(self): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: - return AWSColleagueContents( - colleague.content.get('mapping', {}), colleague.cache_timestamp) + return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0) def _get_metrics(self, colleague_contents): metrics = [] idx = 0 - for instance_id, instance_name in colleague_contents.content.iteritems(): + for instance_name, attrs in colleague_contents.content.iteritems(): + instance_id = attrs['InstanceId'] for metric_name, unit in [ ("CPUCreditUsage", "Count"), ("CPUCreditBalance", "Count"), @@ -880,8 +838,8 @@ class EBSSummary(AWSSectionGeneric): def _get_colleague_contents(self): colleague = self._received_results.get('ec2_summary') if colleague and colleague.content: - return AWSColleagueContents( - colleague.content.get('mapping', {}), colleague.cache_timestamp) + mapping = {v['InstanceId']: k for k, v in colleague.content.iteritems()} + return AWSColleagueContents(mapping, colleague.cache_timestamp) return AWSColleagueContents({}, 0) def _fetch_raw_content(self, colleague_contents): @@ -1207,14 +1165,12 @@ class AWSSectionsGeneric(AWSSections): cloudwatch_client = self._init_client('cloudwatch') #---distributors---------------------------------------------------- - security_groups_distributor = ResultDistributor() ec2_summary_distributor = ResultDistributor() elb_summary_distributor = ResultDistributor() ebs_summary_distributor = ResultDistributor() s3_summary_distributor = ResultDistributor() #---sections with distributors-------------------------------------- - security_groups = SecurityGroups(ec2_client, hostname, region, security_groups_distributor) ec2_summary = EC2Summary(ec2_client, hostname, region, ec2_summary_distributor) ebs_summary = EBSSummary(ec2_client, hostname, region, ebs_summary_distributor) elb_summary = ELBSummary(elb_client, hostname, region, elb_summary_distributor) @@ -1229,7 +1185,6 @@ class AWSSectionsGeneric(AWSSections): s3 = S3(cloudwatch_client, hostname, region) #---register sections to distributors------------------------------- - security_groups_distributor.add(ec2_summary) ec2_summary_distributor.add(ec2) ec2_summary_distributor.add(ebs_summary) ec2_summary_distributor.add(ebs) @@ -1240,17 +1195,15 @@ class AWSSectionsGeneric(AWSSections): #---register sections for execution--------------------------------- # Dependencies: First append sections which distribute their results: - # -- security_groups - # | - # |--ec2_summary ('ec2') - # | - # |-- ec2 ('ec2') - # | - # |-- ebs_summary ('ec2', 'ebs') - # | | - # | |-- ebs ('ec2', 'ebs') - # | - # |-- ebs ('ec2') + # --ec2_summary ('ec2') + # | + # |-- ec2 ('ec2') + # | + # |-- ebs_summary ('ec2', 'ebs') + # | | + # | |-- ebs ('ec2', 'ebs') + # | + # |-- ebs ('ec2') # # -- elb_summary # | @@ -1258,7 +1211,6 @@ class AWSSectionsGeneric(AWSSections): # | # |-- elb if 'ec2' in services: - self._sections.append(security_groups) self._sections.append(ec2_summary) self._sections.append(ec2)

5 years, 4 months

Refactored host attributes to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: c9e0d02194a0ea21e01e58e8ade450b722577c30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9e0d02194a0ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 08:54:54 2019 +0100 Refactored host attributes to plugin registry * Legacy plugin registration works for the common use cases. Using declare_host_attribute() works as in previous versions. The attribute classes have been replaced by factories that create classes for the attributes on demand. This works for the commonly used attribute types like ValueSpecAttribute, NagiosTextAttribute and so on. * The attribute declarations that used subclassing have already been refactored. The others will be refactored in a future commit. * The host attributes registration and access to host attributes is now exclusively done via host_attribute_registry. CMK-1588 Change-Id: Ie7ff326797f0cf3685ca8102ce2263e3d1863840 --- cmk/gui/plugins/wato/__init__.py | 17 +- cmk/gui/plugins/wato/builtin_attributes.py | 347 +++++---- cmk/gui/plugins/wato/utils/__init__.py | 15 +- cmk/gui/plugins/webapi/utils.py | 6 +- cmk/gui/wato/__init__.py | 2 - cmk/gui/wato/pages/bulk_edit.py | 5 +- cmk/gui/wato/pages/folders.py | 6 +- cmk/gui/watolib/__init__.py | 3 - cmk/gui/watolib/host_attributes.py | 847 ++++++++++++--------- cmk/gui/watolib/hosts_and_folders.py | 11 +- tests/unit/cmk/gui/watolib/test_host_attributes.py | 77 +- 11 files changed, 755 insertions(+), 581 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c9e0d02194…

5 years, 4 months

Cleaned up host attribute topic handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 2dccf77234dd0adad58e7f1d268e37511cdb150d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dccf77234dd0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 29 17:33:07 2019 +0100 Cleaned up host attribute topic handling * Topics are now represented by a dedicated class which has an internal identifier, title and sort index. * The previous implementation only had a title attribute which made it dificult to handle localization and sorting of the topics. * Host attributes now directly hold a reference to their host attribute topic object instead of relying on a collection structure (_host_attributes) More to come... CMK-1588 Change-Id: I1952b6dc3e860e14915cc8b5bb37996027b1c58d --- cmk/gui/plugins/wato/utils/__init__.py | 19 +-- cmk/gui/watolib/host_attributes.py | 182 +++++++++++++++++++-- tests/unit/cmk/gui/watolib/test_host_attributes.py | 93 +++++++++-- tests/unit/cmk/gui/watolib/test_watolib.py | 71 -------- 4 files changed, 244 insertions(+), 121 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2dccf77234…

5 years, 4 months

Added tests for host attribute registration

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e4d27215a9db8279b3ebab1e886432d30ebd08d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e4d27215a9db8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 29 10:00:24 2019 +0100 Added tests for host attribute registration CMK-1588 Change-Id: Ifdd72fb82aeff47242688a953f8ede1ddd01f978 --- tests/unit/cmk/gui/watolib/test_host_attributes.py | 379 +++++++++++++++++++++ 1 file changed, 379 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9e4d27215a…

5 years, 4 months

Cleaned up initialization of config based host attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 023b07e33f8c60f058f28960b72b3b0f335870bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=023b07e33f8c60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 20:14:17 2019 +0100 Cleaned up initialization of config based host attributes Instead of ad-hoc update or during legacy plugin loading the config based host attributes (tag attributes and custom attributes) are now updated automatically by a post config load hook. CMK-1588 Change-Id: I01267967842156582fe4c2211201c3a1c97f3900 --- cmk/gui/wato/pages/host_tags.py | 3 --- cmk/gui/watolib/__init__.py | 1 - cmk/gui/watolib/host_attributes.py | 4 ++++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/host_tags.py index 603732b..2a7c995 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/host_tags.py @@ -44,7 +44,6 @@ from cmk.gui.valuespec import ( ) from cmk.gui.watolib.host_tags import is_builtin_aux_tag -from cmk.gui.watolib.host_attributes import update_config_based_host_attributes from cmk.gui.plugins.wato.utils.main_menu import ( MainMenu, @@ -487,7 +486,6 @@ class ModeEditHosttagGroup(ModeEditHosttagConfiguration): # Make sure, that all tags are active (also manual ones from main.mk) config.load_config() - update_config_based_host_attributes() add_change("edit-hosttags", _("Created new host tag group '%s'") % changed_tag_group.id) return "hosttags", _("Created new host tag group '%s'") % changed_tag_group.title else: @@ -527,7 +525,6 @@ class ModeEditHosttagGroup(ModeEditHosttagConfiguration): if message: changed_hosttags_config.save() config.load_config() - update_config_based_host_attributes() add_change("edit-hosttags", _("Edited host tag group %s (%s)") % (message, self._get_taggroup_id())) return "hosttags", message != True and message or None diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 200ac16..399d214 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -318,7 +318,6 @@ def init_wato_datastructures(with_wato_lock=False): cmk.gui.watolib.git.prepare_git_commit() cmk.gui.watolib.sidebar_reload.reset() - cmk.gui.watolib.host_attributes.update_config_based_host_attributes() if os.path.exists(ConfigDomainCACertificates.trusted_cas_file) and\ not _need_to_create_sample_config(): diff --git a/cmk/gui/watolib/host_attributes.py b/cmk/gui/watolib/host_attributes.py index e80aca6..5eb8e1b 100644 --- a/cmk/gui/watolib/host_attributes.py +++ b/cmk/gui/watolib/host_attributes.py @@ -537,6 +537,10 @@ def update_config_based_host_attributes(): Folder.invalidate_caches() +# Make the config module initialize the host attributes after loading the config +config.register_post_config_load_hook(update_config_based_host_attributes) + + def _clear_config_based_host_attributes(): for attr in host_attribute_registry.attributes(): if attr.from_config():

5 years, 4 months

Host attributes: Cleaned up host_attributes.all_host_attributes()

by Lars Michelsen

Module: check_mk Branch: master Commit: 32b8ca34c925380b39bb0c46efe15787207105bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32b8ca34c92538… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 29 23:04:18 2019 +0100 Host attributes: Cleaned up host_attributes.all_host_attributes() * This function relied on the _host_attributes structure which was meant to keep the registration sorting. That was not needed in most cases. Using the host_attributes.attributes() accessor now. * Custom host attributes: Using internal topic IDs now for referencing the host attribute topics instead of the localized topic titles. CMK-1588 Change-Id: I1a351fad0c8f736efbd3688a88c083adfe504b6b --- cmk/gui/plugins/wato/builtin_attributes.py | 2 +- cmk/gui/plugins/webapi/utils.py | 6 +- cmk/gui/wato/pages/bulk_edit.py | 4 +- cmk/gui/wato/pages/custom_attributes.py | 19 +++-- cmk/gui/wato/pages/folders.py | 5 +- cmk/gui/watolib/__init__.py | 1 - cmk/gui/watolib/host_attributes.py | 92 +++++++++++++++++----- cmk/gui/watolib/hosts_and_folders.py | 10 +-- tests/unit/cmk/gui/watolib/test_host_attributes.py | 86 ++++++++++++-------- 9 files changed, 154 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=32b8ca34c9…

5 years, 4 months

Fixed tag attributes being put into the wrong topics

by Lars Michelsen

Module: check_mk Branch: master Commit: c223e3725b0dbd22042059864b9bae85ce18b37f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c223e3725b0dbd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 20:50:10 2019 +0100 Fixed tag attributes being put into the wrong topics The IP address family tag was not put into the same foldable container when using a localized GUI. CMK-1588 Change-Id: I7a19936b79d5d748ca0278cdc01c27dd9c805b62 --- cmk/gui/watolib/host_attributes.py | 45 +++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/cmk/gui/watolib/host_attributes.py b/cmk/gui/watolib/host_attributes.py index 5eb8e1b..a536a20 100644 --- a/cmk/gui/watolib/host_attributes.py +++ b/cmk/gui/watolib/host_attributes.py @@ -577,7 +577,8 @@ def _declare_host_tag_attributes(): editable=attr_editable, depends_on_tags=depends_on_tags, depends_on_roles=depends_on_roles, - topic=topic, + # TODO: We need to adapt the tag data structure to contain topic IDs + topic=_transform_attribute_topic_title_to_id(topic), from_config=True, ) @@ -614,24 +615,42 @@ def transform_pre_16_host_topics(custom_attributes): This lead to issues with localized topics. We now have internal IDs for all the topics and try to convert the values here to the new format. - At least for unlocalized topics the conversion works. Localized topics - are put into the "Custom attributes" topic once. Users will have to - re-configure the topic, sorry :-/.""" - topics = [a_class() for a_class in host_attribute_topic_registry.values()] + We translate the titles which have been distributed with Check_MK to their + internal topic ID. No action should be needed. Custom topics or topics of + other languages are not translated. The attributes are put into the + "Custom attributes" topic once. Users will have to re-configure the topic, + sorry :-/.""" for custom_attr in custom_attributes: - found = False - for topic in topics: - if custom_attr["topic"] == topic.title: - custom_attr["topic"] = topic.ident - found = True - break + if custom_attr["topic"] in host_attribute_topic_registry: + continue - if not found: - custom_attr["topic"] = "custom_attributes" + custom_attr["topic"] = _transform_attribute_topic_title_to_id(custom_attr["topic"]) return custom_attributes +def _transform_attribute_topic_title_to_id(topic_title): + _topic_title_to_id_map = { + u"Basic settings": "basic", + u"Address": "address", + u"Data sources": "data_sources", + u"Management Board": "management_board", + u"Network Scan": "network_scan", + u"Custom attributes": "custom_attributes", + u"Grundeinstellungen": "basic", + u"Adresse": "address", + u"Datenquellen": "data_sources", + u"Management-Board": "management_board", + u"Netzwerk-Scan": "network_scan", + u"Eigene Attribute": "custom_attributes", + } + + try: + return _topic_title_to_id_map[topic_title] + except KeyError: + return "custom_attributes" + + def host_attribute(name): return host_attribute_registry[name]()

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019