Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Fixed legacy and dynamic inventory painter registration

by Lars Michelsen

Module: check_mk Branch: master Commit: ab22be4e0636c2f2792f67d83d06dbd8e2731420 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab22be4e0636c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 22 16:49:30 2019 +0100 Fixed legacy and dynamic inventory painter registration Change-Id: I3834ff6b6dacd5a379729ae638321f5c7fd1a0ce --- cmk/gui/plugins/views/inventory.py | 2 +- cmk/gui/plugins/views/utils.py | 2 +- tests/unit/cmk/gui/test_views.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index ea876f4..60377d8 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -171,7 +171,7 @@ def declare_inv_column(invpath, datatype, title, short=None): "columns": ["host_inventory", "host_structured_status"], "options": ["show_internal_tree_paths"], "load_inv": True, - "paint": lambda self, row: paint_host_inventory_tree(row, invpath), + "paint": lambda row: paint_host_inventory_tree(row, invpath), "sorter": name, } if short: diff --git a/cmk/gui/plugins/views/utils.py b/cmk/gui/plugins/views/utils.py index fecf6e6..a4bef1c 100644 --- a/cmk/gui/plugins/views/utils.py +++ b/cmk/gui/plugins/views/utils.py @@ -770,7 +770,7 @@ def register_painter(ident, spec): "ident": property(lambda s: s._ident), "title": property(lambda s: s._spec["title"]), "columns": property(lambda s: s._spec["columns"]), - "render": spec["paint"], + "render": lambda self, row, cell: spec["paint"](row), "short_title": property(lambda s: s._spec.get("short", s.title)), "group_by": property(lambda s: s._spec.get("groupby")), "parameters": property(lambda s: s._spec.get("params")), diff --git a/tests/unit/cmk/gui/test_views.py b/tests/unit/cmk/gui/test_views.py index 199e9c0..64bf126 100644 --- a/tests/unit/cmk/gui/test_views.py +++ b/tests/unit/cmk/gui/test_views.py @@ -4031,8 +4031,8 @@ def test_legacy_register_painter(monkeypatch): monkeypatch.setattr(cmk.gui.plugins.views.utils, "painter_registry", cmk.gui.plugins.views.utils.PainterRegistry()) - def rendr(): - pass + def rendr(row): + return "xyz" cmk.gui.plugins.views.utils.register_painter( "abc", { @@ -4054,4 +4054,4 @@ def test_legacy_register_painter(monkeypatch): assert painter.sorter == "aaaa" assert painter.painter_options == ["opt1"] assert painter.printable is False - assert painter.render.__name__ == rendr.__name__ + assert painter.render(row={}, cell=None) == "xyz"

5 years, 8 months

Refactored data sources to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b3723c428d828a38a7c949af986d9fd83d461dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b3723c428d828… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 19 20:10:09 2019 +0100 Refactored data sources to plugin registry Change-Id: I6b3b322168aa5b546230a8486eff8f3b012583c4 --- cmk/gui/dashboard.py | 6 +- cmk/gui/plugins/sidebar/host_matrix.py | 7 +- cmk/gui/plugins/sidebar/tactical_overview.py | 18 +- cmk/gui/plugins/views/__init__.py | 3 +- cmk/gui/plugins/views/availability.py | 4 +- cmk/gui/plugins/views/bi.py | 147 ++++-- cmk/gui/plugins/views/datasources.py | 705 ++++++++++++++++++--------- cmk/gui/plugins/views/inventory.py | 57 ++- cmk/gui/plugins/views/mkeventd.py | 89 +++- cmk/gui/plugins/views/utils.py | 194 +++++++- cmk/gui/views.py | 132 +++-- cmk/gui/visuals.py | 7 +- tests/unit/cmk/gui/test_views.py | 348 +++++++++++++ 13 files changed, 1307 insertions(+), 410 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2b3723c428…

5 years, 8 months

Refactored view commands and command groups to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ecd5c80b177ddd00146e58b44a4f2963490d0f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ecd5c80b177dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 20:03:19 2019 +0100 Refactored view commands and command groups to plugin registry Change-Id: I57852c0875868c48fa7796f4a3100f515f9b6beb --- cmk/gui/mobile.py | 9 +- cmk/gui/plugins/views/__init__.py | 6 +- cmk/gui/plugins/views/commands.py | 1524 +++++++++++++++++++------------------ cmk/gui/plugins/views/mkeventd.py | 286 ++++--- cmk/gui/plugins/views/utils.py | 139 +++- cmk/gui/views.py | 83 +- tests/unit/cmk/gui/test_views.py | 163 ++++ 7 files changed, 1301 insertions(+), 909 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5ecd5c80b1…

5 years, 8 months

Refactored view painters to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: ad227cfc7dc5bbf2e71eff2a892d5fc580501087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad227cfc7dc5bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 19 23:09:59 2019 +0100 Refactored view painters to plugin registry Change-Id: Ifda2103ad82573da2371266422053b4d7fd75f2d --- cmk/gui/plugins/views/__init__.py | 4 +- cmk/gui/plugins/views/bi.py | 435 ++- cmk/gui/plugins/views/inventory.py | 193 +- cmk/gui/plugins/views/mkeventd.py | 916 +++-- cmk/gui/plugins/views/painters.py | 6507 +++++++++++++++++++++++---------- cmk/gui/plugins/views/perfometer.py | 116 +- cmk/gui/plugins/views/utils.py | 246 +- cmk/gui/plugins/views/wato.py | 127 +- cmk/gui/views.py | 105 +- tests/unit/cmk/gui/test_gui_config.py | 2 +- tests/unit/cmk/gui/test_views.py | 3385 +++++++++++++++++ 11 files changed, 9474 insertions(+), 2562 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ad227cfc7d…

5 years, 8 months

Moved layout rendering logic to layout plugin classes

by Lars Michelsen

Module: check_mk Branch: master Commit: a65dfdc5f495a1dda7c1a006fbe7e39707250bc5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a65dfdc5f495a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 19:32:41 2019 +0100 Moved layout rendering logic to layout plugin classes Change-Id: Id64670162e85ed0c17550073faa689efddab178b --- cmk/gui/plugins/views/layouts.py | 1129 +++++++++++++++++--------------------- 1 file changed, 518 insertions(+), 611 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a65dfdc5f4…

5 years, 8 months

Refactored view layouts to plugin registry

by Lars Michelsen

Module: check_mk Branch: master Commit: 91eef313c374bbcfa137f6daed705ca609e8f783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91eef313c374bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 16:58:44 2019 +0100 Refactored view layouts to plugin registry Change-Id: I38d1ab0090057d90a2df53a72031296acd596ba3 --- cmk/gui/mobile.py | 4 +- cmk/gui/plugins/views/__init__.py | 3 +- cmk/gui/plugins/views/layouts.py | 187 ++++++++++++++++----- cmk/gui/plugins/views/mobile.py | 86 +++++++--- cmk/gui/plugins/views/utils.py | 80 ++++++++- cmk/gui/plugins/views/webservice.py | 321 +++++++++++++++++++++++------------- cmk/gui/views.py | 72 ++++---- tests/unit/cmk/gui/test_views.py | 134 +++++++++++++++ 8 files changed, 665 insertions(+), 222 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=91eef313c3…

5 years, 8 months

6756 FIX oracle_instance: Fixed false-positive if the output shows the creation time of instance

by Marcel Arentz

Module: check_mk Branch: master Commit: 330316ce4d210605be2db01b40f372f523097277 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=330316ce4d2106… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Jan 22 12:11:12 2019 +0100 6756 FIX oracle_instance: Fixed false-positive if the output shows the creation time of instance Previously the categorized as stopped or login failed or invalid data if the output showed 12 elements per instance. The last element has been the creation time of the database, which is currently not used in the created service. This problem is solved know. Change-Id: I9a19d825d9e8b8a3f3563ab395bc5189f6491602 --- .werks/6756 | 13 +++++++++++++ checks/oracle_instance | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/.werks/6756 b/.werks/6756 new file mode 100644 index 0000000..960961b --- /dev/null +++ b/.werks/6756 @@ -0,0 +1,13 @@ +Title: oracle_instance: Fixed false-positive if the output shows the creation time of instance +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548155292 +Class: fix + +Previously the categorized as stopped or login failed or invalid data if +the output showed 12 elements per instance. The last element has been the +creation time of the database, which is currently not used in the created +service. This problem is solved know. diff --git a/checks/oracle_instance b/checks/oracle_instance index ec6065c..cc27bb8 100644 --- a/checks/oracle_instance +++ b/checks/oracle_instance @@ -113,6 +113,10 @@ def check_oracle_instance(item, params, info): sid, version, openmode, logins, archiver, up_seconds, _dbid, \ log_mode, database_role, force_logging, name = line + elif len(line) == 12: + sid, version, openmode, logins, archiver, up_seconds, _dbid, \ + log_mode, database_role, force_logging, name, _dbcreated = line + elif len(line) == 22: sid, version, openmode, logins, archiver, up_seconds, _dbid, \ log_mode, database_role, force_logging, name, _dbcreated, pluggable, \

5 years, 8 months

mk_jolokia: remove irrelevant line

by Moritz Kiemer

Module: check_mk Branch: master Commit: fa54445fdddb6f89181aad8c38e030e93f280cb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa54445fdddb6f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jan 22 14:19:54 2019 +0100 mk_jolokia: remove irrelevant line Change-Id: I6416bfca4ca65d7c1b7198d1e9486ca4496edfa9 --- agents/plugins/mk_jolokia.py | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 7b281e1..37d1554 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -367,7 +367,6 @@ def extract_item(key, itemspec): for pathkey in itemspec: if pathkey in comp_dict: right = comp_dict[pathkey] - right = right.replace(r'\/', '/') if '/' in right: right = '/' + right.split('/')[-1] item = item + (right,)

5 years, 8 months

mk_jolokia: minor changes to declutter follow-up

by Moritz Kiemer

Module: check_mk Branch: master Commit: a82486437f854fb7b7a4ea8a226af1df595f33b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a82486437f854f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jan 22 13:42:46 2019 +0100 mk_jolokia: minor changes to declutter follow-up Change-Id: I6b8eedb4e54b0a61cf04df0509fe70af51adc8ee --- agents/plugins/mk_jolokia.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 38bc5d6..301d7ae 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -375,9 +375,9 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - value = fetch_var(inst["protocol"], inst["server"], inst["port"], path, inst["suburi"], - inst["service_url"], inst["service_user"], inst["service_password"]) - item_list = make_item_list((), value, itemspec) + values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, inst["suburi"], + inst["service_url"], inst["service_user"], inst["service_password"]) + item_list = make_item_list((), values, itemspec) for subinstance, value in item_list: if not subinstance and not title: @@ -390,7 +390,7 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): if len(subinstance) > 1: item = ",".join((inst["instance"],) + subinstance[:-1]) elif inst_add is not None: - item = inst["instance"] + "," + inst_add + item = ",".join((inst["instance"], inst_add)) else: item = inst["instance"] if title: @@ -446,12 +446,12 @@ def query_instance(inst): sys.stderr.write("ERROR: %s\n" % exc) raise SkipInstance() - shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) - custom_vars = inst.get("custom_vars") - write_section('jolokia_info', generate_jolokia_info(inst)) + + shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) write_section('jolokia_metrics', generate_values(inst, shipped_vars)) - write_section('jolokia_generic', generate_values(inst, custom_vars)) + + write_section('jolokia_generic', generate_values(inst, inst.get("custom_vars"))) def prepare_http_opener(inst):

5 years, 8 months

mk_jolokia: minor simplification

by Moritz Kiemer

Module: check_mk Branch: master Commit: f3c8a4b5bb57b679cdfc50110635894fca6be078 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3c8a4b5bb57b6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jan 22 12:18:20 2019 +0100 mk_jolokia: minor simplification Change-Id: Ib6a405b63df538636c7dad46632700deb5331b7a --- agents/plugins/mk_jolokia.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index ff068d0..38bc5d6 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -356,15 +356,14 @@ def make_item_list(path, value, itemspec): def extract_item(key, itemspec): + if not itemspec: + return () + path = key.split(":", 1)[-1] components = path.split(",") + comp_dict = dict(c.split('=') for c in components if c.count('=') == 1) + item = () - comp_dict = {} - for comp in components: - parts = comp.split("=") - if len(parts) == 2: - left, right = parts - comp_dict[left] = right for pathkey in itemspec: if pathkey in comp_dict: right = comp_dict[pathkey]

5 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019