Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e238ad9c38b471bb485da9c85db7a55597c848d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e238ad9c38b47… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Feb 9 01:17:32 2019 +0100 Fixed broken inventory table rendering Change-Id: I676d5d1418202e56d3cbb8a12039755a244ed272 --- cmk/gui/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index cb2572d..33d55c8 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1532,7 +1532,7 @@ def declare_invtable_column(infoname, name, topic, title, short_title, sortfunc, # One master function that does all def declare_invtable_view(infoname, invpath, title_singular, title_plural): - def inv_table(columns, add_headers, only_sites, limit, filters): + def inv_table(self, columns, add_headers, only_sites, limit, filters): return inv_multisite_table(infoname, invpath, columns, add_headers, only_sites, limit, filters)

5 years, 7 months

Do not use outdated npm from default distro package repos

by Lars Michelsen

Module: check_mk Branch: master Commit: 56bbdccd0dda3f3585a13ab240c82e77d765797d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56bbdccd0dda3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 13:14:50 2019 +0100 Do not use outdated npm from default distro package repos Change-Id: Ia7d8aefcb53e93da7accaed827c4ec7c7fb8c751 --- web/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/Makefile b/web/Makefile index f51990b..56b0c80 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,5 +1,3 @@ setup: - sudo apt-get install \ - npm - npm install - + curl -sL https://deb.nodesource.com/setup_11.x | sudo -E bash - + sudo apt-get install -y nodejs

5 years, 7 months

Cleanup unused edition/demo specific images/icons

by Lars Michelsen

Module: check_mk Branch: master Commit: 35ebb03c2a537983e282aa8598fa7d334d248293 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35ebb03c2a5379… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 8 20:39:07 2019 +0100 Cleanup unused edition/demo specific images/icons Change-Id: I14cda66a48e3f221b2b449af16b6d23a4d764dc4 --- web/htdocs/images/favicon.ico | Bin 32988 -> 16958 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/favicon.ico b/web/htdocs/images/favicon.ico index 4070937..448c2fc 100644 Binary files a/web/htdocs/images/favicon.ico and b/web/htdocs/images/favicon.ico differ

5 years, 7 months

Add support for using sass-lint

by Lars Michelsen

Module: check_mk Branch: master Commit: 1143e053aae335d88ce05c92eb6e37fcf0ff0594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1143e053aae335… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 20:12:55 2019 +0100 Add support for using sass-lint Can be enabled like this with ALE @vim users: let g:ale_linters = { \ 'python': ['pylint', 'pyls', 'mypy'], \ 'javascript': ['eslint'], \ 'scss': ['sasslint'], \} CMK-1567 Change-Id: Ic4e8f4ba01fb7e277a966c3bf3c6272cb3749d30 --- .sass-lint.yml | 148 +++++++++++ package-lock.json | 719 +++++++++++++++++++++++++++++++++++++++++++++++++++--- package.json | 1 + web/.f12 | 8 +- webpack.config.js | 3 +- 5 files changed, 846 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1143e053aa…

5 years, 7 months

Introduce SASS processing for the modern CSS theme

by Lars Michelsen

Module: check_mk Branch: master Commit: 8da26863e93f86327f37e2ddc99f224937a030eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8da26863e93f86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 13:24:33 2019 +0100 Introduce SASS processing for the modern CSS theme * With this commit we are able to build our CSS files from SASS definitions. * The facelift aka modern theme.css is now built from the SASS files below web/htdocs/themes/facelift/theme.scss. * The whole build process is integrated in our webpack definition. The process includes automatic prefixing using autoprefixer and CSS cleaning using clean-css. CMK-1567 Change-Id: I3a9da2204a74a5799d10094cf418677a95aa6655 --- Makefile | 6 +- package-lock.json | 1567 +++++++++++++++++++- package.json | 12 +- postcss.config.js | 6 + web/htdocs/themes/facelift/.gitignore | 1 + .../themes/facelift/{theme.css => scss/_main.scss} | 978 ++++++------ web/htdocs/themes/facelift/scss/_sidebar.scss | 0 web/htdocs/themes/facelift/scss/_tables.scss | 0 web/htdocs/themes/facelift/scss/_variables.scss | 109 ++ web/htdocs/themes/facelift/theme.scss | 4 + webpack.config.js | 52 +- 11 files changed, 2206 insertions(+), 529 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8da26863e9…

5 years, 7 months

Improve support for GUI themes

by Lars Michelsen

Module: check_mk Branch: master Commit: 567ba5b9dd6c07175b690f62bf2ff1c87315ae7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=567ba5b9dd6c07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 7 20:46:47 2019 +0100 Improve support for GUI themes The available themes are now found dynamically Each directory below "web/htdocs/themes/" that contains a valid theme.json file which contains at least the following structure is shown as theme choice: { "title": "Title of theme" } The same applies to the directory <tt>local/share/check_mk/web/htdocs/themes/</tt>. Each site may deploy custom themes or override existing ones using this directory. CMK-1567 Change-Id: If192c28119b82787613632c509746850564ed817 --- cmk/gui/config.py | 30 ++++++++++-- cmk/gui/htmllib.py | 8 ++- tests/conftest.py | 1 + tests/unit/cmk/gui/test_gui_config.py | 91 +++++++++++++++++++++++++++++++++++ web/htdocs/themes/facelift/theme.json | 3 ++ 5 files changed, 128 insertions(+), 5 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index e96a543..c5b1368 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -28,8 +28,10 @@ import sys import errno import os import copy +import json from typing import Callable, Union, Tuple, Dict # pylint: disable=unused-import import six +from pathlib2 import Path import cmk.gui.utils as utils import cmk.gui.i18n @@ -1197,10 +1199,30 @@ def load_plugins(force): def theme_choices(): - return [ - ("classic", _("Classic")), - ("facelift", _("Modern")), - ] + themes = { + "classic": _("Classic"), + } + + for base_dir in [Path(cmk.utils.paths.web_dir), Path(cmk.utils.paths.local_web_dir)]: + if not base_dir.exists(): + continue + + for theme_dir in (base_dir / "htdocs" / "themes").iterdir(): # pylint: disable=no-member + meta_file = theme_dir / "theme.json" + if not meta_file.exists(): + continue + + try: + theme_meta = json.loads(meta_file.open(encoding="utf-8").read()) + except ValueError: + # Ignore broken meta files and show the directory name as title + theme_meta = { + "title": theme_dir.name, + } + + themes[theme_dir.name] = theme_meta["title"] + + return sorted(themes.items()) def get_page_heading(): diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 119eaae..082bd1d 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1033,7 +1033,13 @@ class html(HTMLGenerator): def set_theme(self, theme_id): # type: (str) -> None - self._theme = theme_id or config.ui_theme + if not theme_id: + theme_id = config.ui_theme + + if theme_id not in dict(config.theme_choices()): + theme_id = "facelift" + + self._theme = theme_id def get_theme(self): # type: () -> str diff --git a/tests/conftest.py b/tests/conftest.py index 14a357a..d8f47e5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -114,6 +114,7 @@ def fake_version_and_paths(): monkeypatch.setattr("cmk.utils.paths.notifications_dir", "%s/notifications" % cmk_path()) monkeypatch.setattr("cmk.utils.paths.inventory_dir", "%s/inventory" % cmk_path()) monkeypatch.setattr("cmk.utils.paths.check_manpages_dir", "%s/checkman" % cmk_path()) + monkeypatch.setattr("cmk.utils.paths.web_dir", "%s/web" % cmk_path()) monkeypatch.setattr("cmk.utils.paths.tmp_dir", tmp_dir) monkeypatch.setattr("cmk.utils.paths.precompiled_checks_dir", os.path.join(tmp_dir, "var/check_mk/precompiled_checks")) diff --git a/tests/unit/cmk/gui/test_gui_config.py b/tests/unit/cmk/gui/test_gui_config.py index 7e8ab57..a9d16d1 100644 --- a/tests/unit/cmk/gui/test_gui_config.py +++ b/tests/unit/cmk/gui/test_gui_config.py @@ -1,10 +1,15 @@ +# encoding: utf-8 + +import json import six import pytest # type: ignore from pathlib2 import Path +import cmk.utils.paths import cmk.gui.modules as modules import cmk.gui.config as config import cmk.gui.permissions as permissions +from cmk.gui.globals import html from cmk.gui.permissions import ( permission_section_registry, permission_registry, @@ -718,3 +723,89 @@ def test_permission_sorting(do_sort, result): ]) def test_migrate_old_site_config(site, result): assert config.migrate_old_site_config({"mysite": site}) == {"mysite": result} + + +(a)pytest.fixture() +def theme_dirs(tmp_path, monkeypatch): + theme_path = tmp_path / "htdocs" / "themes" + theme_path.mkdir(parents=True) + + local_theme_path = tmp_path / "local" / "htdocs" / "themes" + local_theme_path.mkdir(parents=True) + + monkeypatch.setattr(cmk.utils.paths, "web_dir", str(tmp_path)) + monkeypatch.setattr(cmk.utils.paths, "local_web_dir", str(tmp_path / "local")) + + return theme_path, local_theme_path + + +(a)pytest.fixture() +def my_theme(theme_dirs): + theme_path = theme_dirs[0] + my_dir = theme_path / "my_theme" + my_dir.mkdir() + my_dir.joinpath("theme.json").open( + mode="w", encoding="utf-8").write(unicode(json.dumps({"title": "Määh Theme :-)"}))) + return my_dir + + +# TODO: Enable with next commit +#def test_theme_choices_empty(theme_dirs): +# assert config.theme_choices() == [] +# +#def test_theme_choices_normal(my_theme): +# assert config.theme_choices() == [("my_theme", u"Määh Theme :-)")] + + +def test_theme_choices_local_theme(theme_dirs, my_theme): + local_theme_path = theme_dirs[1] + + my_dir = local_theme_path / "my_improved_theme" + my_dir.mkdir() + my_dir.joinpath("theme.json").open( + mode="w", encoding="utf-8").write(unicode(json.dumps({"title": "Määh Bettr Theme :-D"}))) + + assert config.theme_choices() == sorted([ + # TODO: Remove classic with next commit + ('classic', u'Classic'), + ("my_theme", u"Määh Theme :-)"), + ("my_improved_theme", u"Määh Bettr Theme :-D"), + ]) + + +def test_theme_choices_override(theme_dirs, my_theme): + local_theme_path = theme_dirs[1] + + my_dir = local_theme_path / "my_theme" + my_dir.mkdir() + my_dir.joinpath("theme.json").open( + mode="w", encoding="utf-8").write(unicode(json.dumps({"title": "Fixed theme"}))) + + assert config.theme_choices() == sorted([ + # TODO: Remove classic with next commit + ('classic', u'Classic'), + ("my_theme", u"Fixed theme"), + ]) + + +def test_theme_broken_meta(my_theme): + my_theme.joinpath("theme.json").open( + mode="w", encoding="utf-8").write(unicode("{\"titlewrong\": xyz\"bla\"}")) + + assert config.theme_choices() == sorted([ + # TODO: Remove classic with next commit + ('classic', u'Classic'), + ("my_theme", u"my_theme"), + ]) + + +def test_html_set_theme(my_theme, register_builtin_html): + html.set_theme(None) + # TODO: Cleanup with next commit + assert html.get_theme() == "classic" + + html.set_theme("not_existing") + assert html.get_theme() == "facelift" + + html.set_theme("my_theme") + assert html.get_theme() == "my_theme" diff --git a/web/htdocs/themes/facelift/theme.json b/web/htdocs/themes/facelift/theme.json new file mode 100644 index 0000000..5039953 --- /dev/null +++ b/web/htdocs/themes/facelift/theme.json @@ -0,0 +1,3 @@ +{ + "title": "Modern" +}

5 years, 7 months

YAPFed

by Lars Michelsen

Module: check_mk Branch: master Commit: 8870b9028811cfe0462f8ebe5174aff88b2a199e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8870b9028811cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 11 15:32:20 2019 +0100 YAPFed Change-Id: I72526984a8568b526c3e2d15c5950845d6ff4c5c --- cmk/gui/wato/pages/sites.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 5c303db..265f7ad 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -792,8 +792,8 @@ class ModeAjaxFetchSiteStatus(WatoWebApiMode): return html.drain() -cmk.gui.pages.register_page_handler( - "wato_ajax_fetch_site_status", lambda: ModeAjaxFetchSiteStatus().handle_page()) +cmk.gui.pages.register_page_handler("wato_ajax_fetch_site_status", + lambda: ModeAjaxFetchSiteStatus().handle_page()) PingResult = NamedTuple("PingResult", [ ("version", str),

5 years, 7 months

Added missing column header

by Lars Michelsen

Module: check_mk Branch: master Commit: 174fd05c899cfa813d31105b1e35d90e6cb6dc35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=174fd05c899cfa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 11 15:33:19 2019 +0100 Added missing column header Change-Id: I55935ee6e67e6daa7bebca43cb70d0a9d3ff8e78 --- cmk/gui/wato/pages/sites.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/wato/pages/sites.py b/cmk/gui/wato/pages/sites.py index 265f7ad..04f0b0b 100644 --- a/cmk/gui/wato/pages/sites.py +++ b/cmk/gui/wato/pages/sites.py @@ -1139,7 +1139,7 @@ class ModeSiteLivestatusEncryption(WatoMode): with table_element("certificate_chain", _("Certificate chain")) as table: for cert_detail in reversed(cert_details[1:]): table.row() - table.cell("", css="buttons") + table.cell(_("Actions"), css="buttons") if cert_detail.is_ca: url = html.makeactionuri([ ("_action", "trust"),

5 years, 7 months

6985 checkpoint_tunnels, checkpoint_packets, checkpoint_inv_tunnels: Suite of plugins for Checkpoint VPN devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8e0ed5422a311abfe2d8ba8bec07d2366525793c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e0ed5422a311a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 11 09:57:34 2019 +0100 6985 checkpoint_tunnels, checkpoint_packets, checkpoint_inv_tunnels: Suite of plugins for Checkpoint VPN devices Change-Id: I3d1292ba6b321adc711e59b66a98018c98226a93 --- .werks/6985 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6985 b/.werks/6985 new file mode 100644 index 0000000..05526ea --- /dev/null +++ b/.werks/6985 @@ -0,0 +1,10 @@ +Title: checkpoint_tunnels, checkpoint_packets, checkpoint_inv_tunnels: Suite of plugins for Checkpoint VPN devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1549875319 +Class: feature + +

5 years, 7 months

Additional cleanups of non localizable texts in check parameter valuespecs

by Lars Michelsen

Module: check_mk Branch: master Commit: 3246ed066411e112dae5266623f1234870cb6c35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3246ed066411e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 11 13:47:27 2019 +0100 Additional cleanups of non localizable texts in check parameter valuespecs Change-Id: I93c7d7733cb2fdf634305225fe265e15a198c886 --- .../wato/check_parameters/db2_tablespaces.py | 147 ++++---- cmk/gui/plugins/wato/check_parameters/elphase.py | 126 +++---- .../check_parameters/fortigate_node_sessions.py | 15 +- .../wato/check_parameters/fortigate_sessions.py | 17 +- cmk/gui/plugins/wato/check_parameters/licenses.py | 66 ++-- .../plugins/wato/check_parameters/logwatch_ec.py | 391 ++++++++++++--------- cmk/gui/plugins/wato/check_parameters/ntp.py | 50 +-- .../wato/check_parameters/oracle_tablespaces.py | 2 +- .../plugins/wato/check_parameters/ups_capacity.py | 96 ++--- cmk/gui/plugins/wato/check_parameters/webserver.py | 98 ------ .../plugins/wato/check_parameters/websphere_mq.py | 54 +-- .../wato/check_parameters/websphere_mq_channels.py | 2 +- 12 files changed, 515 insertions(+), 549 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3246ed0664…

5 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019