Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

CMK-3351: Use Pipenv instead of systhem python

by Alex Zurhake

Module: check_mk Branch: master Commit: 8120c61f3c88cd9fedc0c8a27c34e835b1513c86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8120c61f3c88cd… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 11 10:56:00 2019 +0100 CMK-3351: Use Pipenv instead of systhem python - to compile werks - to build cmk archive - Pipenv is more consistent - Path to sources needs to be added to local Python path before building werks, otherwise Pipenv will not find local modules Change-Id: I421124532ac8f2c36b5ec98216b6b69974e93394 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 09f1f7e..77ff279 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,7 @@ endif rm -rf check-mk-$(EDITION)-$(OMD_VERSION) # This tar file is only used by "omd/packages/check_mk/Makefile" -$(DISTNAME).tar.gz: omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz .werks/werks web/htdocs/js/main_min.js web/htdocs/js/mobile_min.js web/htdocs/js/side_min.js web/htdocs/themes/facelift/theme.css ChangeLog web/htdocs/themes/classic/theme.css +$(DISTNAME).tar.gz: .venv omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz .werks/werks web/htdocs/js/main_min.js web/htdocs/js/mobile_min.js web/htdocs/js/side_min.js web/htdocs/themes/facelift/theme.css ChangeLog web/htdocs/themes/classic/theme.css @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) @@ -188,7 +188,7 @@ $(DISTNAME).tar.gz: omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz . tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls) tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update gzip $(DISTNAME)/bin.tar - python -m compileall cmk ; \ + $(PIPENV) run python -m compileall cmk ; \ tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \ --exclude "cee" \ --exclude "cee.py*" \ @@ -196,7 +196,7 @@ $(DISTNAME).tar.gz: omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz . --exclude "cme.py*" \ cmk/* ; \ rm cmk/*.pyc - python -m compileall cmk_base ; \ + $(PIPENV) run python -m compileall cmk_base ; \ tar czf $(DISTNAME)/base.tar.gz \ $(TAROPTS) \ --exclude "cee" \ @@ -260,11 +260,11 @@ omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe: omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll: omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe -.werks/werks: $(WERKS) - PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks cre +.werks/werks: .venv $(WERKS) + PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(PIPENV) run scripts/precompile-werks.py .werks .werks/werks cre -ChangeLog: .werks/werks - PYTHONPATH=. python scripts/create-changelog.py ChangeLog .werks/werks +ChangeLog: .venv .werks/werks + PYTHONPATH=${PYTHONPATH}:$(REPO_PATH) $(PIPENV) run scripts/create-changelog.py ChangeLog .werks/werks packages: $(MAKE) -C agents packages

5 years, 5 months

FEED-3407: Use global variable instead of relative Path

by Alex Zurhake

Module: check_mk Branch: master Commit: a4bf209ae45b10d9748cc83dd6cf8df8991aba54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4bf209ae45b10… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 11 11:06:36 2019 +0100 FEED-3407: Use global variable instead of relative Path Change-Id: I2cc1d8eaf89594854448f519d4630dfd22a01f89 --- omd/packages/check_mk/check_mk.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/check_mk/check_mk.make b/omd/packages/check_mk/check_mk.make index 085beb7..3aa9298 100644 --- a/omd/packages/check_mk/check_mk.make +++ b/omd/packages/check_mk/check_mk.make @@ -14,7 +14,7 @@ $(CHECK_MK)-install: $(CHECK_MK_INSTALL) # This step creates a tar archive containing the sources # which are need for the build step $(REPO_PATH)/$(DISTNAME).tar.gz: - $(MAKE) -C ../../ $(DISTNAME).tar.gz ; \ + $(MAKE) -C $(REPO_PATH) $(DISTNAME).tar.gz ; \ # The build step just extracts the archive # which was created in the step before

5 years, 5 months

Show "locked attributes" and "locked by" not as folder attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: 6eb11876bfe82c6f0319de2913954c4f757f52ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eb11876bfe82c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 10 12:00:04 2019 +0100 Show "locked attributes" and "locked by" not as folder attributes Change-Id: I86a7cb2690685f8d2ac8c61a339ebd1a0ef40c10 --- cmk/gui/plugins/wato/builtin_attributes.py | 4 ++-- tests/unit/cmk/gui/watolib/test_host_attributes.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index dd19ce8..2da8d96 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -742,7 +742,7 @@ class HostAttributeLockedBy(ABCHostAttributeValueSpec): return True def show_in_folder(self): - return True + return False def show_in_host_search(self): return True @@ -797,7 +797,7 @@ class HostAttributeLockedAttributes(ABCHostAttributeValueSpec): return True def show_in_folder(self): - return True + return False def show_in_host_search(self): return False diff --git a/tests/unit/cmk/gui/watolib/test_host_attributes.py b/tests/unit/cmk/gui/watolib/test_host_attributes.py index b233496..0e7777d 100644 --- a/tests/unit/cmk/gui/watolib/test_host_attributes.py +++ b/tests/unit/cmk/gui/watolib/test_host_attributes.py @@ -95,7 +95,7 @@ expected_attributes = { 'depends_on_tags': [], 'editable': False, 'from_config': False, - 'show_in_folder': True, + 'show_in_folder': False, 'show_in_form': True, 'show_in_host_search': False, 'show_in_table': False, @@ -108,7 +108,7 @@ expected_attributes = { 'depends_on_tags': [], 'editable': False, 'from_config': False, - 'show_in_folder': True, + 'show_in_folder': False, 'show_in_form': True, 'show_in_host_search': True, 'show_in_table': False,

5 years, 5 months

7236 Deterministic rules.mk when "Use GIT version control for WATO" is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 6532d60d84fab51115d5371f50ccbd58ff12a8e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6532d60d84fab5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Mar 10 14:42:25 2019 +0100 7236 Deterministic rules.mk when "Use GIT version control for WATO" is enabled When "Use GIT version control for WATO" is enabled to keep track of the changes that have been made to the Check_MK configuration, the history of the rules.mk files was problematic because several contents of that file were not saved in a deterministic way. This means that loading and saving the configuration without chaning anything resulted in a changed file, e.g. because attributes of dictionaries were not sorted. The rules.mk is now stored in a deterministic way when "Use GIT version control for WATO" is enabled. Change-Id: Ica1cf3e63e170ba4f61fbe521c9bb667070ad0bd --- .werks/7236 | 18 ++++++++++++++++++ cmk/gui/watolib/rulesets.py | 23 +++++++++++++++-------- cmk/utils/store.py | 10 +++++++--- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/.werks/7236 b/.werks/7236 new file mode 100644 index 0000000..c4eb842 --- /dev/null +++ b/.werks/7236 @@ -0,0 +1,18 @@ +Title: Deterministic rules.mk when "Use GIT version control for WATO" is enabled +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552225139 +Class: feature + +When "Use GIT version control for WATO" is enabled to keep track of the changes +that have been made to the Check_MK configuration, the history of the rules.mk +files was problematic because several contents of that file were not saved in a +deterministic way. This means that loading and saving the configuration without +chaning anything resulted in a changed file, e.g. because attributes of +dictionaries were not sorted. + +The rules.mk is now stored in a deterministic way when "Use GIT version control for WATO" +is enabled. diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 7dcde5d..68a2a2e 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -25,10 +25,12 @@ # Boston, MA 02110-1301 USA. import re +import pprint import cmk.utils.regex import cmk.utils.store as store +import cmk.gui.config as config from cmk.gui.log import logger from cmk.gui.globals import html from cmk.gui.i18n import _ @@ -71,7 +73,7 @@ class RulesetCollection(object): def _load_folder_rulesets(self, folder, only_varname=None): path = folder.rules_file_path() - config = { + config_dict = { "ALL_HOSTS": ALL_HOSTS, "ALL_SERVICES": [""], "NEGATE": NEGATE, @@ -85,11 +87,11 @@ class RulesetCollection(object): for varname in rulespec_registry.keys(): if ':' in varname: dictname, _subkey = varname.split(":") - config[dictname] = {} + config_dict[dictname] = {} else: - config[varname] = [] + config_dict[varname] = [] - self.from_config(folder, store.load_mk_file(path, config), only_varname) + self.from_config(folder, store.load_mk_file(path, config_dict), only_varname) def from_config(self, folder, rulesets_config, only_varname=None): for varname in rulespec_registry.keys(): @@ -125,7 +127,7 @@ class RulesetCollection(object): content += ruleset.to_config(folder) - store.save_mk_file(folder.rules_file_path(), content) + store.save_mk_file(folder.rules_file_path(), content, add_header=not config.wato_use_git) def exists(self, name): return name in self._rulesets @@ -651,8 +653,12 @@ class Rule(object): def to_config(self): content = " ( " + # When using pprint we get a deterministic representation of the + # data structures because it cares about sorting of the dict keys + repr_func = pprint.pformat if config.wato_use_git else repr + if self.ruleset.valuespec(): - content += repr(self.value) + ", " + content += repr_func(self.value) + ", " elif not self.value: content += "NEGATE, " @@ -686,8 +692,9 @@ class Rule(object): else: content += repr(self.item_list) - if self.rule_options: - content += ", %r" % self._rule_options_to_config() + rule_options = self._rule_options_to_config() + if rule_options: + content += ", %s" % repr_func(rule_options) content += " ),\n" diff --git a/cmk/utils/store.py b/cmk/utils/store.py index 0b71ecd..376c527 100644 --- a/cmk/utils/store.py +++ b/cmk/utils/store.py @@ -120,9 +120,13 @@ def load_from_mk_file(path, key, default, **kwargs): return load_mk_file(path, {key: default}, **kwargs)[key] -def save_mk_file(path, mk_content): - content = "# Written by Check_MK store (%s)\n\n" % \ - time.strftime("%Y-%m-%d %H:%M:%S") +def save_mk_file(path, mk_content, add_header=True): + content = "" + + if add_header: + content += "# Written by Check_MK store (%s)\n\n" % \ + time.strftime("%Y-%m-%d %H:%M:%S") + content += mk_content content += "\n" save_file(path, content)

5 years, 5 months

Fixed TypeError and return code

by Ronny Bruska

Module: check_mk Branch: master Commit: 583f1d8c55e0365a4ebd3a616bc981a0af516f1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=583f1d8c55e036… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Sat Mar 9 16:22:58 2019 +0100 Fixed TypeError and return code A TypeError was fixed. Also the return code for disabled option of issue resolution was changed to 0. Change-Id: I122857e32d122fab65b36f152bb2b6029b9e197f --- cmk/notification_plugins/jira_issues.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/notification_plugins/jira_issues.py b/cmk/notification_plugins/jira_issues.py index da3e2e1..2182302 100644 --- a/cmk/notification_plugins/jira_issues.py +++ b/cmk/notification_plugins/jira_issues.py @@ -71,7 +71,7 @@ def main(): custom_field_value = int(context['SERVICEPROBLEMID']) context['SUBJECT'] = utils.substitute_context(summary, context) - label = context.get['PARAMETER_LABEL'] or tmpl_label + label = context.get('PARAMETER_LABEL') or tmpl_label newissue = { u'labels': [label], u'summary': context['SUBJECT'], @@ -134,8 +134,8 @@ def main(): if context['NOTIFICATIONTYPE'] == 'RECOVERY' and custom_field_exists: if "PARAMETER_RESOLUTION" not in context: sys.stderr.write( - "Ticket resolution not enabled in wato rule. Don't send a resolution to jira") - return 2 + "Ticket resolution not enabled in wato rule. Don't send a resolution to jira\n") + return 0 else: resolution = None if 'PARAMETER_RESOLUTION' in context:

5 years, 5 months

Refactored tag group edit dialog to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 892b385953e2bf327356c0f267be65cf04547e25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=892b385953e2bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 12:59:22 2019 +0100 Refactored tag group edit dialog to valuespec Change-Id: Ib48f1abd071cdc9f8c3ddb5eebb0ec0510a0000b --- cmk/gui/wato/pages/host_tags.py | 288 ++++++++++++++++++++++------------------ 1 file changed, 158 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=892b385953…

5 years, 5 months

Changed host tag move mechanism to use the row drag mechanic

by Lars Michelsen

Module: check_mk Branch: master Commit: c25c356507c8cf6dfb2a8913a5ee0cd6c05ab1e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25c356507c8cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 12:23:46 2019 +0100 Changed host tag move mechanism to use the row drag mechanic Change-Id: I64220baae982558de14833fa504523e06e4db8d1 --- cmk/gui/wato/pages/host_tags.py | 63 ++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/host_tags.py index d86c99d..9a2eb32 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/host_tags.py @@ -164,21 +164,16 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): add_change("edit-hosttags", _("Removed auxiliary tag %s (%s)") % (message, del_id)) return "hosttags", message != True and message or None - move_nr = html.request.var("_move") - if move_nr is not None: - if html.check_transaction(): - move_nr = int(move_nr) - if move_nr >= 0: - directory = 1 - else: - move_nr = -move_nr - directory = -1 - moved = self._hosttags[move_nr] - del self._hosttags[move_nr] - self._hosttags[move_nr + directory:move_nr + directory] = [moved] - watolib.save_hosttags(self._hosttags, self._auxtags) - config.wato_host_tags = self._hosttags - watolib.add_change("edit-hosttags", _("Changed order of host tag groups")) + if html.request.var("_move") and html.check_transaction(): + move_nr = html.get_integer_input("_move") + move_to = html.get_integer_input("_index") + + moved = self._hosttags.pop(move_nr) + self._hosttags.insert(move_to, moved) + + watolib.save_hosttags(self._hosttags, self._auxtags) + config.wato_host_tags = self._hosttags + watolib.add_change("edit-hosttags", _("Changed order of host tag groups")) def page(self): if not self._hosttags + self._auxtags: @@ -221,29 +216,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): topic, title = map(_u, watolib.parse_hosttag_title(title)) table.row() table.cell(_("Actions"), css="buttons") - if watolib.is_builtin_host_tag_group(tag_id): - html.i("(%s)" % _("builtin")) - else: - edit_url = watolib.folder_preserving_link([("mode", "edit_hosttag"), - ("edit", tag_id)]) - delete_url = make_action_link([("mode", "hosttags"), ("_delete", tag_id)]) - if nr == 0: - html.empty_icon_button() - else: - html.icon_button( - make_action_link([("mode", "hosttags"), ("_move", str(-nr))]), - _("Move this tag group one position up"), "up") - - if nr == len(effective_tag_groups) - 1 \ - or watolib.is_builtin_host_tag_group(effective_tag_groups[nr+1][0]): - html.empty_icon_button() - else: - html.icon_button( - make_action_link([("mode", "hosttags"), ("_move", str(nr))]), - _("Move this tag group one position down"), "down") - - html.icon_button(edit_url, _("Edit this tag group"), "edit") - html.icon_button(delete_url, _("Delete this tag group"), "delete") + self._show_tag_icons(tag_id, nr, effective_tag_groups) table.text_cell(_("ID"), tag_id) table.text_cell(_("Title"), title) @@ -253,6 +226,20 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): watolib.host_attribute("tag_%s" % tag_id).render_input("", None) html.end_form() + def _show_tag_icons(self, tag_id, nr, effective_tag_groups): + if watolib.is_builtin_host_tag_group(tag_id): + html.i("(%s)" % _("builtin")) + return + + edit_url = watolib.folder_preserving_link([("mode", "edit_hosttag"), ("edit", tag_id)]) + html.icon_button(edit_url, _("Edit this tag group"), "edit") + + html.element_dragger_url( + "tr", base_url=make_action_link([("mode", "hosttags"), ("_move", nr)])) + + delete_url = make_action_link([("mode", "hosttags"), ("_delete", tag_id)]) + html.icon_button(delete_url, _("Delete this tag group"), "delete") + def _render_aux_tag_list(self): with table_element( "auxtags",

5 years, 5 months

Small host tag edit dialog usability improvements

by Lars Michelsen

Module: check_mk Branch: master Commit: 19d7454969960f231d54f3bfdaf82441cfa10f6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19d7454969960f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 11:38:13 2019 +0100 Small host tag edit dialog usability improvements * Remove useless columns (number of entries, type of tag) from tag list table * Displaying default tag topic consistently as "Host tags" Change-Id: I39437b98db1f202d74bcd6bf6d5edc27865b7ec7 --- cmk/gui/wato/pages/host_tags.py | 8 +++----- cmk/gui/watolib/host_attributes.py | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/host_tags.py index 507b326..d86c99d 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/host_tags.py @@ -217,7 +217,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): return for nr, entry in enumerate(effective_tag_groups): - tag_id, title, choices = entry[:3] # fourth: tag dependency information + tag_id, title, _choices = entry[:3] # fourth: tag dependency information topic, title = map(_u, watolib.parse_hosttag_title(title)) table.row() table.cell(_("Actions"), css="buttons") @@ -247,9 +247,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): table.text_cell(_("ID"), tag_id) table.text_cell(_("Title"), title) - table.text_cell(_("Topic"), topic or '') - table.text_cell(_("Type"), (len(choices) == 1 and _("Checkbox") or _("Dropdown"))) - table.text_cell(_("Choices"), str(len(choices))) + table.text_cell(_("Topic"), topic or _("Host tags")) table.cell(_("Demonstration"), sortable=False) html.begin_form("tag_%s" % tag_id) watolib.host_attribute("tag_%s" % tag_id).render_input("", None) @@ -287,7 +285,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): table.text_cell(_("ID"), tag_id) table.text_cell(_("Title"), _u(title)) - table.text_cell(_("Topic"), _u(topic) or '') + table.text_cell(_("Topic"), _u(topic) or _("Host tags")) table.text_cell( _("Tags using this auxiliary tag"), ", ".join( self._get_tags_using_aux_tag(effective_tag_groups, tag_id))) diff --git a/cmk/gui/watolib/host_attributes.py b/cmk/gui/watolib/host_attributes.py index 9f1db5a..ff66af6 100644 --- a/cmk/gui/watolib/host_attributes.py +++ b/cmk/gui/watolib/host_attributes.py @@ -632,12 +632,14 @@ def _transform_attribute_topic_title_to_id(topic_title): u"Management Board": "management_board", u"Network Scan": "network_scan", u"Custom attributes": "custom_attributes", + u"Host tags": "host_tags", 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", + u"Hostmerkmale": "host_tags", } try:

5 years, 5 months

Refactored aux tag edit dialog to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: 942d7d8437424d9d1297940d7a913daae7d06584 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=942d7d8437424d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 13:53:49 2019 +0100 Refactored aux tag edit dialog to valuespec Change-Id: I77646d99bf87b6cca348752096f327258b68642a --- cmk/gui/wato/pages/host_tags.py | 134 +++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 64 deletions(-) diff --git a/cmk/gui/wato/pages/host_tags.py b/cmk/gui/wato/pages/host_tags.py index b14fa60..3f381e6 100644 --- a/cmk/gui/wato/pages/host_tags.py +++ b/cmk/gui/wato/pages/host_tags.py @@ -87,9 +87,9 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): def buttons(self): global_buttons() html.context_button( - _("New Tag group"), watolib.folder_preserving_link([("mode", "edit_hosttag")]), "new") + _("New tag group"), watolib.folder_preserving_link([("mode", "edit_hosttag")]), "new") html.context_button( - _("New Aux tag"), watolib.folder_preserving_link([("mode", "edit_auxtag")]), "new") + _("New aux tag"), watolib.folder_preserving_link([("mode", "edit_auxtag")]), "new") def action(self): # Deletion of tag groups @@ -329,42 +329,48 @@ class ModeEditAuxtag(ModeEditHosttagConfiguration): def permissions(cls): return ["hosttags"] - def title(self): - if self._is_new_aux_tag(): - return _("Create new auxiliary tag") - return _("Edit auxiliary tag") + def __init__(self): + super(ModeEditAuxtag, self).__init__() + + self._new = self._is_new_aux_tag() + + if self._new: + self._aux_tag_nr = None + self._aux_tag = watolib.AuxTag() + else: + self._aux_tag_nr = self._get_tag_number() + self._aux_tag = self._untainted_hosttags_config.aux_tag_list.get_number( + self._aux_tag_nr) def _is_new_aux_tag(self): return html.request.var("edit") is None + def _get_tag_number(self): + return html.get_integer_input("edit") + + def title(self): + if self._new: + return _("Create new auxiliary tag") + return _("Edit auxiliary tag") + def buttons(self): html.context_button( _("All Hosttags"), watolib.folder_preserving_link([("mode", "hosttags")]), "back") def action(self): - if not html.transaction_valid(): + if not html.check_transaction(): return "hosttags" - html.check_transaction() # use up transaction id - - if self._is_new_aux_tag(): - changed_aux_tag = watolib.AuxTag() - changed_aux_tag.id = self._get_tag_id() - else: - tag_nr = self._get_tag_number() - changed_aux_tag = self._untainted_hosttags_config.aux_tag_list.get_number(tag_nr) - - changed_aux_tag.title = html.get_unicode_input("title").strip() - - topic = forms.get_input(self._get_topic_valuespec(), "topic") - if topic != '': - changed_aux_tag.topic = topic + vs = self._valuespec() + aux_tag_spec = vs.from_html_vars("aux_tag") + vs.validate_value(aux_tag_spec, "aux_tag") - changed_aux_tag.validate() + self._aux_tag = watolib.AuxTag(aux_tag_spec) + self._aux_tag.validate() # Make sure that this ID is not used elsewhere for tag_group in self._untainted_hosttags_config.tag_groups: - if changed_aux_tag.id in tag_group.get_tag_ids(): + if self._aux_tag.id in tag_group.get_tag_ids(): raise MKUserError( "tag_id", _("This tag id is already being used in the host tag group %s") % @@ -373,62 +379,62 @@ class ModeEditAuxtag(ModeEditHosttagConfiguration): changed_hosttags_config = watolib.HosttagsConfiguration() changed_hosttags_config.load() - if self._is_new_aux_tag(): - changed_hosttags_config.aux_tag_list.append(changed_aux_tag) + if self._new: + changed_hosttags_config.aux_tag_list.append(self._aux_tag) else: - changed_hosttags_config.aux_tag_list.update(self._get_tag_number(), changed_aux_tag) + changed_hosttags_config.aux_tag_list.update(self._aux_tag_nr, self._aux_tag) changed_hosttags_config.save() return "hosttags" - def _get_tag_number(self): - return int(html.request.var("edit")) - - def _get_tag_id(self): - return html.request.var("tag_id") - def page(self): - if self._is_new_aux_tag(): - changed_aux_tag = watolib.AuxTag() - else: - tag_nr = self._get_tag_number() - changed_aux_tag = self._untainted_hosttags_config.aux_tag_list.get_number(tag_nr) + html.begin_form("aux_tag") - html.begin_form("auxtag") - forms.header(_("Auxiliary Tag")) + self._valuespec().render_input("aux_tag", self._aux_tag.get_dict_format()) - # Tag ID - forms.section(_("Tag ID")) - if self._is_new_aux_tag(): - html.text_input("tag_id", "") - html.set_focus("tag_id") - else: - html.write_text(self._get_tag_id()) - html.help( - _("The internal name of the tag. The special tags " - "<tt>snmp</tt>, <tt>tcp</tt> and <tt>ping</tt> can " - "be used here in order to specify the agent type.")) - - # Title - forms.section(_("Title") + "<sup>*</sup>") - html.text_input("title", changed_aux_tag.title, size=30) - html.help(_("An alias or description of this auxiliary tag")) - - # The (optional) topic - forms.section(_("Topic") + "<sup>*</sup>") - html.help( - _("Different taggroups can be grouped in topics to make the visualization and " - "selections in the GUI more comfortable.")) - forms.textinput(self._get_topic_valuespec(), "topic", changed_aux_tag.topic) - - # Button and end forms.end() html.show_localization_hint() html.button("save", _("Save")) html.hidden_fields() html.end_form() + def _valuespec(self): + return Dictionary( + title=_("Basic settings"), + elements=self._basic_elements(), + render="form", + form_narrow=True, + optional_keys=[], + ) + + def _basic_elements(self): + if self._new: + vs_id = ID( + title=_("Tag ID"), + size=60, + allow_empty=False, + help=_("The internal ID of the tag is used to store the tag's " + "value in the host properties. It cannot be changed later."), + ) + else: + vs_id = FixedValue( + self._aux_tag.id, + title=_("Tag ID"), + ) + + return [ + ("id", vs_id), + ("title", + TextUnicode( + title=_("Title"), + size=60, + help=_("An alias or description of this auxiliary tag"), + allow_empty=False, + )), + ("topic", self._get_topic_valuespec()), + ] + @mode_registry.register class ModeEditHosttagGroup(ModeEditHosttagConfiguration):

5 years, 5 months

7233 Network scan: Multiple time ranges can be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e4c32944cf17627b94ec0065427ae299b5c352a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e4c32944cf176… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 12:07:05 2019 +0100 7233 Network scan: Multiple time ranges can be configured The network scan can be configured to operate only in a specific time range. With this change it is possible to define multiple independent time ranges. Change-Id: I79a3e9c219f748f678d991d4b1bfde87b4565faa --- .werks/7233 | 11 ++ cmk/gui/plugins/wato/builtin_attributes.py | 115 ++++++++++++--------- cmk/gui/watolib/hosts_and_folders.py | 46 +++++---- .../unit/cmk/gui/test_watolib_hosts_and_folders.py | 37 +++++++ 4 files changed, 143 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8e4c32944c…

5 years, 5 months

← Newer
1
...
27
28
29
30
31
32
33
...
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