Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Tests: Increase time waiting for a processed host check result

by Lars Michelsen

Module: check_mk Branch: master Commit: 7184481febfa20bae6bc4b254a86fd63a18e376d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7184481febfa20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 10:48:44 2017 +0100 Tests: Increase time waiting for a processed host check result Change-Id: Id3bcc9778e479e890dbb6bf81cee6b5b607aabab --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a71e3e7..a98dfe3 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -253,7 +253,7 @@ class Site(object): "Columns: last_check\n" \ "Filter: host_name = %s\n" % (hostname)) - schedule_ts, wait_timeout = time.time(), 10 + schedule_ts, wait_timeout = time.time(), 20 # Ensure the next check result is not in same second as the previous check while int(last_check_before) == int(schedule_ts):

6 years, 7 months

5537 Icon categories can now be customized

by Lars Michelsen

Module: check_mk Branch: master Commit: a0c827ff5861183a0d2a9b7a8990a26f008c10fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0c827ff586118… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 10:47:44 2017 +0100 5537 Icon categories can now be customized The icon categories that can be used for managing custom icons in WATO can now be configured using a new global setting "Administration tool (WATO) > Icon categories". Change-Id: Iaad028fb17a3c038d408a75fb2af043edd2fe7c6 --- .werks/5537 | 11 +++++++++++ web/htdocs/valuespec.py | 28 ++++++++++++++++++---------- web/htdocs/wato.py | 2 +- web/plugins/config/wato.py | 5 +++++ web/plugins/wato/check_mk_configuration.py | 22 ++++++++++++++++++++++ 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/.werks/5537 b/.werks/5537 new file mode 100644 index 0000000..2af0749 --- /dev/null +++ b/.werks/5537 @@ -0,0 +1,11 @@ +Title: Icon categories can now be customized +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511343973 +Class: feature + +The icon categories that can be used for managing custom icons in WATO can +now be configured using a new global setting "Administration tool (WATO) > Icon categories". diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a09712a..f529d45 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4153,12 +4153,6 @@ class TextOrRegExpUnicode(TextOrRegExp): class IconSelector(ValueSpec): - _categories = [ - ('logos', _('Logos')), - ('parts', _('Parts')), - ('misc', _('Misc')), - ] - def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._allow_empty = kwargs.get('allow_empty', True) @@ -4169,10 +4163,17 @@ class IconSelector(ValueSpec): 'empty', ] + + @classmethod + def categories(cls): + import config# FIXME: Clean this up. But how? + return (config.wato_icon_categories) + + @classmethod def category_alias(cls, category_name): - categories = dict(cls._categories) - return dict(cls._categories).get(category_name, category_name) + return cls.categories().get(category_name, category_name) + # All icons within the images/icons directory have the ident of a category # witten in the PNG meta data. For the default images we have done this scripted. @@ -4184,7 +4185,7 @@ class IconSelector(ValueSpec): if not only_local: dirs.append(os.path.join(cmk.paths.omd_root, "share/check_mk/web/htdocs/images/icons")) - valid_categories = dict(self._categories).keys() + valid_categories = self.categories().keys() from PIL import Image @@ -4226,6 +4227,7 @@ class IconSelector(ValueSpec): return icons + def available_icons_by_category(self, icons): by_cat = {} for icon_name, category_name in icons.items(): @@ -4233,11 +4235,12 @@ class IconSelector(ValueSpec): by_cat[category_name].append(icon_name) icon_categories = [] - for category_name, category_alias in self._categories: + for category_name, category_alias in self.categories().items(): if category_name in by_cat: icon_categories.append((category_name, category_alias, by_cat[category_name])) return icon_categories + def render_icon(self, icon_name, onclick = '', title = '', id = ''): if not icon_name: icon_name = self._empty_img @@ -4248,6 +4251,7 @@ class IconSelector(ValueSpec): return icon + def render_input(self, varprefix, value): self.classtype_info() if not value: @@ -4326,6 +4330,7 @@ class IconSelector(ValueSpec): html.close_div() + def from_html_vars(self, varprefix): icon = html.var(varprefix + '_value') if icon == 'empty': @@ -4337,10 +4342,12 @@ class IconSelector(ValueSpec): # TODO: This is a workaround for a bug. This function needs to return str objects right now. return "%s" % self.render_icon(value) + def validate_datatype(self, value, varprefix): if value is not None and type(value) != str: raise MKUserError(varprefix, _("The type is %s, but should be str") % type(value)) + def validate_value(self, value, varprefix): if not self._allow_empty and not value: raise MKUserError(varprefix, _("You need to select an icon.")) @@ -4349,6 +4356,7 @@ class IconSelector(ValueSpec): raise MKUserError(varprefix, _("The selected icon image does not exist.")) + class TimeofdayRanges(Transform): def __init__(self, **args): self._count = args.get("count", 3) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb3df83..4b3d6be 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15884,7 +15884,7 @@ class ModeIcons(WatoMode): )), ('category', DropdownChoice( title = _('Category'), - choices = IconSelector._categories, + choices = config.wato_icon_categories, no_preselect = True, )) ] diff --git a/web/plugins/config/wato.py b/web/plugins/config/wato.py index 0169e92..3895f39 100644 --- a/web/plugins/config/wato.py +++ b/web/plugins/config/wato.py @@ -45,6 +45,11 @@ wato_legacy_eval = False wato_read_only = {} wato_hide_folders_without_read_permissions = False wato_pprint_config = False +wato_icon_categories = [ + ("logos", "Logos"), + ("parts", "Parts"), + ("misc", "Misc"), +] def tag_alias(tag): for entry in wato_host_tags: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 37bc340..505af71 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1039,6 +1039,28 @@ register_configvar(group, ), domain = "multisite") +register_configvar(group, + "wato_icon_categories", + ListOf( + Tuple( + elements = [ + ID( + title = _("ID"), + ), + TextUnicode( + title = _("Title"), + ), + ], + orientation = "horizontal", + ), + title = _("Icon categories"), + help = _("You can customize the list of icon categories to be able to assign " + "your <a href=\"?mode=icons\">custom icons</a> to these categories. " + "They will then be shown under this category in the icon selector."), + ), + domain = "multisite" +) + #. # .--User Management-----------------------------------------------------. # | _ _ __ __ _ |

6 years, 7 months

Dramatically improved load time of global settings page

by Lars Michelsen

Module: check_mk Branch: master Commit: c12e54b57b5c297894c7356e68a43d11c685c7e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c12e54b57b5c29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 10:03:06 2017 +0100 Dramatically improved load time of global settings page Change-Id: I6ba20e8cea500bf0eb8bf67b21c5980b2738446f --- cmk_base/automations/check_mk.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index f44ac63..be553ab 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -797,7 +797,16 @@ automations.register(AutomationReload()) class AutomationGetConfiguration(Automation): cmd = "get-configuration" needs_config = False - needs_checks = True + # This needed the checks in the past. This was necessary to get the + # default values of check related global settings. This kind of + # global settings have been removed from the global settings page + # of WATO. We can now disable this (by default). + # We need to be careful here, because users may have added their own + # global settings related to checks. To deal with this, we check + # for requested but missing global variables and load the checks in + # case one is missing. When it's still missing then, we silenlty skip + # this option (like before). + needs_checks = False def execute(self, args): config.load(with_conf_d=False) @@ -805,6 +814,14 @@ class AutomationGetConfiguration(Automation): # We read the list of variable names from stdin since # that could be too much for the command line variable_names = eval(sys.stdin.read()) + + missing_variables = [ v for v in variable_names + if not hasattr(config, v) ] + + if missing_variables: + checks.load() + config.load(with_conf_d=False) + result = {} for varname in variable_names: if hasattr(config, varname):

6 years, 7 months

Writing werks to text: Deal with special chars in component text

by Lars Michelsen

Module: check_mk Branch: master Commit: 733ff4cda582bfe7ee02a92622e053b1a2a6f44b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=733ff4cda582bf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 10:17:49 2017 +0100 Writing werks to text: Deal with special chars in component text Change-Id: I97ede119d755e030e93a645bd5f7199a13629d3c --- lib/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/werks.py b/lib/werks.py index 98dbea1..15607a5 100644 --- a/lib/werks.py +++ b/lib/werks.py @@ -204,7 +204,7 @@ def write_as_text(werks, f, write_version=True): component = werk["component"] f.write(" %s:\n" % \ - werk_components().get(component, component)) + werk_components().get(component, component).encode("utf-8")) write_werk_as_text(f, werk)

6 years, 7 months

5536 Network scan: New option to disable configuring "IPv4 Address" attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: 82b8bb232f1df92fb1461b356a8a05b703b9a069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82b8bb232f1df9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:40:49 2017 +0100 5536 Network scan: New option to disable configuring "IPv4 Address" attribute Change-Id: I0f6107fdfb91bd4e1c3f88e0d798385a4c21b017 --- .werks/5536 | 10 ++++++++++ web/htdocs/wato.py | 5 ++++- web/plugins/wato/builtin_attributes.py | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/5536 b/.werks/5536 new file mode 100644 index 0000000..a52a8f8 --- /dev/null +++ b/.werks/5536 @@ -0,0 +1,10 @@ +Title: Network scan: New option to disable configuring "IPv4 Address" attribute +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511340038 +Class: feature + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 28a0208..eb3df83 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16787,9 +16787,12 @@ def add_scanned_hosts_to_folder(folder, found): host_name = cmk.translations.translate_hostname(translation, host_name) attrs = { - "ipaddress" : ipaddress, "tag_criticality" : network_scan_properties.get("tag_criticality", "offline"), } + + if network_scan_properties.get("set_ipaddress", True): + attrs["ipaddress"] = ipaddress + if not watolib.Host.host_exists(host_name): entries.append((host_name, attrs, None)) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 635efc9..93bd567 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -287,6 +287,12 @@ class NetworkScanAttribute(ValueSpecAttribute): help = _("Limit the execution of the scan to this time range."), allow_empty=False, )), + ("set_ipaddress", Checkbox( + title = _("Set IPv4 address"), + help = _("Whether or not to configure the found IP address as the IPv4 " + "address of the found hosts."), + default_value = True, + )), ("tag_criticality", DropdownChoice( title = _("Set criticality host tag"), help = _("Added hosts will be created as \"offline\" host by default. You "

6 years, 7 months

Analyze config: Aggregate multiple test results together to one for each test per site

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e6943546d948be79d760c851c67aef39956e288 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e6943546d948b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:23:15 2017 +0100 Analyze config: Aggregate multiple test results together to one for each test per site Change-Id: I71040203b63a8e2573b32e8caa0ffefda43ba7e8 --- web/htdocs/watolib.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 9fe61e0..9aebf8f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -9449,6 +9449,26 @@ class ACResult(object): self.site_id = config.omd_site() + @classmethod + def merge(cls, *results): + """Create a new result object from the given result objects. + + a) use the worst state + b) concatenate the texts + """ + texts, worst_cls = [], ACResultOK + for result in results: + text = result.text + if result.status != 0: + text += " (%s)" % ("!"*result.status) + texts.append(text) + + if result.status > worst_cls.status: + worst_cls = result.__class__ + + return worst_cls(", ".join(texts)) + + def status_name(self): return cmk.defines.short_service_state_name(self.status) @@ -9552,9 +9572,9 @@ class ACTest(object): def run(self): self._executed = True try: - for result in self.execute(): - result.from_test(self) - yield result + total_result = ACResult.merge(*list(self.execute())) + total_result.from_test(self) + yield total_result except Exception, e: log_exception() result = ACResultCRIT("<pre>%s</pre>" %

6 years, 7 months

Analyze config: Fixed processing of remote site results

by Lars Michelsen

Module: check_mk Branch: master Commit: 931a380a6691d103d6022eeb96b0f76f97a58f7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931a380a6691d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:00:13 2017 +0100 Analyze config: Fixed processing of remote site results Change-Id: I0154850dcec6d976795aaa6994bb953a442869c7 --- 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 890ddf8..e165c27 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16581,7 +16581,7 @@ class ModeAnalyzeConfig(WatoMode): elif isinstance(results_data, list): test_results = [] for result_data in results_data: - result = watolib.ACResult.from_repr(ast.literal_eval(result_data)) + result = watolib.ACResult.from_repr(result_data) test_results.append(result) results_by_site[site_id] = test_results @@ -16603,8 +16603,7 @@ class ModeAnalyzeConfig(WatoMode): def _perform_tests_for_site(self, site_id, result_queue): try: if config.site_is_local(site_id): - results = watolib.check_analyze_config() - results_data = [ repr(result) for result in results ] + results_data = watolib.check_analyze_config() else: results_data = watolib.do_remote_automation( @@ -16615,6 +16614,9 @@ class ModeAnalyzeConfig(WatoMode): except Exception, e: log_exception() result_queue.put((site_id, e)) + finally: + result_queue.close() + result_queue.join_thread() def _filter_test_results(self, results_by_category):

6 years, 7 months

Analyze config: Failed tests can now be hidden using a dedicated button

by Lars Michelsen

Module: check_mk Branch: master Commit: 3af5a163b7c28f2eef0c4ac52397e2512835b6fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af5a163b7c28f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:07:59 2017 +0100 Analyze config: Failed tests can now be hidden using a dedicated button Change-Id: Ib910bcb811f06f54802325adcfcdc57af1da2b4a --- web/htdocs/wato.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e165c27..28a0208 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16429,8 +16429,9 @@ class ModeAnalyzeConfig(WatoMode): def _from_vars(self): - self._show_ok = html.has_var("show_ok") - self._show_ack = html.has_var("show_ack") + self._show_ok = html.has_var("show_ok") + self._show_failed = not html.has_var("hide_failed") + self._show_ack = html.has_var("show_ack") def title(self): @@ -16481,6 +16482,11 @@ class ModeAnalyzeConfig(WatoMode): else: html.buttonlink(html.makeuri([("show_ok", "1")]), _("Show succeeded tests")) + if self._show_failed: + html.buttonlink(html.makeuri([("hide_failed", "1")]), _("Hide failed tests")) + else: + html.buttonlink(html.makeuri([], delvars=["hide_failed"]), _("Show failed tests")) + if self._show_ack: html.buttonlink(html.makeuri([], delvars=["show_ack"]), _("Hide acknowledged tests")) else: @@ -16624,6 +16630,9 @@ class ModeAnalyzeConfig(WatoMode): if not self._show_ok: results = filter(lambda result: type(result) != ACResultOK, results) + if not self._show_failed: + results = filter(lambda result: type(result) == ACResultOK, results) + if not self._show_ack: results = filter(lambda result: not self._is_acknowledged(result), results)

6 years, 7 months

Fixed NameError after moving code

by Lars Michelsen

Module: check_mk Branch: master Commit: e7e204c18be5689fffc5a1b66baccf4d8ab24814 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7e204c18be568… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:01:38 2017 +0100 Fixed NameError after moving code Change-Id: I5e1a1b0af4aa32e9014726e7b7b7809c9b8535a6 --- web/plugins/wato/bp_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/bp_tests.py b/web/plugins/wato/bp_tests.py index 6455529..e8d00e3 100644 --- a/web/plugins/wato/bp_tests.py +++ b/web/plugins/wato/bp_tests.py @@ -74,6 +74,7 @@ class ACTestPersistentConnections(ACTest): yield ACResultOK(_("Is not using persistent connections.")) + class ACTestLiveproxyd(ACTest): def category(self): return "performance" @@ -96,10 +97,10 @@ class ACTestLiveproxyd(ACTest): def execute(self): site_id = config.omd_site() - if site_is_using_livestatus_proxy(site_id): + if watolib.site_is_using_livestatus_proxy(site_id): yield ACResultOK(_("Site is using the Livestatus Proxy Daemon")) - elif not is_wato_slave_site(): + elif not watolib.is_wato_slave_site(): yield ACResultWARN(_("The Livestatus Proxy is not only good for slave sites, " "enable it for your master site"))

6 years, 7 months

Renamed Analyze configuration plugin file

by Lars Michelsen

Module: check_mk Branch: master Commit: f70976b088e50b871b27556419b302c0bfbd5ac7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f70976b088e50b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 09:02:10 2017 +0100 Renamed Analyze configuration plugin file Change-Id: I5e0a59ddad5d90b39837bc775113c6c0f8bb5ce7 --- web/plugins/wato/{bp_tests.py => ac_tests.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/bp_tests.py b/web/plugins/wato/ac_tests.py similarity index 100% rename from web/plugins/wato/bp_tests.py rename to web/plugins/wato/ac_tests.py

6 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017