Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: daf359ba2fd269536c6e32d8debdb068a6dec867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daf359ba2fd269… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Dec 12 15:44:28 2018 +0100 Fixed some embarrassing typos Change-Id: I6e51d6d32cc68d856016a7d2fb8b2f2311188a1f --- checkman/win_printers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/win_printers b/checkman/win_printers index 0a1714b..88c1dbe 100644 --- a/checkman/win_printers +++ b/checkman/win_printers @@ -4,10 +4,10 @@ catalog: os/services license: GPL distribution: check_mk description: - This check needs the agent pluing win_printers.ps1 from our plugin directory. + This check needs the agent plugin win_printers.ps1 from our plugin directory. After copying to the agent plugin directory, Check_MK will find all connected printers. Then its possible to set {WARN} and {CRIT} levels for the number of jobs in the queue. - Error and operational states from the print will be automaticly detected and displayed. + Error and operational states from the print will be automatically detected and displayed. item: The name of the printer

5 years, 9 months

check_parameters: move azure params in own file

by Moritz Kiemer

Module: check_mk Branch: master Commit: b366a26e367983c9a23e881c55c75c774a29ca86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b366a26e367983… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 12 13:14:07 2018 +0100 check_parameters: move azure params in own file Change-Id: I99257bdca643712bde8a3e6d8c1aca92f64bd285 --- cmk/gui/plugins/wato/check_parameters/azure.py | 238 ++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 161 --------------- 2 files changed, 238 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b366a26e36…

5 years, 9 months

Added pretty_print parameter to web API.

by Sven Panne

Module: check_mk Branch: master Commit: d62adc2a06a593a9c6fcb587e5fbdf7d654aad3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d62adc2a06a593… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 12 14:06:33 2018 +0100 Added pretty_print parameter to web API. CMK-1403 Change-Id: If895e506399af13950a8433ce809284060f732a5 --- cmk/gui/webapi.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index 14a1070..89cd3c3 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -26,6 +26,8 @@ import traceback import json +import pprint +import xml.dom.minidom # type: ignore import dicttoxml # type: ignore @@ -79,21 +81,32 @@ def load_plugins(force): FORMATTERS = { - "json": json.dumps, - "python": repr, - "xml": dicttoxml.dicttoxml, + "json": ( + json.dumps, + lambda response: json.dumps(response, sort_keys=True, indent=4, separators=(',', ': '))), + "python": (repr, pprint.pformat), + "xml": ( + dicttoxml.dicttoxml, + lambda response: xml.dom.minidom.parseString(dicttoxml.dicttoxml(response)).toprettyxml()), } @cmk.gui.pages.register("webapi") def page_api(): try: + pretty_print = False if html.output_format not in FORMATTERS: html.set_output_format("python") raise MKUserError( None, "Only %s are supported as output formats" % " and ".join( '"%s"' % f for f in FORMATTERS)) + # TODO: Add some kind of helper for boolean-valued variables? + pretty_print_var = html.request.var("pretty_print", "no").lower() + if pretty_print_var not in ("yes", "no"): + raise MKUserError(None, 'pretty_print must be "yes" or "no"') + pretty_print = pretty_print_var == "yes" + if not config.user.get_attribute("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") @@ -121,7 +134,7 @@ def page_api(): if html.var("request"): request_object = html.var("request") else: - request_object = html.get_request(exclude_vars=["action"]) + request_object = html.get_request(exclude_vars=["action", "pretty_print"]) # Check if the data was sent with the correct data format # Some API calls only allow python code @@ -169,4 +182,4 @@ def page_api(): "result": _("Unhandled exception: %s") % traceback.format_exc(), } - html.write(FORMATTERS[html.output_format](response)) + html.write(FORMATTERS[html.output_format][1 if pretty_print else 0](response))

5 years, 9 months

Allow XML output for our web API.

by Sven Panne

Module: check_mk Branch: master Commit: 3dc46d0e068b9c5fb954a6fed827395e9c1a3e9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dc46d0e068b9c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 12 11:37:00 2018 +0100 Allow XML output for our web API. CMK-1403 Change-Id: Ic4cad7e686b58cece59b321d10bbb40cd7699368 --- cmk/gui/webapi.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index 8eefaf7..14a1070 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -27,6 +27,8 @@ import traceback import json +import dicttoxml # type: ignore + import cmk import cmk.gui.pages @@ -76,15 +78,21 @@ def load_plugins(force): config.builtin_role_ids) +FORMATTERS = { + "json": json.dumps, + "python": repr, + "xml": dicttoxml.dicttoxml, +} + + @cmk.gui.pages.register("webapi") def page_api(): try: - # The API uses JSON format by default and python as optional alternative - output_format = html.var("output_format", "json") - if output_format not in ["json", "python"]: - raise MKUserError(None, "Only \"json\" and \"python\" are supported as output formats") - else: - html.set_output_format(output_format) + if html.output_format not in FORMATTERS: + html.set_output_format("python") + raise MKUserError( + None, "Only %s are supported as output formats" % " and ".join( + '"%s"' % f for f in FORMATTERS)) if not config.user.get_attribute("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") @@ -161,7 +169,4 @@ def page_api(): "result": _("Unhandled exception: %s") % traceback.format_exc(), } - if html.output_format == "json": - html.write(json.dumps(response)) - else: - html.write(repr(response)) + html.write(FORMATTERS[html.output_format](response))

5 years, 9 months

azure.include: minor improvements

by Moritz Kiemer

Module: check_mk Branch: master Commit: 05302d41d9742004d1c62f4edfa9fbaa30358c36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05302d41d97420… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Dec 12 08:04:18 2018 +0100 azure.include: minor improvements * allow showing other attributes * add formatter for milli seconds * nicely format levels text Change-Id: Ife553db1cebe4cf54b981f8a3da1805c8b69b351 --- checks/azure.include | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/checks/azure.include b/checks/azure.include index 54b2ed8..d3c134b 100644 --- a/checks/azure.include +++ b/checks/azure.include @@ -26,15 +26,17 @@ import json -def azure_iter_informative_attrs(resource): +def azure_iter_informative_attrs(resource, include_keys=('location',)): + def cap(s): # not quite what str.title() does + return s[0].upper() + s[1:] - loc = resource.get('location') - if loc is not None: - yield 'Location', loc + for key in include_keys: + if key in resource: + yield cap(key), resource[key] for key, value in resource.get('tags', {}).iteritems(): if not key.startswith("hidden-"): - yield key[0].upper() + key[1:], value + yield cap(key), value def check_azure_metric(resource, @@ -61,6 +63,7 @@ def check_azure_metric(resource, formatter = { "percent": get_percent_human_readable, "bytes": get_bytes_human_readable, + "milli_seconds": lambda ms: "%d ms" % ms }.get(metric.unit, str) text = "%s: %s" % (display_name, formatter(value)) @@ -71,7 +74,7 @@ def check_azure_metric(resource, elif warn_lower is not None and value <= warn_lower: l_state = 1 if l_state != 0: - text += " (warn/crit below %s/%s)" % (warn_lower, crit_lower) + text += " (warn/crit below %s/%s)" % (formatter(warn_lower), formatter(crit_lower)) warn, crit = levels or (None, None) if crit is not None and value >= crit: @@ -79,7 +82,7 @@ def check_azure_metric(resource, elif warn is not None and value >= warn: u_state = 1 if u_state != 0: - text += " (warn/crit at %s/%s)" % (warn, crit) + text += " (warn/crit at %s/%s)" % (formatter(warn), formatter(crit)) return max(l_state, u_state), text, [(cmk_key, value, warn, crit, minv, maxv)]

5 years, 9 months

6817 varnish: Now supports 'varnishstat' version 6.0

by Simon Betz

Module: check_mk Branch: master Commit: c033711656f072c0654f34d92f125943676872ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c033711656f072… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 27 12:03:42 2018 +0100 6817 varnish: Now supports 'varnishstat' version 6.0 Change-Id: I4c8bd01b16ca300ff8fc8d49e946b4ffca4fc36f --- .werks/6817 | 10 + checks/varnish | 374 +++++---- .../datasets/varnish_new_format_regression.py | 859 +++++++++++++++++++++ .../datasets/varnish_old_format_regression.py | 580 ++++++++++++++ 4 files changed, 1679 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c033711656…

5 years, 9 months

WK6698: The 'Activates button' no longer cause performance issues

by Andreas Boesl

Module: check_mk Branch: master Commit: 84f45d44f2731632737bb6b6e94406183636aadb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84f45d44f27316… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 12 10:39:02 2018 +0100 WK6698: The 'Activates button' no longer cause performance issues Change-Id: Id2ebc2eab2cc4a72af79670cb87901b4d29965e9 --- .werks/6698 | 13 +++++++++++++ cmk/gui/plugins/wato/utils/context_buttons.py | 13 ++++--------- cmk/gui/wato/pages/host_rename.py | 2 +- cmk/gui/watolib.py | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.werks/6698 b/.werks/6698 new file mode 100644 index 0000000..0f6b19a --- /dev/null +++ b/.werks/6698 @@ -0,0 +1,13 @@ +Title: The "Activates button" no longer cause performance issues when there are hundreds of open changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1544530074 + +If there are more than 10 changes in the WATO configuration the button simply states <tt>10+ changes</tt>, +instead of digging through the whole configuration till it gets the exact number. + diff --git a/cmk/gui/plugins/wato/utils/context_buttons.py b/cmk/gui/plugins/wato/utils/context_buttons.py index 02f0f83..a4edc8d 100644 --- a/cmk/gui/plugins/wato/utils/context_buttons.py +++ b/cmk/gui/plugins/wato/utils/context_buttons.py @@ -38,20 +38,15 @@ def home_button(): def changelog_button(): - num_pending = watolib.get_number_of_pending_changes() - if num_pending >= 1: + pending_info = watolib.get_pending_changes_info() + if pending_info: hot = True icon = "wato_changes" - - if num_pending == 1: - buttontext = _("1 change") - else: - buttontext = _("%d changes") % num_pending - + buttontext = pending_info else: - buttontext = _("No changes") hot = False icon = "wato_nochanges" + buttontext = _("No changes") html.context_button(buttontext, watolib.folder_preserving_link([("mode", "changelog")]), icon, hot) diff --git a/cmk/gui/wato/pages/host_rename.py b/cmk/gui/wato/pages/host_rename.py index ae44da8..69c367f 100644 --- a/cmk/gui/wato/pages/host_rename.py +++ b/cmk/gui/wato/pages/host_rename.py @@ -381,7 +381,7 @@ class ModeRenameHost(WatoMode): _("Last result"), host_renaming_job.detail_url(), "background_job_details") def action(self): - if watolib.get_number_of_pending_changes(): + if watolib.get_pending_changes_info(): raise MKUserError("newname", _("You cannot rename a host while you have pending changes.")) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index 0cfb9a3..e27241a 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -558,6 +558,11 @@ def add_service_change(host, action_name, text, need_sync=False): add_change(action_name, text, obj=host, sites=[host.site_id()], need_sync=need_sync) +def get_pending_changes_info(): + changes = ActivateChanges() + return changes.get_changes_estimate() + + def get_number_of_pending_changes(): changes = ActivateChanges() changes.load() @@ -5043,6 +5048,17 @@ class ActivateChanges(object): self._changes = sorted(changes.items(), key=lambda k_v: k_v[1]["time"]) + def get_changes_estimate(self): + changes_counter = 0 + for site_id in self.activation_site_ids(): + changes_counter += len(self._load_site_changes(site_id)) + if changes_counter > 10: + return _("10+ changes") + if changes_counter == 1: + return _("1 change") + elif changes_counter > 1: + return _("%d changes") % changes_counter + def grouped_changes(self): return self._changes

5 years, 9 months

YAPFed test file

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bfaad60e650e3dc753ac382889e6fa99f461049 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bfaad60e650e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 10:02:45 2018 +0100 YAPFed test file Change-Id: If1b7bc3bf3ce122076e4113a89181d361d5d901a --- tests/integration/cmk/gui/test_crawl.py | 175 ++++++++++++++------------------ 1 file changed, 79 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bfaad60e6…

5 years, 9 months

Make GUI crawl only put files into the local site to avoid permission issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 91dda4caec6996a7730ff38170e2d484713d3246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91dda4caec6996… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 10:10:02 2018 +0100 Make GUI crawl only put files into the local site to avoid permission issues Change-Id: I3935f763136ed7c5f8c2da49cbdeedb6c12e8bed --- tests/integration/cmk/gui/test_crawl.py | 15 ++++++++------- tests/testlib/__init__.py | 10 ---------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/integration/cmk/gui/test_crawl.py b/tests/integration/cmk/gui/test_crawl.py index 5162d5a..d5f033a 100644 --- a/tests/integration/cmk/gui/test_crawl.py +++ b/tests/integration/cmk/gui/test_crawl.py @@ -13,7 +13,7 @@ import traceback from urlparse import urlsplit, parse_qsl, urlunsplit, urljoin from urllib import urlencode from bs4 import BeautifulSoup -from testlib import web, var_dir +from testlib import web from testlib import CMKWebSession @@ -303,17 +303,20 @@ class TestCrawler(object): self.report() + def var_dir(self): + return self.site.path("var/log") + def stats_file(self): - return var_dir() + "/crawl.stats" + return self.var_dir() + "/crawl.stats" def report_file(self): - return var_dir() + "/crawl.report" + return self.var_dir() + "/crawl.report" def web_log_file(self): - return var_dir() + "/crawl-web.log" + return self.var_dir() + "/crawl-web.log" def apache_error_log_file(self): - return var_dir() + "/crawl-apache_error_log.log" + return self.var_dir() + "/crawl-apache_error_log.log" def load_stats(self): try: @@ -325,8 +328,6 @@ class TestCrawler(object): raise def save_stats(self): - if not os.path.exists(var_dir()): - os.makedirs(var_dir()) file(self.stats_file() + ".tmp", "w").write(pprint.pformat(self.stats) + "\n") os.rename(self.stats_file() + ".tmp", self.stats_file()) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9aa8765..c91028b 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -57,16 +57,6 @@ def cme_path(): return repo_path() + "/managed" -# Directory for persisting variable data produced by tests -def var_dir(): - if "WORKSPACE" in os.environ: - base_dir = os.environ["WORKSPACE"] + "/results" - else: - base_dir = repo_path() + "/tests/var" - - return base_dir - - def virtualenv_path(): try: venv = subprocess.check_output(["pipenv", "--bare", "--venv"])

5 years, 9 months

Minor improvements in background job handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 88ad3b68ce74f6afa61df6e2d09939b1a4aa36ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88ad3b68ce74f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 21:57:17 2018 +0100 Minor improvements in background job handling * Some more helpful output / logging * Job state: Ensure state / duration fields are always set * get_status(): Early exit in all possible completion states Change-Id: I6af6d223e401d52580e954f39ce08885a28cafe7 --- cmk/gui/background_job.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/cmk/gui/background_job.py b/cmk/gui/background_job.py index 4c8e77e..888e020 100644 --- a/cmk/gui/background_job.py +++ b/cmk/gui/background_job.py @@ -160,6 +160,8 @@ class BackgroundProcess(BackgroundProcessInterface, multiprocessing.Process): # Setup environment (Logging, Livestatus handles, etc.) try: self.initialize_environment() + self._logger.verbose( + "Initialized background job (Job ID: %s)" % self._job_parameters["job_id"]) self._jobstatus.update_status({ "state": JobStatus.state_running, }) @@ -167,8 +169,8 @@ class BackgroundProcess(BackgroundProcessInterface, multiprocessing.Process): # The actual function call self._execute_function() except Exception: - sys.stderr.write("Exception while preparing background function environment: %s\n" % - traceback.format_exc()) + self._logger.error( + "Exception while preparing background function environment", exc_info=True) self._jobstatus.update_status({"state": JobStatus.state_exception}) def initialize_environment(self): @@ -318,7 +320,11 @@ class BackgroundJob(object): job_status = self.get_status() - if job_status["state"] == JobStatus.state_finished: + if job_status["state"] in [ + JobStatus.state_finished, + JobStatus.state_exception, + JobStatus.state_stopped, + ]: return False if "pid" in job_status: @@ -457,6 +463,7 @@ class BackgroundJob(object): "state": JobStatus.state_initialized, "statusfile": str(Path(self._job_id) / BackgroundJobDefines.jobstatus_filename), "started": time.time(), + "duration": 0.0, } initial_status.update(self._kwargs) self._jobstatus.update_status(initial_status) @@ -506,6 +513,10 @@ class JobStatus(object): def get_status(self): data = store.load_data_from_file(str(self._jobstatus_path), default={}) + + data.setdefault("state", JobStatus.state_initialized) + data.setdefault("duration", 0.0) + data["loginfo"] = {} for field_id, field_path in [("JobProgressUpdate", self._progress_update_path), ("JobResult", self._result_message_path),

5 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018