Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: d561e1afd5acfe922d08b96d47c230d195263ea6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d561e1afd5acfe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 12 20:16:10 2019 +0100 Cleaned up tag config + builtin merging * Merging of both tag domains is now done by the tag managing objects on their own using the previously existing merging logic. * Cleaned up some call sites to config.host_tag_groups and config.aux_tags on the way to directly use config.tags. * WATO tag list modes now use the tag object structure during page rendering instead of the legacy config level structures. * Cleaned up redundant tests Next step is to clean up all call sites of config.host_tag_groups and config.aux_tags to use the tag model objects instead of the legacy config level data structures. CMK-1813 Change-Id: I2d3fd0cb2566aebee2b8fadee8ac5077733fa6c1 --- cmk/gui/config.py | 35 ++----------- cmk/gui/tags.py | 22 ++++++++ cmk/gui/views.py | 69 +++++++++++-------------- cmk/gui/wato/pages/bulk_import.py | 4 +- cmk/gui/wato/pages/tags.py | 91 ++++++++++++++------------------- tests/unit/cmk/gui/watolib/test_tags.py | 25 +++++++++ 6 files changed, 122 insertions(+), 124 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d561e1afd5…

5 years, 6 months

Cleaned up one more config.host_tag_groups call site

by Lars Michelsen

Module: check_mk Branch: master Commit: a0fcfed9b06e862fe5107aa1cd60198e3acaa2ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0fcfed9b06e86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 14:50:27 2019 +0100 Cleaned up one more config.host_tag_groups call site * Cleanup low level tuples in tag based host attribute handling * Add grouping of tag groups by topic to prepare for replacing cmk.gui.tags.group_hosttags_by_topic() CMK-1813 Change-Id: I240cf4717135f9ca2e4bf78a72499b2a28678433 --- cmk/gui/tags.py | 15 +++++ cmk/gui/watolib/__init__.py | 2 - cmk/gui/watolib/host_attributes.py | 114 +++++++++++--------------------- tests/unit/cmk/gui/watolib/test_tags.py | 15 +++++ 4 files changed, 68 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a0fcfed9b0…

5 years, 6 months

Renamed internal things from host tags to tags

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b36cbd3bec4371eb3352e9dc0ba040136e93301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b36cbd3bec437… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 08:36:06 2019 +0100 Renamed internal things from host tags to tags CMK-1813 Change-Id: Id3482c8a1cce80b4f6bbb598524f6fd7637a9747 --- cmk/gui/config.py | 2 +- cmk/gui/tags.py | 52 ++++++++++++++------------------- cmk/gui/wato/pages/tags.py | 6 ++-- tests/unit/cmk/gui/watolib/test_tags.py | 40 ++++++++++++------------- 4 files changed, 45 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b36cbd3be…

5 years, 6 months

More host tag to tag renaming

by Lars Michelsen

Module: check_mk Branch: master Commit: 71270689f27a1f59b38ff29390341c43f44e8b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71270689f27a1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 07:46:42 2019 +0100 More host tag to tag renaming * Rename cmk.gui.tags.HosttagsConfiguration to cmk.gui.tags.TagConfig * Rename cmk.gui.config.BuiltinHosttagsConfiguration to cmk.gui.config.BuiltinTagConfig CMK-1813 Change-Id: If312f953bf3a737ff261bd531da68e582afc15da --- cmk/gui/config.py | 10 ++++----- cmk/gui/plugins/wato/builtin_attributes.py | 4 ++-- cmk/gui/plugins/webapi/webapi.py | 10 ++++----- cmk/gui/tags.py | 10 ++++----- cmk/gui/wato/pages/tags.py | 16 +++++++------- cmk/gui/watolib/__init__.py | 4 +--- cmk/gui/watolib/tags.py | 4 ++-- tests/unit/cmk/gui/watolib/test_tags.py | 34 +++++++++++++++--------------- 8 files changed, 45 insertions(+), 47 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=71270689f2…

5 years, 6 months

More legacy tag handling cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: dc176050eeef51586f0b79c6bbb35ad9990f6220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc176050eeef51… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 08:35:32 2019 +0100 More legacy tag handling cleanups * Dropped config.tag_alias() and config.tag_group_title() functions * Cleaned some call sites of config.host_tag_groups() CMK-1813 Change-Id: Ia7765f0adcd47242e32ab3cb283a951acc901047 --- cmk/gui/config.py | 22 -------- cmk/gui/plugins/sidebar/quicksearch.py | 8 +-- cmk/gui/plugins/sidebar/virtual_host_tree.py | 52 ++++++++--------- cmk/gui/plugins/views/__init__.py | 1 - cmk/gui/plugins/views/painters.py | 17 ++++-- cmk/gui/plugins/views/utils.py | 14 ----- cmk/gui/plugins/wato/check_mk_configuration.py | 17 +++--- cmk/gui/plugins/webapi/utils.py | 14 ++--- cmk/gui/tags.py | 25 ++++++-- cmk/gui/views.py | 36 +++++++----- cmk/gui/wato/pages/rulesets.py | 44 ++++++++------- tests/unit/cmk/gui/test_gui_config.py | 45 +++++++++++++++ tests/unit/cmk/gui/test_userdb_ldap_connector.py | 66 ++++------------------ tests/unit/cmk/gui/watolib/test_host_attributes.py | 62 ++++++++++++++++---- tests/unit/cmk/gui/watolib/test_tags.py | 8 ++- 15 files changed, 228 insertions(+), 203 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc176050ee…

5 years, 6 months

Finally cleaned up config.host_tag_groups() and config.aux_tags()

by Lars Michelsen

Module: check_mk Branch: master Commit: 360158f0b4423b135bbfff0f1dd67ec085e4c61a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=360158f0b4423b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 16:30:29 2019 +0100 Finally cleaned up config.host_tag_groups() and config.aux_tags() CMK-1813 Change-Id: If4489def8c787d9cd810eed8d2c9e0109273b825 --- cmk/gui/config.py | 16 --- cmk/gui/plugins/visuals/filters.py | 44 +++---- cmk/gui/plugins/wato/utils/__init__.py | 208 +++++++++++++++----------------- cmk/gui/tags.py | 30 ++++- cmk/gui/wato/pages/tags.py | 3 +- cmk/gui/watolib/hosts_and_folders.py | 2 +- tests/unit/cmk/gui/watolib/test_tags.py | 42 ++++++- 7 files changed, 179 insertions(+), 166 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=360158f0b4…

5 years, 6 months

Changed initial WATO tag config to be in new format

by Lars Michelsen

Module: check_mk Branch: master Commit: 931573fe707348e8c9048abe45903a4c84648428 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931573fe707348… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 14 08:21:22 2019 +0100 Changed initial WATO tag config to be in new format Change-Id: I3bd1b0daccd06f24389c57ffdadb8e3abe073628 --- cmk/gui/watolib/__init__.py | 58 +++++++++++++++++++++-------- tests/unit/cmk/gui/watolib/test_tags.py | 66 +++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 15 deletions(-) diff --git a/cmk/gui/watolib/__init__.py b/cmk/gui/watolib/__init__.py index 5dc3e93..bc35b05 100644 --- a/cmk/gui/watolib/__init__.py +++ b/cmk/gui/watolib/__init__.py @@ -512,22 +512,50 @@ def _create_sample_config(): def _initialize_tag_config(): - tag_config = cmk.gui.tags.TagConfig().parse_config(( - [ - ('criticality', u'Criticality', [ - ('prod', u'Productive system', []), - ('critical', u'Business critical', []), - ('test', u'Test system', []), - ('offline', u'Do not monitor this host', []), - ]), - ('networking', u'Networking Segment', [ - ('lan', u'Local network (low latency)', []), - ('wan', u'WAN (high latency)', []), - ('dmz', u'DMZ (low latency, secure access)', []), - ]), + tag_config = cmk.gui.tags.TagConfig() + tag_config.parse_config({ + 'aux_tags': [], + 'tag_groups': [ + { + 'id': 'criticality', + 'tags': [{ + 'aux_tags': [], + 'id': 'prod', + 'title': u'Productive system' + }, { + 'aux_tags': [], + 'id': 'critical', + 'title': u'Business critical' + }, { + 'aux_tags': [], + 'id': 'test', + 'title': u'Test system' + }, { + 'aux_tags': [], + 'id': 'offline', + 'title': u'Do not monitor this host' + }], + 'title': u'Criticality' + }, + { + 'id': 'networking', + 'tags': [{ + 'aux_tags': [], + 'id': 'lan', + 'title': u'Local network (low latency)' + }, { + 'aux_tags': [], + 'id': 'wan', + 'title': u'WAN (high latency)' + }, { + 'aux_tags': [], + 'id': 'dmz', + 'title': u'DMZ (low latency, secure access)' + }], + 'title': u'Networking Segment' + }, ], - [], - )) + }) TagConfigFile().save(tag_config.get_dict_format()) # Make sure the host tag attributes are immediately declared! config.tags = tag_config diff --git a/tests/unit/cmk/gui/watolib/test_tags.py b/tests/unit/cmk/gui/watolib/test_tags.py index cd86fb2..165564b 100644 --- a/tests/unit/cmk/gui/watolib/test_tags.py +++ b/tests/unit/cmk/gui/watolib/test_tags.py @@ -47,6 +47,72 @@ wato_aux_tags += [("bla", u"bläää")] tags_mk.unlink() # pylint: disable=no-member +def test_convert_pre_16_tags(): + dict_config = cmk.gui.tags.transform_pre_16_tags( + [ + ('criticality', u'Criticality', [ + ('prod', u'Productive system', []), + ('critical', u'Business critical', []), + ('test', u'Test system', []), + ('offline', u'Do not monitor this host', []), + ]), + ('networking', u'Networking Segment', [ + ('lan', u'Local network (low latency)', []), + ('wan', u'WAN (high latency)', []), + ('dmz', u'DMZ (low latency, secure access)', []), + ]), + ], + [("bla", u"blüb")], + ) + + assert dict_config == { + 'aux_tags': [{ + 'id': 'bla', + 'title': u'bl\xfcb' + }], + 'tag_groups': [ + { + 'id': 'criticality', + 'tags': [{ + 'aux_tags': [], + 'id': 'prod', + 'title': u'Productive system' + }, { + 'aux_tags': [], + 'id': 'critical', + 'title': u'Business critical' + }, { + 'aux_tags': [], + 'id': 'test', + 'title': u'Test system' + }, { + 'aux_tags': [], + 'id': 'offline', + 'title': u'Do not monitor this host' + }], + 'title': u'Criticality' + }, + { + 'id': 'networking', + 'tags': [{ + 'aux_tags': [], + 'id': 'lan', + 'title': u'Local network (low latency)' + }, { + 'aux_tags': [], + 'id': 'wan', + 'title': u'WAN (high latency)' + }, { + 'aux_tags': [], + 'id': 'dmz', + 'title': u'DMZ (low latency, secure access)' + }], + 'title': u'Networking Segment' + }, + ], + } + + def test_tag_config(): cfg = tags.TagConfig() assert cfg.tag_groups == []

5 years, 6 months

Made cmk.gui.tags.parse_hosttag_title private

by Lars Michelsen

Module: check_mk Branch: master Commit: 130b7d6a84da8ce7eeb3982340690476b3c05c28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=130b7d6a84da8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 16:55:06 2019 +0100 Made cmk.gui.tags.parse_hosttag_title private The _export_hosttags_to_php() function now uses the regular model objects instead of low level data. CMK-1813 Change-Id: Ia3ac4c6b1eb7540529b3351ba33324373599b34f --- cmk/gui/plugins/wato/utils/__init__.py | 1 - cmk/gui/tags.py | 24 +++--------------------- cmk/gui/watolib/tags.py | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/__init__.py b/cmk/gui/plugins/wato/utils/__init__.py index e97e1f4..1b7a898 100644 --- a/cmk/gui/plugins/wato/utils/__init__.py +++ b/cmk/gui/plugins/wato/utils/__init__.py @@ -113,7 +113,6 @@ from cmk.gui.plugins.wato.utils.valuespecs import ( ) import cmk.gui.watolib as watolib from cmk.gui.watolib.password_store import PasswordStore -from cmk.gui.tags import group_hosttags_by_topic from cmk.gui.watolib.timeperiods import TimeperiodSelection from cmk.gui.watolib.users import notification_script_title from cmk.gui.watolib.groups import ( diff --git a/cmk/gui/tags.py b/cmk/gui/tags.py index 48081d3..d631e18 100644 --- a/cmk/gui/tags.py +++ b/cmk/gui/tags.py @@ -38,24 +38,12 @@ def transform_pre_16_tags(tag_groups, aux_tags): return cfg.get_dict_format() -def parse_hosttag_title(title): +def _parse_hosttag_title(title): if '/' in title: return title.split('/', 1) return None, title -# TODO: Cleanup all call sites -def group_hosttags_by_topic(hosttags): - tags = {} - for entry in hosttags: - topic, title = parse_hosttag_title(entry[1]) - if not topic: - topic = _('Host tags') - tags.setdefault(topic, []) - tags[topic].append((entry[0], title) + entry[2:]) - return sorted(tags.items(), key=lambda x: x[0]) - - def _validate_tag_id(tag_id, varname): if not re.match("^[-a-z0-9A-Z_]*$", tag_id): raise MKUserError( @@ -114,7 +102,7 @@ class AuxTag(Hosttag): def _parse_legacy_format(self, tag_info): super(AuxTag, self)._parse_legacy_format(tag_info) - self.topic, self.title = HosttagsConfiguration.parse_hosttag_title(self.title) + self.topic, self.title = _parse_hosttag_title(self.title) def get_legacy_format(self): return self.id, HosttagsConfiguration.get_merged_topic_and_title(self) @@ -258,7 +246,7 @@ class HosttagGroup(object): group_id, group_title, tag_list = group_info[:3] self.id = group_id - self.topic, self.title = HosttagsConfiguration.parse_hosttag_title(group_title) + self.topic, self.title = _parse_hosttag_title(group_title) for tag in tag_list: self.tags.append(GroupedHosttag(self, tag)) @@ -324,12 +312,6 @@ class HosttagsConfiguration(object): return self @staticmethod - def parse_hosttag_title(title): - if '/' in title: - return title.split('/', 1) - return None, title - - @staticmethod def get_merged_topic_and_title(entity): if entity.topic: return "%s/%s" % (entity.topic, entity.title) diff --git a/cmk/gui/watolib/tags.py b/cmk/gui/watolib/tags.py index 3630996..7c6ebab 100644 --- a/cmk/gui/watolib/tags.py +++ b/cmk/gui/watolib/tags.py @@ -32,6 +32,7 @@ import cmk.utils.paths import cmk.utils.store as store import cmk.gui.tags +import cmk.gui.config as config from cmk.gui.watolib.simple_config_file import WatoSimpleConfigFile from cmk.gui.watolib.utils import multisite_dir @@ -63,12 +64,7 @@ class TagConfigFile(WatoSimpleConfigFile): # TODO: Move the hosttag export to a hook def save(self, cfg): super(TagConfigFile, self).save(cfg) - - tag_config = cmk.gui.tags.HosttagsConfiguration() - tag_config.parse_config(cfg) - hosttags, auxtags = tag_config.get_legacy_format() - - _export_hosttags_to_php(hosttags, auxtags) + _export_hosttags_to_php(cfg) # Creates a includable PHP file which provides some functions which @@ -90,11 +86,15 @@ class TagConfigFile(WatoSimpleConfigFile): # the tag group title and the value contains the value returned by # taggroup_choice() for this tag group. # -def _export_hosttags_to_php(hosttags, auxtags): +def _export_hosttags_to_php(cfg): php_api_dir = cmk.utils.paths.var_dir + "/wato/php-api/" path = php_api_dir + '/hosttags.php' store.mkdir(php_api_dir) + tag_config = cmk.gui.tags.HosttagsConfiguration() + tag_config.parse_config(cfg) + tag_config += config.BuiltinHosttagsConfiguration() + # need an extra lock file, since we move the auth.php.tmp file later # to auth.php. This move is needed for not having loaded incomplete # files into php. @@ -105,14 +105,14 @@ def _export_hosttags_to_php(hosttags, auxtags): # Transform WATO internal data structures into easier usable ones hosttags_dict = {} - for entry in hosttags: - id_, title, choices = entry[:3] + for tag_group in tag_config.tag_groups: tags = {} - for tag_id, tag_title, tag_auxtags in choices: - tags[tag_id] = tag_title, tag_auxtags - topic, title = cmk.gui.tags.parse_hosttag_title(title) - hosttags_dict[id_] = topic, title, tags - auxtags_dict = dict(auxtags) + for grouped_tag in tag_group.tags: + tags[grouped_tag.id] = (grouped_tag.title, grouped_tag.aux_tag_ids) + + hosttags_dict[tag_group.id] = (tag_group.topic, tag_group.title, tags) + + auxtags_dict = dict(tag_config.aux_tag_list.get_choices()) # First write a temp file and then do a move to prevent syntax errors # when reading half written files during creating that new file

5 years, 6 months

Extract tag persistance from tag objects

by Lars Michelsen

Module: check_mk Branch: master Commit: 20c89e90bc840c64a7f3677e36a860d3bd88e543 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20c89e90bc840c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 12 08:31:58 2019 +0100 Extract tag persistance from tag objects * Loading and saving of tag configurations is now done by the TagConfigFile class. * The tags are loaded from the new configuration file tags.mk when it exists. Otherwise the tags will be loaded from hosttags.mk and converted from the legacy format to the dict format in memory. * The tags.mk file is always saved in the new dict based format. Next step is to move the legacy format conversion out of the single objects to the TagConfigFile class. CMK-1813 Change-Id: I3a42d3bf0efd070a60f61f87aebfd1ba8e14b18e --- cmk/gui/config.py | 8 +-- cmk/gui/plugins/config/base.py | 9 +++- cmk/gui/plugins/wato/builtin_attributes.py | 4 +- cmk/gui/plugins/webapi/webapi.py | 9 ++-- cmk/gui/wato/pages/tags.py | 27 ++++++---- cmk/gui/watolib/__init__.py | 46 ++++++++-------- cmk/gui/watolib/tags.py | 84 ++++++++++++++---------------- tests/conftest.py | 1 + tests/unit/cmk/gui/watolib/test_tags.py | 20 +++---- tests/unit/cmk_base/test_packaging.py | 3 +- 10 files changed, 114 insertions(+), 97 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=20c89e90bc…

5 years, 6 months

Started cleaning up builtin tag handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 252a4e9c411b29c308142a631d1ca0439ed120a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=252a4e9c411b29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 12 15:39:11 2019 +0100 Started cleaning up builtin tag handling * Reduce builtin tag specific code * Builtin tags will be handled by tag model classes just like the manually configured tags. Next step is to cleanup the builtin and configured tag merging. CMK-1813 Change-Id: Ia1bac9afd878200a6f02fffb8b83ce063199229a --- cmk/gui/config.py | 206 ++++++++++++++++++++++++++------------- cmk/gui/plugins/webapi/webapi.py | 15 +-- cmk/gui/tags.py | 3 + cmk/gui/wato/pages/tags.py | 9 +- 4 files changed, 148 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=252a4e9c41…

5 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019