Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

Fixed exception in WATO web API introduced by changes some weeks ago

by Lars Michelsen

Module: check_mk Branch: master Commit: d1d8fe42a5f0027fcb5d6d974299c50490e6686e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1d8fe42a5f002… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 08:53:02 2016 +0200 Fixed exception in WATO web API introduced by changes some weeks ago --- web/htdocs/htmllib.py | 7 +++++-- web/htdocs/webapi.py | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7a5a746..5226135 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -377,11 +377,14 @@ class html(GUITester): # The concept is that the user can either provide the data in a single "request" variable, # which contains the request data encoded as JSON, or provide multiple GET/POST vars which # are then used as top level entries in the request object. - def get_request(self): + def get_request(self, exclude_vars=None): + if exclude_vars == None: + exclude_vars = [] + request = json.loads(self.var("request", "{}")) for key, val in self.all_vars().items(): - if key not in [ "request", "output_format" ]: + if key not in [ "request", "output_format" ] + exclude_vars: request[key] = val return request diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 34b18e2..a14cdc8 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -83,11 +83,11 @@ def page_api(): # Most of the time the request is given as json # However, the plugin may have an own mechanism to interpret the request request_object = {} - if html.var("request"): - if api_actions[action].get("dont_eval_request"): + if api_actions[action].get("dont_eval_request"): + if html.var("request"): request_object = html.var("request") - else: - request_object = html.get_request() + else: + request_object = html.get_request(exclude_vars=["action"]) if api_actions[action].get("locking", True): lock_exclusive() # unlock is done automatically

8 years, 2 months

Fixed python version test after recent update

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fcb334a2bfdc5614510f5f9ccb20989edf3e161 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fcb334a2bfdc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 28 17:08:34 2016 +0200 Fixed python version test after recent update --- tests/omd/test_python.py | 2 +- tests/testlib/__init__.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/omd/test_python.py b/tests/omd/test_python.py index 31fea8b..bcd06bb 100644 --- a/tests/omd/test_python.py +++ b/tests/omd/test_python.py @@ -22,7 +22,7 @@ def test_03_python_interpreter_version(site): p = site.execute(["python", "-V"], stderr=subprocess.PIPE) version = p.stderr.read() - assert version.startswith("Python 2.7.11") + assert version.startswith("Python 2.7.12") def test_03_python_path(site): diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 8e50b56..3d9c599 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -47,6 +47,9 @@ class CMKVersion(object): def __init__(self, version, edition): self.set_version(version) + + if len(edition) != 3: + raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition self._credentials = ("d-vonheute", "lOBFsgAH") @@ -68,6 +71,8 @@ class CMKVersion(object): self.version = self.get_default_version() else: + if ".cee" in version or ".cre" in version: + raise Exception("Invalid version. Remove the edition suffix!") self.version = version

8 years, 2 months

3726 FIX Web API: Fixed default output format - using JSON as intended

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fc2638cd56a6b0121c043f0999174f74ab18f8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc2638cd56a6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 08:17:01 2016 +0200 3726 FIX Web API: Fixed default output format - using JSON as intended The WATO Web API was using Python as default output format since version 1.2.8b8 and commit 36142e6d, which was not intended. The Web API is able to output JSON and Python formated data, which can be toggled using the variable <tt>output_format=json</tt> or <tt>output_format=python</tt>. The default has now been changed back to be JSON. In case you created scripts against this API since 1.2.8b8, did not use a JSON parser to load the data and used something like <tt>eval()</tt> in Python instead, you will have to change your scripts. You can either add the variable <tt>output_format=python</tt> or replace your <tt>eval()</tt> with <tt>json.loads()</tt> in Python. --- .werks/3726 | 22 ++++++++++++++++++++++ ChangeLog | 1 + web/htdocs/webapi.py | 6 +++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/3726 b/.werks/3726 new file mode 100644 index 0000000..05e7684 --- /dev/null +++ b/.werks/3726 @@ -0,0 +1,22 @@ +Title: Web API: Fixed default output format - using JSON as intended +Level: 2 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469772716 + +The WATO Web API was using Python as default output format since version +1.2.8b8 and commit 36142e6d, which was not intended. + +The Web API is able to output JSON and Python formated data, which can be +toggled using the variable <tt>output_format=json</tt> or +<tt>output_format=python</tt>. The default has now been changed back to +be JSON. + +In case you created scripts against this API since 1.2.8b8, did not use +a JSON parser to load the data and used something like <tt>eval()</tt> +in Python instead, you will have to change your scripts. You can either +add the variable <tt>output_format=python</tt> or replace your <tt>eval()</tt> +with <tt>json.loads()</tt> in Python. diff --git a/ChangeLog b/ChangeLog index 2e7777b..5873df9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -509,6 +509,7 @@ * 3557 FIX: Web API: get_host/get_all_hosts action now also returns the nodes of cluster host * 3718 FIX: Changes not needing a core restart are not showing up pending changes anymore... * 3719 FIX: Fixed possible wrong encoding of audit log messages when editing global settings + * 3726 FIX: Web API: Fixed default output format - using JSON as intended... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 5440e90..02dd0a3 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -59,13 +59,17 @@ def load_plugins(force): 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" ]: + html.set_output_format("json") + raise MKUserError(None, "Only \"json\" and \"python\" are supported as output formats") if not config.user.get("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") config.need_permission("wato.use") config.need_permission("wato.api_allowed") - action = html.var('action') if action not in api_actions: raise MKUserError(None, "Unknown API action %s" % html.attrencode(action))

8 years, 2 months

WATO webapi: now really fixed format

by Lars Michelsen

Module: check_mk Branch: master Commit: b675387019da7632e69edad542c866b49163487a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b675387019da76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 29 08:22:40 2016 +0200 WATO webapi: now really fixed format --- web/htdocs/webapi.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 02dd0a3..34b18e2 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -62,8 +62,10 @@ def page_api(): # 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" ]: - html.set_output_format("json") raise MKUserError(None, "Only \"json\" and \"python\" are supported as output formats") + else: + html.set_output_format(output_format) + if not config.user.get("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") @@ -104,5 +106,4 @@ def page_api(): if html.output_format == "json": html.write(json.dumps(response)) else: - html.set_output_format("python") html.write(repr(response))

8 years, 2 months

tests: edition can now also be set via environment

by Lars Michelsen

Module: check_mk Branch: master Commit: 388b139a5c460e93da898e64c3f8e2fc82a4e496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=388b139a5c460e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 28 17:05:48 2016 +0200 tests: edition can now also be set via environment --- tests/testlib/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d3215ea..8e50b56 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -202,10 +202,13 @@ def site(request): return site_id def site_version(): - version = os.environ.get("VERSION", CMKVersion.DEFAULT) - return version + return os.environ.get("VERSION", CMKVersion.DEFAULT) - site = Site(site_id=site_id(), version=site_version()) + def site_edition(): + return os.environ.get("EDITION", CMKVersion.CEE) + + site = Site(site_id=site_id(), version=site_version(), + edition=site_edition()) site.cleanup_if_wrong_version() site.create() site.start()

8 years, 2 months

check_http: support for password safe also for proxy_auth

by Mathias Kettner

Module: check_mk Branch: master Commit: 35cf92912a788bb2a8210e32a2fd9c75a3eabb57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35cf92912a788b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 28 16:06:51 2016 +0200 check_http: support for password safe also for proxy_auth --- checks/check_http | 4 ++-- web/plugins/wato/active_checks.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/checks/check_http b/checks/check_http index 95ff8a6..6e7bfec 100644 --- a/checks/check_http +++ b/checks/check_http @@ -97,8 +97,8 @@ def check_http_arguments(params): args += [ "-a", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "proxy_auth" in settings: - auth = settings["proxy_auth"] - args += [ '-b', ":".join(auth) ] + username, password = settings["auth"] + args += [ "-b", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "onredirect" in settings: args += [ '--onredirect=%s' % settings["onredirect"] ] diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9a2e57c..edb4755 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -904,10 +904,8 @@ register_rule(group, size = 12, allow_empty = False ), - Password( + IndividualOrStoredPassword( title = _("Password"), - size = 12, - allow_empty = False ), ] )

8 years, 2 months

Added missing help text about macros to datasource programs

by Lars Michelsen

Module: check_mk Branch: master Commit: edd676c6d820beab7189f81f8c9f6806e7f1755a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edd676c6d820be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 28 16:05:40 2016 +0200 Added missing help text about macros to datasource programs --- web/htdocs/wato.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b44880d..d3c2b44 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2472,8 +2472,7 @@ def mode_diag_host(phase): "program that should be called by Check_MK instead of connecting the agent " "via TCP. That program must output the agent's data on standard output in " "the same format the agent would do. This is for example useful for monitoring " - "via SSH. The command line may contain the placeholders <tt><IP></tt> and " - "<tt><HOST></tt>.") + "via SSH.") + monitoring_macro_help(), )) ] )

8 years, 2 months

3645 FIX Fixed filesystem growth/ shrinkage graph by splitting it up into 2 graphs.

by Sven Panne

Module: check_mk Branch: master Commit: 3751d9429fa0a508fac28ddaf1c7049bda4f2cab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3751d9429fa0a5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 28 15:41:32 2016 +0200 3645 FIX Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. --- .werks/3645 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/3645 b/.werks/3645 new file mode 100644 index 0000000..28cea15 --- /dev/null +++ b/.werks/3645 @@ -0,0 +1,10 @@ +Title: Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469713221 + + diff --git a/ChangeLog b/ChangeLog index 8609e1e..2e7777b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -409,6 +409,7 @@ * 3622 FIX: Fix labelling of V-Achsis on graphs with very large numbers... * 3722 FIX: Mobile GUI: Prevent it from being opened with regular sidebar * 3723 FIX: Mobile GUI: Don't mix classic and mobile GUI when choosing classic on mobile device + * 3645 FIX: Fixed filesystem growth/shrinkage graph by splitting it up into 2 graphs. WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 357c7a7..887740f 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5851,9 +5851,16 @@ graph_info.append({ }) graph_info.append({ - "title" : _("Growing / Shrinking"), + "title" : _("Growing"), "metrics" : [ ( "fs_growth.max,0,MAX", "area", _("Growth"), ), + ], +}) + +graph_info.append({ + "title" : _("Shrinking"), + "consolidation_function": "min", + "metrics" : [ ( "fs_growth.min,0,MIN,-1,*#299dcf", "-area", _("Shrinkage") ), ], })

8 years, 2 months

3725 mssql_instance: Changed MSSQL monitoring to report connection issues with only one service

by Lars Michelsen

Module: check_mk Branch: master Commit: ab0e3884a39cd98ae588c12587c80f09b8ac844b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab0e3884a39cd9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 28 14:54:07 2016 +0200 3725 mssql_instance: Changed MSSQL monitoring to report connection issues with only one service The MSSQL monitoring has been reworked to have one single service per database instance that reports connection issues like a stopped database. This is done by the <tt>mssql_instance</tt> check. All other MSSQL checks have been reworked to become <i>stale</i> in case there is a connection issue and no data is present. As a result you will only receive one notification and see only the relevant issue in the GUI in case an instance goes down. To make this work you will have to update the <tt>mssql.vbs</tt> agent plugin on all your database servers. --- .werks/3725 | 20 +++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 92 ++++++++++++++++++++++++++++++-------- checkman/mssql_instance | 24 ++++++++++ checks/mssql.include | 9 +++- checks/mssql_backup | 7 +++ checks/mssql_blocked_sessions | 22 ++++----- checks/mssql_counters | 30 +++++++++++-- checks/mssql_instance | 91 +++++++++++++++++++++++++++++++++++++ checks/mssql_tablespaces | 4 +- checks/mssql_versions | 10 +++++ 11 files changed, 276 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ab0e3884a3…

8 years, 2 months

Nuked incomplete_checks.

by Sven Panne

Module: check_mk Branch: master Commit: 734e675c85f84cc12d1d43b412eb329aa404e1fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=734e675c85f84c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 28 14:08:07 2016 +0200 Nuked incomplete_checks. Working versions of the checks and plugins seem to live elsewhere now, so the duplication and inconsistencies were highly confusing. --- .../incomplete_checks/db2/db2_bp_hitratios | 67 ------ doc/treasures/incomplete_checks/db2/db2_counters | 97 --------- doc/treasures/incomplete_checks/db2/db2_logsizes | 101 --------- doc/treasures/incomplete_checks/db2/db2_sessions | 69 ------ .../incomplete_checks/db2/db2_tablespaces | 226 -------------------- doc/treasures/incomplete_checks/db2/db2_versions | 50 ----- doc/treasures/incomplete_checks/db2/mk_db2 | 60 ------ 7 files changed, 670 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=734e675c85…

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016