Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4142 New extended search dialog for rulesets and rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 42061aad180aeb15ac1f3eb3e674da7b14351af6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42061aad180aeb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 09:57:51 2016 +0100 4142 New extended search dialog for rulesets and rules In addition to the longer existing quick search field, we have now added a dedicated extended search dialog which you can access from the ruleset listing pages. You can use it to search for nearly all aspects of rulesets and rules. Change-Id: Ia9533ef8f6ab976bb5a14de8366cd9e78b33368f --- .werks/4142 | 5 ++++- ChangeLog | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.werks/4142 b/.werks/4142 index 571b316..0f08420 100644 --- a/.werks/4142 +++ b/.werks/4142 @@ -6,4 +6,7 @@ Version: 1.4.0i4 Date: 1482137553 Class: feature - +In addition to the longer existing quick search field, we have now added a +dedicated extended search dialog which you can access from the ruleset +listing pages. You can use it to search for nearly all aspects of rulesets +and rules. diff --git a/ChangeLog b/ChangeLog index 27fe0ff..7a469f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ * 4171 FIX: perle_psmu: fixed value error... WATO: - * 4142 New extended search dialog for rulesets and rules + * 4142 New extended search dialog for rulesets and rules... 1.4.0i3:

7 years, 9 months

Fixed pylint confusion with object type

by Lars Michelsen

Module: check_mk Branch: master Commit: 64b52f1bc37ae05d1957ef0e087193535a061851 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64b52f1bc37ae0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 10:04:39 2016 +0100 Fixed pylint confusion with object type Change-Id: Ia5057e05fe0b91ad7ef022883e1685b6528f0e61 --- web/htdocs/wato.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e8d861b..622c6b6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13276,13 +13276,15 @@ class ModeNewRule(ModeEditRule): self._ruleset.add_rule(self._folder, self._rule) self._rulesets.save() add_change("edit-rule", _("Created new rule in ruleset \"%s\" in folder \"%s\"") % - (self._ruleset.title(), self._folder.alias_path()), - sites=self._folder.all_site_ids()) + (self._ruleset.title(), + self._folder.alias_path()), # pylint: disable=no-member + sites=self._folder.all_site_ids()) # pylint: disable=no-member def _success_message(self): return _("Created new rule in ruleset \"%s\" in folder \"%s\"") % \ - (self._ruleset.title(), self._folder.alias_path()) + (self._ruleset.title(), + self._folder.alias_path()) # pylint: disable=no-member

7 years, 9 months

Smoe cleanups and smaller bugfixes in recent changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c72ed599bf63493e5eb595fd36f07d83e4592c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c72ed599bf634… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 09:48:27 2016 +0100 Smoe cleanups and smaller bugfixes in recent changes Change-Id: I207d84ea6292674a278f38707d5f6c00cd23b02f --- .werks/4142 | 9 ++ ChangeLog | 3 + web/htdocs/wato.py | 424 ++++++++++++++++++++++++++++---------------------- web/htdocs/watolib.py | 319 ++++++++++++++++++------------------- 4 files changed, 399 insertions(+), 356 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3c72ed599b…

7 years, 9 months

Refactored rule editor to WatoMode mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 7020fe56dddfdf07c36453353696321ac457116f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7020fe56dddfdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:50:11 2016 +0100 Refactored rule editor to WatoMode mechanism Change-Id: I286e39551d9b602a1443ccd1ec109c5b70f9d2db --- web/htdocs/wato.py | 633 ++++++++++++++++++++++++++++------------------------- 1 file changed, 332 insertions(+), 301 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7020fe56dd…

7 years, 9 months

Used rulesets: respect the configured folder

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d242920c6cd2128467d865368789d6834660fcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d242920c6cd21… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 10:16:27 2016 +0100 Used rulesets: respect the configured folder Change-Id: Ibc6bc241b26a01cc0ad564501975e82ce6794de4 --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 36 ++++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 622c6b6..5024686 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12052,7 +12052,7 @@ class ModeRulesets(WatoMode): def page(self): if not self._only_host: - Folder.current().show_breadcrump(keepvarnames = ["mode", "local", "group"]) + Folder.current().show_breadcrump(keepvarnames=True) search_form(default_value=self._search_options.get("fulltext", "")) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index b5baecd..3e21cca 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -570,16 +570,22 @@ class BaseFolder(WithPermissionsAndAttributes): def show_breadcrump(self, link_to_folder=False, keepvarnames=None): - if keepvarnames is None: - keepvarnames = ["mode"] + if keepvarnames == True: + uri_func = html.makeuri + keepvars = [] + else: + uri_func = html.makeuri_contextless - keepvars = [ (name, html.var(name)) for name in keepvarnames ] - if link_to_folder: - keepvars.append(("mode", "folder")) + if keepvarnames is None: + keepvarnames = ["mode"] + + keepvars = [ (name, html.var(name)) for name in keepvarnames ] + if link_to_folder: + keepvars.append(("mode", "folder")) def render_component(folder): return '<a href="%s">%s</a>' % \ - (html.makeuri_contextless([ ("folder", folder.path())] + keepvars), + (uri_func([ ("folder", folder.path())] + keepvars), html.attrencode(folder.title())) def breadcrump_element_start(end = '', z_index = 0): @@ -624,8 +630,11 @@ class BaseFolder(WithPermissionsAndAttributes): onchange = "folderpath.submit();", attrs = { "class": "folderpath", } ) - for var in keepvarnames: - html.hidden_field(var, html.var(var)) + if keepvarnames == True: + html.hidden_fields() + else: + for var in keepvarnames: + html.hidden_field(var, html.var(var)) html.write("</form></div>") breadcrump_element_end('end') @@ -6230,6 +6239,10 @@ class Ruleset(object): return not self._rules + def is_empty_in_folder(self, folder): + return not bool(self.get_folder_rules(folder)) + + def num_rules(self): return sum([ len(rules) for rules in self._rules.values() ]) @@ -6247,7 +6260,10 @@ class Ruleset(object): def get_folder_rules(self, folder): - return self._rules[folder.path()] + try: + return self._rules[folder.path()] + except KeyError: + return [] def add_rule(self, folder, rule): @@ -6304,7 +6320,7 @@ class Ruleset(object): if "ruleset_deprecated" in search_options and not self.is_deprecated(): return False - if "ruleset_used" in search_options and self.is_empty(): + if "ruleset_used" in search_options and self.is_empty_in_folder(Folder.current()): return False if "ruleset_group" in search_options \

7 years, 9 months

Fixed manual checks ruleset editing navigation; Cleaned up some more code

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f9c8feb4106075956ce0b06e1ee4188de583408 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9c8feb410607… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:45:02 2016 +0100 Fixed manual checks ruleset editing navigation; Cleaned up some more code Change-Id: If15d711551a84d5eb5c84dc669f34e41b63b7320 --- web/htdocs/wato.py | 480 ++++++++++++++++++++++++++--------------------------- 1 file changed, 240 insertions(+), 240 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4f9c8feb41…

7 years, 9 months

Refactored ruleset listing dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 8911dc6683916c30b41de5e9028aab66a4912a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8911dc6683916c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:40:02 2016 +0100 Refactored ruleset listing dialog Change-Id: I97ae002a862d732ef42b5417a34df0dd07b4b2e0 --- web/htdocs/wato.py | 300 ++++++++++++++++++++++++++------------------------ web/htdocs/watolib.py | 2 +- 2 files changed, 157 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8911dc6683…

7 years, 9 months

Cleaned up ruleset list and searching manual checks rulesets;

by Lars Michelsen

Added ruleset group search filter Message-ID: <5857a589.ZaT5oVUZ6h7fD68Z%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 934ff2b7372e838da35b617a4820643b488d6c90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=934ff2b7372e83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:15:41 2016 +0100 Cleaned up ruleset list and searching manual checks rulesets; Added ruleset group search filter Change-Id: I4a66144afd6b92db3f0eb419bcc2f07a8dd10079 --- web/htdocs/wato.py | 172 +++++++++++++++----------------- web/htdocs/watolib.py | 105 +++++++++++++++++-- web/plugins/wato/datasource_programs.py | 26 ++--- 3 files changed, 190 insertions(+), 113 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=934ff2b737…

7 years, 9 months

Changed ruleset group list and ruleset list to WatoMode mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: a3b326742b6bc7ed19299d71b9e14fe9a5e6f8ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3b326742b6bc7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:30:02 2016 +0100 Changed ruleset group list and ruleset list to WatoMode mechanism Change-Id: I6e22551f801393b61f45cbbaf8f117ae4bfbb9a5 --- web/htdocs/wato.py | 344 +++++++++++++++++++++++++++++------------------------ 1 file changed, 186 insertions(+), 158 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a3b326742b…

7 years, 9 months

Additional cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ca3f352e60bdf314e3bf054dcf0d560b3b2f24a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca3f352e60bdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 19 08:46:32 2016 +0100 Additional cleanup Change-Id: I136da85ccef9ef4ab8485c25724504cb70a57727 --- web/htdocs/wato.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 422bd6c..7e92a37 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12150,6 +12150,7 @@ def rule_search_button(search_options=None, mode="rulesets"): delvars=["filled_in"]), "search", hot=bool(search_options)) + class ModeEditRuleset(WatoMode): def __init__(self): self._from_vars() @@ -12162,6 +12163,7 @@ class ModeEditRuleset(WatoMode): if not may_edit_ruleset(self._name): raise MKAuthException(_("You are not permitted to access this ruleset.")) + # TODO: Clean this up. In which case is it used? self._item = None if html.var("check_command"): check_command = html.var("check_command") @@ -12186,19 +12188,16 @@ class ModeEditRuleset(WatoMode): raise MKUserError("varname", _("The ruleset \"%s\" does not exist.") % self._name) if not self._item: + self._item = NO_ITEM if html.has_var("item"): try: self._item = mk_eval(html.var("item")) except: - self._item = NO_ITEM - else: - self._item = NO_ITEM + pass - self._hostname = html.var("host") - if self._hostname: - host = Folder.current().host(self._hostname) - if not host: - self._hostname = None # host not found. Should not happen + hostname = html.var("host") + if hostname and Folder.current().has_host(self._hostname): + self._hostname = hostname def title(self): @@ -12529,7 +12528,7 @@ class ModeEditRuleset(WatoMode): # TODO: Refactor this whole method - def _rule_conditions(rulespec, tagspecs, host_list, item_list, varname, folder): + def _rule_conditions(self, rulespec, tagspecs, host_list, item_list, varname, folder): html.open_ul(class_="conditions") # Host tags @@ -12548,7 +12547,7 @@ class ModeEditRuleset(WatoMode): if group_alias: html.write_text(_("Host") + ": " + group_alias + " " + _("is") + " ") if negate: - html.b(_("not")) + html.b(_("not") + " ") else: if negate: html.write_text(_("Host does not have tag"))

7 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016