Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: ab46583e2dfe2cc56cdc8591c9d46b3f9b5adf08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab46583e2dfe2c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 3 10:23:52 2018 +0200 Fix pylint warnings Change-Id: I1d4511d509e2fcbb44f2cce0ee6591bb4b65e3f0 --- checks/enviromux.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/enviromux.include b/checks/enviromux.include index 59d6fe4..e7e5a38 100644 --- a/checks/enviromux.include +++ b/checks/enviromux.include @@ -364,7 +364,7 @@ def enviromux_sems_scan_function(oid): def check_enviromux_temperature(item, params, parsed): dev_levels_lower = (parsed[item]['sensor_min'], parsed[item]['sensor_min']) dev_levels = (parsed[item]['sensor_max'], parsed[item]['sensor_max']) - return (check_temperature(parsed[item]['sensor_value'], params, item, dev_levels_lower=dev_levels_lower, dev_levels=dev_levels)) + return check_temperature(parsed[item]['sensor_value'], params, item, dev_levels_lower=dev_levels_lower, dev_levels=dev_levels) def check_enviromux_voltage(item, params, parsed): sensor_value = parsed[item]['sensor_value'] @@ -393,7 +393,7 @@ def check_enviromux_voltage(item, params, parsed): state = 0 if state: infotext += levelstext - return (state, infotext, perf) + return state, infotext, perf def check_enviromux_humidity(item, params, parsed): - return (check_humidity(parsed[item]['sensor_value'], params)) + return check_humidity(parsed[item]['sensor_value'], params)

6 years

6463 enviromux, enviromux.humidity, enviromux.voltage, enviromux_aux, enviromux_aux.humidity, enviromux_aux.voltage, enviromux_digital, enviromux_external, enviromux_external.humidity,

by Konstantin Büttner

enviromux_external.voltage, enviromux_sems, enviromux_sems.humidity, enviromux_sems.voltage, enviromux_sems_digital, enviromux_sems_external, enviromux_sems_external.humidity, enviromux_sems_external.voltage: Suite of checks for Enviromux devices Message-ID: <5b8cea1e.UUDbyl4Dnz8ByJx2%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 865c732fb428c43c223271ed61ca4e8a26d0cf37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=865c732fb428c4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 3 09:56:55 2018 +0200 6463 enviromux, enviromux.humidity, enviromux.voltage, enviromux_aux, enviromux_aux.humidity, enviromux_aux.voltage, enviromux_digital, enviromux_external, enviromux_external.humidity, enviromux_external.voltage, enviromux_sems, enviromux_sems.humidity, enviromux_sems.voltage, enviromux_sems_digital, enviromux_sems_external, enviromux_sems_external.humidity, enviromux_sems_external.voltage: Suite of checks for Enviromux devices Change-Id: I77d1ebdd7b0674e0c2b79609f7e216ed2f3f1cbc --- .werks/6463 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6463 b/.werks/6463 new file mode 100644 index 0000000..1336ebd --- /dev/null +++ b/.werks/6463 @@ -0,0 +1,10 @@ +Title: enviromux, enviromux.humidity, enviromux.voltage, enviromux_aux, enviromux_aux.humidity, enviromux_aux.voltage, enviromux_digital, enviromux_external, enviromux_external.humidity, enviromux_external.voltage, enviromux_sems, enviromux_sems.humidity, enviromux_sems.voltage, enviromux_sems_digital, enviromux_sems_external, enviromux_sems_external.humidity, enviromux_sems_external.voltage: Suite of checks for Enviromux devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1535961257 +Class: feature + +

6 years

6524 FIX BI: Fixed folding of BI aggregations of the same type

by Lars Michelsen

Module: check_mk Branch: master Commit: 767a1fc879595433fe86abbaf1f729d12a798487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=767a1fc8795954… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 31 15:01:19 2018 +0200 6524 FIX BI: Fixed folding of BI aggregations of the same type When having multiple BI aggregations configured that use the same top level rule, this resulted in strange effects when folding / unfolding the aggregations in the "Rule tree" column. In some situations the wrong tree was toggled. Change-Id: Iaa1908c3842f94d30599c9b3adcc0202fa2bd248 --- .werks/6524 | 13 +++++++++++++ cmk/gui/plugins/wato/bi.py | 13 ++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.werks/6524 b/.werks/6524 new file mode 100644 index 0000000..c30c7e4 --- /dev/null +++ b/.werks/6524 @@ -0,0 +1,13 @@ +Title: BI: Fixed folding of BI aggregations of the same type +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535720375 + +When having multiple BI aggregations configured that use the same top level rule, +this resulted in strange effects when folding / unfolding the aggregations in the +"Rule tree" column. In some situations the wrong tree was toggled. diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index dcd5a37..169940e 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -947,7 +947,7 @@ class ModeBI(WatoMode, BIManagement): return html.makeuri_contextless(addvars + [("pack", self._pack_id)]) - def render_rule_tree(self, ruleid, tree_path): + def render_rule_tree(self, ruleid, tree_path, tree_prefix=""): pack = self.pack_containing_rule(ruleid) rule = pack["rules"][ruleid] edit_url = html.makeuri_contextless([("mode", "bi_edit_rule"), ("id", ruleid), ("pack", pack["id"])]) @@ -961,10 +961,10 @@ class ModeBI(WatoMode, BIManagement): html.close_a() html.close_li() else: - html.begin_foldable_container("bi_rule_trees", tree_path, False, title, + html.begin_foldable_container("bi_rule_trees", "%s%s" % (tree_prefix, tree_path), False, title, title_url=edit_url, tree_img="tree_black") for sub_rule_id in sub_rule_ids: - self.render_rule_tree(sub_rule_id, tree_path + "/" + sub_rule_id) + self.render_rule_tree(sub_rule_id, tree_path + "/" + sub_rule_id, tree_prefix) html.end_foldable_container() # .--------------------------------------------------------------------. @@ -1346,18 +1346,17 @@ class ModeBIAggregations(ModeBI): ruleid, description = self.rule_called_by_node(aggregation["node"]) edit_url = html.makeuri([("mode", "bi_edit_rule"), ("pack", self._pack_id), ("id", ruleid)]) table.cell(_("Rule Tree"), css="bi_rule_tree") - - self.render_aggregation_rule_tree(aggregation) + self.render_aggregation_rule_tree(aggregation_id, aggregation) table.text_cell(_("Note"), description) table.end() - def render_aggregation_rule_tree(self, aggregation): + def render_aggregation_rule_tree(self, aggregation_id, aggregation): toplevel_rule = self.aggregation_toplevel_rule(aggregation) if not toplevel_rule: html.show_error(_("The top level rule does not exist.")) return - self.render_rule_tree(toplevel_rule["id"], toplevel_rule["id"]) + self.render_rule_tree(toplevel_rule["id"], toplevel_rule["id"], tree_prefix="%s_" % aggregation_id)

6 years

Add Werkzeug for supporting the GUI processing

by Lars Michelsen

Module: check_mk Branch: master Commit: ea3655d71848a8fc31d33270684fa21e16956b93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea3655d71848a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 14 21:19:47 2018 +0200 Add Werkzeug for supporting the GUI processing Specific reason for the moment: Cookie handling. The Cookie module shipped with Python is not fitting our specific needs. We'll need Werkzeug anyway. Change-Id: Ifcd19620f2bbf23468908b74803ba7b8a1e046b7 --- Pipfile | 1 + Pipfile.lock | 26 ++++++++++++++------- omd/packages/python-modules/Makefile | 3 ++- .../python-modules/src/Werkzeug-0.14.1.tar.gz | Bin 0 -> 1185546 bytes 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Pipfile b/Pipfile index 83c2c00..87ee96b 100644 --- a/Pipfile +++ b/Pipfile @@ -85,6 +85,7 @@ msrestazure = "==0.4.34" # needed by azure stuff oauthlib = "==2.1.0" # needed by azure stuff requests-oauthlib = "==1.0.0" # needed by azure stuff urllib3 = "==1.23" # needed by azure stuff +Werkzeug = "==0.14.1" # Added for the GUI [requires] diff --git a/Pipfile.lock b/Pipfile.lock index 3fb974c..50ee656 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "86a8aa7b2192a511253ed9beed162e6b0b059ede7bdeb4ff27d19a39eb14405f" + "sha256": "1dc000257ac947f3da832658bb669b0e2b028d1780bf422c0279570fa37852b6" }, "pipfile-spec": 6, "requires": { @@ -705,6 +705,14 @@ ], "index": "pypi", "version": "==1.23" + }, + "werkzeug": { + "hashes": [ + "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", + "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" + ], + "index": "pypi", + "version": "==0.14.1" } }, "develop": { @@ -717,11 +725,11 @@ }, "atomicwrites": { "hashes": [ - "sha256:6b5282987b21cd79151f51caccead7a09d0a32e89c568bd9e3c4aaa7bbdf3f3a", - "sha256:e16334d50fe0f90919ef7339c24b9b62e6abaa78cd2d226f3d94eb067eb89043" + "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", + "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" ], "markers": "python_version >= '2.7' and python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version != '3.3.*'", - "version": "==1.2.0" + "version": "==1.2.1" }, "attrs": { "hashes": [ @@ -735,7 +743,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version == '2.7'", + "markers": "python_version >= '2.6'", "version": "==1.5" }, "bandit": { @@ -820,7 +828,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1011,11 +1019,11 @@ }, "pytest": { "hashes": [ - "sha256:2e7c330338b2732ddb992217962e3454aa7290434e75329b1a6739cea41bea6b", - "sha256:4abcd98faeea3eb95bd05aa6a7b121d5f89d72e4d36ddb0dcbbfd1ec9f3651d1" + "sha256:2d7c49e931316cc7d1638a3e5f54f5d7b4e5225972b3c9838f3584788d27f349", + "sha256:ad0c7db7b5d4081631e0155f5c61b80ad76ce148551aaafe3a718d65a7508b18" ], "index": "pypi", - "version": "==3.7.3" + "version": "==3.7.4" }, "pytest-cov": { "hashes": [ diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 56b8aa9..5097724 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -146,7 +146,8 @@ MODULES += msrestazure-0.4.34.tar.gz MODULES += oauthlib-2.1.0.tar.gz MODULES += requests-oauthlib-1.0.0.tar.gz MODULES += urllib3-1.23.tar.gz - +# Added for the GUI +MODULES += Werkzeug-0.14.1.tar.gz .PHONY: build check-freetds install skel clean diff --git a/omd/packages/python-modules/src/Werkzeug-0.14.1.tar.gz b/omd/packages/python-modules/src/Werkzeug-0.14.1.tar.gz new file mode 100644 index 0000000..27e7b2d Binary files /dev/null and b/omd/packages/python-modules/src/Werkzeug-0.14.1.tar.gz differ

6 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: f3df54c1a1997f71d8a8edc5ba6cd4c9d326bcea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3df54c1a1997f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 3 09:29:05 2018 +0200 Reserved 20 Werk IDS Change-Id: I4c5a4757b201229e11fe6afec7d45e89b8875776 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7491812..5af27a5 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6529 +6549

6 years

Cleaned up tests a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 2788d43e08e26faf42a84ef40616681932d98069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2788d43e08e26f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 14 21:06:10 2018 +0200 Cleaned up tests a bit Change-Id: I75d5f333fa0864ce0d7b9c20f2d3ed6193fbb6c6 --- tests/unit/web/test_http.py | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/tests/unit/web/test_http.py b/tests/unit/web/test_http.py index 9d64185..823a0e0 100644 --- a/tests/unit/web/test_http.py +++ b/tests/unit/web/test_http.py @@ -1,31 +1,11 @@ #!/usr/bin/env python +# encoding: utf-8 + +import time import cmk.gui.http as http from cmk.gui.globals import html -# TODO: Write valid test -def test_request_processing(register_builtin_html): - varname = "Variable" - value = "value" - prefix = "prefix" - used_ids = ["1", "2"] - deflt = "deflt" - default = "default" - - html.var(varname, deflt = None) - html.has_var(varname) - html.has_var_prefix(prefix) - html.var_utf8(varname, deflt = None) - html.all_vars() - html.all_varnames_with_prefix(prefix) - html.list_var(varname) - html.add_var(varname, value) - html.set_var(varname, value) - - html.stash_vars() - html.unstash_vars() - html.uploaded_file(varname, default = None) - def test_cookie_handling(register_builtin_html, monkeypatch): monkeypatch.setattr(html.request, "cookies", {"cookie1": {"key": "1a"}}) @@ -66,7 +46,6 @@ def test_response_set_cookie_secure(register_builtin_html, monkeypatch): def test_response_set_cookie_expires(register_builtin_html, monkeypatch): - import time monkeypatch.setattr(time, "time", lambda: 0) html.response.set_cookie("auth_SITE", "user:123456:abcdefg", expires=60) @@ -76,7 +55,6 @@ def test_response_set_cookie_expires(register_builtin_html, monkeypatch): def test_response_del_cookie(register_builtin_html, monkeypatch): - import time monkeypatch.setattr(time, "time", lambda: 0) html.response.del_cookie("auth_SITE")

6 years

Fixed handling of cookies containing non-ascii characters

by Lars Michelsen

Module: check_mk Branch: master Commit: 03014daecb0a0bce9e307105605843bcef6b6c2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03014daecb0a0b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 14 21:06:38 2018 +0200 Fixed handling of cookies containing non-ascii characters This issue was introduced during WSGI migration in 1.6 only. Add test to verify that <1.5 non-ascii cookie format can be handled Change-Id: I1216a3995a8556c7484a9bc84a475257e4f22fb6 --- cmk/gui/http.py | 40 ++++++++++++++++++++-------------------- tests/unit/web/test_http.py | 33 +++++++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/cmk/gui/http.py b/cmk/gui/http.py index c206423..025bc3c 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -28,7 +28,7 @@ import re import time -import Cookie +import werkzeug.http import cgi import cmk.gui.log as log @@ -55,10 +55,13 @@ class Request(object): self.vars = {} self.listvars = {} # for variables with more than one occurrence self.uploads = {} - self.cookies = Cookie.BaseCookie() + # TODO: To be compatible with Check_MK <1.5 handling / code base we + # prevent parse_cookie() from decoding the stuff to unicode. One bright + # day we'll switch all input stuff to be parsed to unicode, then we'll + # clean this up! + self.cookies = werkzeug.http.parse_cookie(wsgi_environ, charset=None) self._init_vars(wsgi_environ) - self.cookies.load(wsgi_environ.get("HTTP_COOKIE", {})) def _init_vars(self, wsgi_environ): @@ -184,7 +187,7 @@ class Request(object): def cookie(self, varname, deflt=None): """Return either the value of the cookie provided by the client, the given deflt value or None""" try: - return self.cookies[varname].value + return self.cookies[varname] except: return deflt @@ -322,25 +325,22 @@ class Response(object): def set_cookie(self, varname, value, expires=None): """Send the given cookie to the client with the response""" - c = Cookie.BaseCookie() - c[varname] = value.encode("utf-8") if type(value) == unicode else "%s" % value - - # Use cookie for all URLs of the host (to make cross site use possible) - c[varname]["path"] = "/" - - # Tell client not to use the cookie within javascript - c[varname]["httponly"] = True - - # Tell client to only use the cookie for SSL connections - if self._request.is_ssl_request: - c[varname]["secure"] = True - if expires is not None: assert type(expires) == int - c[varname]["expires"] = expires - self.set_http_header("Set-Cookie", c.output(header="").lstrip(), - prevent_duplicate=False) + cookie_header = werkzeug.http.dump_cookie( + varname, + value, + # Use cookie for all URLs of the host (to make cross site use possible) + path="/", + # Tell client not to use the cookie within javascript + httponly=True, + # Tell client to only use the cookie for SSL connections + secure=self._request.is_ssl_request, + expires=expires, + ) + + self.set_http_header("Set-Cookie", cookie_header, prevent_duplicate=False) def del_cookie(self, varname): diff --git a/tests/unit/web/test_http.py b/tests/unit/web/test_http.py index 823a0e0..196175d 100644 --- a/tests/unit/web/test_http.py +++ b/tests/unit/web/test_http.py @@ -32,7 +32,7 @@ def test_response_set_cookie(register_builtin_html): html.response.set_cookie("auth_SITE", "user:123456:abcdefg") assert html.response.headers[-1] == \ - ("Set-Cookie", "auth_SITE=user:123456:abcdefg; httponly; Path=/") + ("Set-Cookie", "auth_SITE=user:123456:abcdefg; HttpOnly; Path=/") def test_response_set_cookie_secure(register_builtin_html, monkeypatch): @@ -42,7 +42,7 @@ def test_response_set_cookie_secure(register_builtin_html, monkeypatch): html.response.set_cookie("auth_SITE", "user:123456:abcdefg") assert html.response.headers[-1] == \ - ("Set-Cookie", "auth_SITE=user:123456:abcdefg; httponly; Path=/; secure") + ("Set-Cookie", "auth_SITE=user:123456:abcdefg; Secure; HttpOnly; Path=/") def test_response_set_cookie_expires(register_builtin_html, monkeypatch): @@ -51,7 +51,7 @@ def test_response_set_cookie_expires(register_builtin_html, monkeypatch): html.response.set_cookie("auth_SITE", "user:123456:abcdefg", expires=60) assert html.response.headers[-1] == \ - ("Set-Cookie", "auth_SITE=user:123456:abcdefg; expires=Thu, 01 Jan 1970 00:01:00 GMT; httponly; Path=/") + ("Set-Cookie", "auth_SITE=user:123456:abcdefg; Expires=Thu, 01-Jan-1970 00:01:00 GMT; HttpOnly; Path=/") def test_response_del_cookie(register_builtin_html, monkeypatch): @@ -60,4 +60,29 @@ def test_response_del_cookie(register_builtin_html, monkeypatch): html.response.del_cookie("auth_SITE") assert html.response.headers[-1] == \ - ("Set-Cookie", "auth_SITE=; expires=Wed, 31 Dec 1969 23:59:00 GMT; httponly; Path=/") + ("Set-Cookie", "auth_SITE=; Expires=Wed, 31-Dec-1969 23:59:00 GMT; HttpOnly; Path=/") + + +# User IDs in Check_MK may contain non ascii characters. When they need to be encoded, +# they are encoded in UTF-8. Since this is possible the user names in the cookies directly +# contain those UTF-8 encoded user names. +# Until we decide that distributed setups between the current version and the previous +# versions are not possible anymore we need to be able to deal with the old cookie format. +# +# We dropped the old format during 1.6 development. It would be a good time to drop the +# compatibility with the old format earliest with 1.7. +def test_pre_16_format_cookie_handling(monkeypatch): + wsgi_environ = { + # This is no complete WSGI environment. But we currently don't need more. + "wsgi.input" : "", + "SCRIPT_NAME" : "", + "HTTP_COOKIE" : "xyz=123; auth_stable=lärs:1534272374.61:1f59cac3fcd5bcc389e4f8397bed315b; abc=123" + } + + request = http.Request(wsgi_environ) + + assert isinstance(request.cookie("auth_stable"), bytes) + assert request.cookie("auth_stable") == "lärs:1534272374.61:1f59cac3fcd5bcc389e4f8397bed315b" + + assert request.has_cookie("xyz") + assert request.has_cookie("abc")

6 years

Removed unused parameter/field. Improved const-correctness and naming.

by Sven Panne

Module: check_mk Branch: master Commit: e82940c9a459d60832a1e7d1526d14995a5e7049 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e82940c9a459d6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 15:48:41 2018 +0200 Removed unused parameter/field. Improved const-correctness and naming. Change-Id: I783e2b47b45304ba047df8ebf1f46f4fc5e17470 --- livestatus/src/Logfile.cc | 14 +++++--------- livestatus/src/Logfile.h | 3 +-- livestatus/src/TableStateHistory.cc | 15 +++++---------- livestatus/src/TableStateHistory.h | 7 +++---- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index faea8a2..f66efb1 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -208,8 +208,7 @@ bool Logfile::processLogLine(size_t lineno, std::string line, return true; } -logfile_entries_t *Logfile::getEntriesFromQuery(const Query * /*unused*/, - unsigned logclasses) { +const logfile_entries_t *Logfile::getEntriesFor(unsigned logclasses) { // Make sure existing references to objects point to correct world updateReferences(); // make sure all messages are present @@ -219,13 +218,10 @@ logfile_entries_t *Logfile::getEntriesFromQuery(const Query * /*unused*/, bool Logfile::answerQueryReverse(Query *query, time_t since, time_t until, unsigned logclasses) { - // Make sure existing references to objects point to correct world - updateReferences(); - // make sure all messages are present - load(logclasses); - uint64_t untilkey = makeKey(until, 999999999); - auto it = _entries.upper_bound(untilkey); - while (it != _entries.begin()) { + auto entries = getEntriesFor(logclasses); + // TODO(sp) Move the stuff below out of this class. Tricky part: makeKey + auto it = entries->upper_bound(makeKey(until, 999999999)); + while (it != entries->begin()) { --it; // end found or limit exceeded? if (it->second->_time < since || diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index e188a37..4a97391 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -60,8 +60,7 @@ public: long freeMessages(unsigned logclasses); // for TableStateHistory - logfile_entries_t *getEntriesFromQuery(const Query *query, - unsigned logclasses); + const logfile_entries_t *getEntriesFor(unsigned logclasses); // for TableLog::answerQuery bool answerQueryReverse(Query *query, time_t since, time_t until, diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 8ead016..a3e2157 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -212,8 +212,7 @@ void TableStateHistory::getPreviousLogentry() { return; } --_it_logs; - _entries = - _it_logs->second->getEntriesFromQuery(_query, classmask_statehist); + _entries = _it_logs->second->getEntriesFor(classmask_statehist); _it_entries = _entries->end(); } --_it_entries; @@ -230,8 +229,7 @@ LogEntry *TableStateHistory::getNextLogentry() { return nullptr; } ++_it_logs; - _entries = - _it_logs->second->getEntriesFromQuery(_query, classmask_statehist); + _entries = _it_logs->second->getEntriesFor(classmask_statehist); _it_entries = _entries->begin(); } return _it_entries->second.get(); @@ -291,20 +289,18 @@ void TableStateHistory::answerQuery(Query *query) { // Store hosts/services that we have filtered out here std::set<HostServiceKey> object_blacklist; - _query = query; - // Optimize time interval for the query. In log querys there should always // be a time range in form of one or two filter expressions over time. We // use that to limit the number of logfiles we need to scan and to find the // optimal entry point into the logfile - if (auto glb = _query->greatestLowerBoundFor("time")) { + if (auto glb = query->greatestLowerBoundFor("time")) { _since = *glb; } else { query->invalidRequest( "Start of timeframe required. e.g. Filter: time > 1234567890"); return; } - _until = _query->leastUpperBoundFor("time").value_or(time(nullptr)) + 1; + _until = query->leastUpperBoundFor("time").value_or(time(nullptr)) + 1; _query_timeframe = _until - _since - 1; if (_query_timeframe == 0) { @@ -330,8 +326,7 @@ void TableStateHistory::answerQuery(Query *query) { } // Determine initial logentry - _entries = - _it_logs->second->getEntriesFromQuery(query, classmask_statehist); + _entries = _it_logs->second->getEntriesFor(classmask_statehist); if (!_entries->empty() && _it_logs != newest_log) { _it_entries = _entries->end(); // Check last entry. If it's younger than _since -> use this logfile too diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index ad6fbbb..f7fe797 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -64,7 +64,6 @@ private: LogCache *_log_cache; int _query_timeframe; - const Query *_query; int _since; int _until; @@ -72,9 +71,9 @@ private: std::map<std::string, int> _notification_periods; // Helper functions to traverse through logfiles - logfiles_t::iterator _it_logs; - logfile_entries_t *_entries; - logfile_entries_t::iterator _it_entries; + logfiles_t::const_iterator _it_logs; + const logfile_entries_t *_entries; + logfile_entries_t::const_iterator _it_entries; void getPreviousLogentry(); LogEntry *getNextLogentry();

6 years

Simplify LogCache interface.

by Sven Panne

Module: check_mk Branch: master Commit: 14f8aabc2b07b534a50a41cf1e2c1e42e7cfe231 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14f8aabc2b07b5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 17:03:11 2018 +0200 Simplify LogCache interface. Change-Id: I2591aaade1f4983e20323dff8eef6de4d5ea8455 --- livestatus/src/LogCache.cc | 13 +++++-------- livestatus/src/LogCache.h | 3 +-- livestatus/src/TableLog.cc | 3 ++- livestatus/src/TableStateHistory.cc | 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 14afde4..a3c9681 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -43,7 +43,7 @@ LogCache::LogCache(MonitoringCore *mc, unsigned long max_cached_messages) : _mc(mc) , _max_cached_messages(max_cached_messages) , _num_at_last_check(0) { - updateLogfileIndex(); + update(); } #ifdef CMC @@ -57,15 +57,12 @@ void LogCache::setMaxCachedMessages(unsigned long m) { } #endif -bool LogCache::update() { - if (_logfiles.empty() || - _mc->last_logfile_rotation() > _last_index_update) { - updateLogfileIndex(); +void LogCache::update() { + if (!_logfiles.empty() && + _mc->last_logfile_rotation() <= _last_index_update) { + return; } - return !_logfiles.empty(); -} -void LogCache::updateLogfileIndex() { Informational(logger()) << "updating log file index"; _logfiles.clear(); diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 0eea98c..de3d265 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -46,7 +46,7 @@ public: void setMaxCachedMessages(unsigned long m); #endif void logLineHasBeenAdded(Logfile *logfile, unsigned logclasses); - bool update(); // returns true if at least one log file has been found + void update(); auto begin() { return _logfiles.begin(); } auto end() { return _logfiles.end(); } @@ -57,7 +57,6 @@ private: logfiles_t _logfiles; std::chrono::system_clock::time_point _last_index_update; - void updateLogfileIndex(); void addToIndex(std::unique_ptr<Logfile> logfile); Logger *logger() const; }; diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index b7097cf..abdf069 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -126,7 +126,8 @@ std::string TableLog::namePrefix() const { return "log_"; } void TableLog::answerQuery(Query *query) { std::lock_guard<std::mutex> lg(_log_cache->_lock); - if (!_log_cache->update()) { + _log_cache->update(); + if (_log_cache->begin() == _log_cache->end()) { return; } diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index a3e2157..7086369 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -276,7 +276,8 @@ std::unique_ptr<Filter> TableStateHistory::createPartialFilter( void TableStateHistory::answerQuery(Query *query) { auto object_filter = createPartialFilter(*query); std::lock_guard<std::mutex> lg(_log_cache->_lock); - if (!_log_cache->update()) { + _log_cache->update(); + if (_log_cache->begin() == _log_cache->end()) { return; }

6 years

Unified logging messages. Made bindings more local. Improved const-correctness.

by Sven Panne

Module: check_mk Branch: master Commit: a6411686746fa7711ee887ab8248309f3f70aea3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6411686746fa7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 31 11:32:26 2018 +0200 Unified logging messages. Made bindings more local. Improved const-correctness. Change-Id: Ie7762b675b02ef334177158a031e0263a5930497 --- livestatus/src/Logfile.cc | 59 +++++++++++++++++++++++++---------------------- livestatus/src/Logfile.h | 12 +++++----- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index f24d108..5cce1cc 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -44,40 +44,45 @@ #include <vector> #endif -Logfile::Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, - bool watch) - : _mc(mc) - , _logcache(logcache) - , _path(std::move(path)) - , _since(0) - , _watch(watch) - , _read_pos{} - , _lineno(0) -#ifdef CMC - , _world(nullptr) -#endif - , _logclasses_read(0) { - std::ifstream is(_path, std::ios::binary); +namespace { +time_t firstTimestampOf(const fs::path &path, Logger *logger) { + std::ifstream is(path, std::ios::binary); if (!is) { - generic_error ge("cannot open logfile " + _path.string()); - Informational(logger()) << ge; - return; + generic_error ge("cannot open logfile " + path.string()); + Informational(logger) << ge; + return 0; } char line[12]; is.read(line, sizeof(line)); if (!is) { - return; // ignoring. might be empty + return 0; // ignoring. might be empty } if (line[0] != '[' || line[11] != ']') { - Informational(logger()) << "ignoring logfile '" << _path - << "': does not begin with '[123456789] '"; - return; + Informational(logger) << "ignoring logfile '" << path + << "': does not begin with '[123456789] '"; + return 0; } line[11] = 0; - _since = atoi(line + 1); + return atoi(line + 1); +} +} // namespace + +Logfile::Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, + bool watch) + : _mc(mc) + , _logcache(logcache) + , _path(std::move(path)) + , _since(firstTimestampOf(_path, logger())) + , _watch(watch) + , _read_pos{} + , _lineno(0) +#ifdef CMC + , _world(nullptr) +#endif + , _logclasses_read(0) { } void Logfile::flush() { @@ -87,15 +92,15 @@ void Logfile::flush() { void Logfile::load(unsigned logclasses) { unsigned missing_types = logclasses & ~_logclasses_read; - FILE *file = nullptr; // The current logfile has the _watch flag set to true. // In that case, if the logfile has grown, we need to // load the rest of the file, even if no logclasses // are missing. if (_watch) { - file = fopen(_path.c_str(), "r"); + FILE *file = fopen(_path.c_str(), "r"); if (file == nullptr) { - Informational(logger()) << "cannot open logfile '" << _path << "'"; + generic_error ge("cannot open logfile " + _path.string()); + Informational(logger()) << ge; return; } // If we read this file for the first time, we initialize @@ -124,7 +129,7 @@ void Logfile::load(unsigned logclasses) { return; } - file = fopen(_path.c_str(), "r"); + FILE *file = fopen(_path.c_str(), "r"); if (file == nullptr) { generic_error ge("cannot open logfile " + _path.string()); Informational(logger()) << ge; @@ -133,8 +138,8 @@ void Logfile::load(unsigned logclasses) { _lineno = 0; loadRange(file, missing_types, logclasses); - fclose(file); _logclasses_read |= missing_types; + fclose(file); } } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 062f04d..97f6649 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -74,13 +74,13 @@ public: unsigned logclasses); private: - MonitoringCore *_mc; + MonitoringCore *const _mc; LogCache *const _logcache; - fs::path _path; - time_t _since; // time of first entry - bool _watch; // true only for current logfile - fpos_t _read_pos; // read until this position - size_t _lineno; // read until this line + const fs::path _path; + const time_t _since; // time of first entry + const bool _watch; // true only for current logfile + fpos_t _read_pos; // read until this position + size_t _lineno; // read until this line logfile_entries_t _entries; #ifdef CMC World *_world; // CMC: world our references point into

6 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018