Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

Extract inventory display hints to dedicated file

by Lars Michelsen

Module: check_mk Branch: master Commit: 728f5eae767946ee51de9287ff2b67d25473b8a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=728f5eae767946… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 10:02:07 2019 +0200 Extract inventory display hints to dedicated file Change-Id: I836873eb976480a44d992683fa26bf7ff7e7b0f3 --- cmk/gui/plugins/views/builtin_inventory_plugins.py | 807 +++++++++++++++++++++ cmk/gui/plugins/views/inventory.py | 776 +------------------- tests/unit/cmk/gui/test_views.py | 376 +++++++++- 3 files changed, 1181 insertions(+), 778 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=728f5eae76…

5 years, 6 months

Add discovered labels to HW/SW inventory tree

by Lars Michelsen

Module: check_mk Branch: master Commit: dfaf15d14a4e301c458cbd5a1fd33e60adbc8e3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfaf15d14a4e30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 16:29:21 2019 +0200 Add discovered labels to HW/SW inventory tree * Add the discovered labels and the origin plugin names to the inventory tree. This is done for debugging and transparency reasons. * Added discovered_host_labels.add_label method for adding labels and adding the label information to the HW/SW inventory tree in one step. * Cleaned up tests on the way CMK-1818 Change-Id: I07a92b6948650f4b5e0565d952d6d90819f7ce72 --- cmk/gui/plugins/views/inventory.py | 20 ++++++++++ cmk_base/discovered_host_labels.py | 17 ++++++++- cmk_base/inventory.py | 2 +- inventory/lnx_distro | 2 +- tests/unit/cmk_base/test_discovered_host_labels.py | 43 +++++++++++++--------- 5 files changed, 63 insertions(+), 21 deletions(-) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 4165f92..2eb922c 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -78,6 +78,7 @@ from cmk.gui.plugins.views import ( paint_age, declare_1to1_sorter, cmp_simple_number, + render_labels, ) @@ -521,6 +522,11 @@ def inv_paint_csv_labels(csv_list): @decorate_inv_paint +def inv_paint_cmk_label(label): + return "labels", render_labels({label[0]: label[1]}, object_type="host", with_links=True) + + +@decorate_inv_paint def inv_paint_container_ready(ready): if ready == 'yes': css_class = "if_state_up" @@ -1012,6 +1018,20 @@ inventory_displayhints.update({ "title": _("Cluster host"), "short": _("Cluster"), "paint": "bool" }, ".software.applications.check_mk.cluster.nodes:": {"title": _("Nodes")}, + ".software.applications.check_mk.host_labels:": { + "title": _("Discovered host labels"), + "keyorder": [ + "label", + "inventory_plugin_name", + ], + }, + ".software.applications.check_mk.host_labels:*.label": { + "title": _("Label"), + "paint": "cmk_label", + }, + ".software.applications.check_mk.host_labels:*.inventory_plugin_name": { + "title": _("Discovered by inventory plugin"), + }, ".software.applications.docker.": { "icon": "docker", "title": "Docker", "keyorder": [ "version", diff --git a/cmk_base/discovered_host_labels.py b/cmk_base/discovered_host_labels.py index f61b13f..e697120 100644 --- a/cmk_base/discovered_host_labels.py +++ b/cmk_base/discovered_host_labels.py @@ -61,8 +61,9 @@ class DiscoveredHostLabelsStore(object): class DiscoveredHostLabels(collections.MutableMapping, object): """Encapsulates the discovered labels of a single host during runtime""" - def __init__(self, **kwargs): + def __init__(self, inventory_tree, **kwargs): super(DiscoveredHostLabels, self).__init__() + self._inventory_tree = inventory_tree self._labels = kwargs def is_empty(self): @@ -85,3 +86,17 @@ class DiscoveredHostLabels(collections.MutableMapping, object): def to_dict(self): return self._labels + + # TODO: Once we redesign the hw/sw inventory plugin API check if we can move it to the + # inventory API. + def add_label(self, key, value, plugin_name): + """Add a label to the collection of discovered labels and inventory tree + + Add it to the inventory tree for debugging purposes + """ + self[key] = value + labels = self._inventory_tree.get_list("software.applications.check_mk.host_labels:") + labels.append({ + "label": (key, value), + "inventory_plugin_name": plugin_name, + }) diff --git a/cmk_base/inventory.py b/cmk_base/inventory.py index 3fb4ddb..4090ec7 100644 --- a/cmk_base/inventory.py +++ b/cmk_base/inventory.py @@ -187,7 +187,7 @@ def _do_inv_for(sources, multi_host_sections, hostname, ipaddress, do_status_dat _initialize_inventory_tree() inventory_tree = g_inv_tree status_data_tree = StructuredDataTree() - discovered_host_labels = DiscoveredHostLabels() + discovered_host_labels = DiscoveredHostLabels(inventory_tree) node = inventory_tree.get_dict("software.applications.check_mk.cluster.") if config.is_cluster(hostname): diff --git a/inventory/lnx_distro b/inventory/lnx_distro index 7086ee9..410ad21 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -64,7 +64,7 @@ def inv_lnx_distro(info, inventory_tree, discovered_host_labels): break if "name" in node: - discovered_host_labels["os"] = node["name"] + discovered_host_labels.add_label("os", node["name"], plugin_name="lnx_distro") def _parse_lnx_distro(info): diff --git a/tests/unit/cmk_base/test_discovered_host_labels.py b/tests/unit/cmk_base/test_discovered_host_labels.py index 32c2070..4c7a171 100644 --- a/tests/unit/cmk_base/test_discovered_host_labels.py +++ b/tests/unit/cmk_base/test_discovered_host_labels.py @@ -4,30 +4,31 @@ import collections import pytest # type: ignore import cmk.utils.paths +from cmk.utils.structured_data import StructuredDataTree from cmk_base.discovered_host_labels import DiscoveredHostLabels, DiscoveredHostLabelsStore -def test_discovered_host_labels_type(): - labels = DiscoveredHostLabels() +(a)pytest.fixture() +def labels(): + return DiscoveredHostLabels(StructuredDataTree()) + + +def test_discovered_host_labels_type(labels): assert isinstance(labels, collections.MutableMapping) -def test_discovered_host_labels_is_empty(): - labels = DiscoveredHostLabels() +def test_discovered_host_labels_is_empty(labels): assert labels.is_empty() labels["abc"] = "123" assert not labels.is_empty() -def test_discovered_host_labels_getitem(): - labels = DiscoveredHostLabels() +def test_discovered_host_labels_getitem(labels): labels["abc"] = "123" assert labels["abc"] == "123" -def test_discovered_host_labels_delitem(): - labels = DiscoveredHostLabels() - +def test_discovered_host_labels_delitem(labels): labels["abc"] = "123" assert "abc" in labels @@ -35,9 +36,7 @@ def test_discovered_host_labels_delitem(): assert "abc" not in labels -def test_discovered_host_labels_iter(): - labels = DiscoveredHostLabels() - +def test_discovered_host_labels_iter(labels): labels["abc"] = "123" labels["xyz"] = "bla" @@ -45,8 +44,7 @@ def test_discovered_host_labels_iter(): assert sorted(list(labels.iterkeys())) == ["abc", "xyz"] -def test_discovered_host_labels_len(): - labels = DiscoveredHostLabels() +def test_discovered_host_labels_len(labels): assert len(labels) == 0 labels["abc"] = "123" @@ -55,8 +53,7 @@ def test_discovered_host_labels_len(): assert len(labels) == 2 -def test_discovered_host_labels_to_dict(): - labels = DiscoveredHostLabels() +def test_discovered_host_labels_to_dict(labels): assert labels.to_dict() == {} labels["äbc"] = "123" @@ -68,6 +65,17 @@ def test_discovered_host_labels_to_dict(): } +def test_discovered_host_add_label(labels): + labels.add_label("abc", "123", plugin_name="xyz") + assert labels["abc"] == "123" + inventory_labels = labels._inventory_tree.get_list( + "software.applications.check_mk.host_labels:") + assert inventory_labels[0] == { + 'inventory_plugin_name': 'xyz', + 'label': ('abc', '123'), + } + + @pytest.fixture() def discovered_labels_dir(tmp_path, monkeypatch): path = tmp_path / "var" / "check_mk" / "discovered_host_labels" @@ -79,9 +87,8 @@ def test_discovered_host_labels_store_file_path(discovered_labels_dir): assert DiscoveredHostLabelsStore("host").file_path == discovered_labels_dir / "host.mk" -def test_discovered_host_labels_store_save(discovered_labels_dir): +def test_discovered_host_labels_store_save(labels, discovered_labels_dir): store = DiscoveredHostLabelsStore("host") - labels = DiscoveredHostLabels() labels["xyz"] = "äbc" label_dict = labels.to_dict()

5 years, 6 months

First step of SCSS workaround for building for different editions

by Lars Michelsen

Module: check_mk Branch: master Commit: 1297e520b48d758f21c8ba0e9d144c3dea7dd92b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1297e520b48d75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 11:52:14 2019 +0200 First step of SCSS workaround for building for different editions Change-Id: I25a2276be057b4edf8b2c8caeb0b2c750a943b71 --- web/htdocs/themes/classic/scss/cee | 1 + web/htdocs/themes/classic/scss/cme | 1 + web/htdocs/themes/classic/theme.scss | 17 ++++++++++------- web/htdocs/themes/facelift/theme.scss | 17 ++++++++++------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/web/htdocs/themes/classic/scss/cee b/web/htdocs/themes/classic/scss/cee new file mode 120000 index 0000000..30aa240 --- /dev/null +++ b/web/htdocs/themes/classic/scss/cee @@ -0,0 +1 @@ +../../../../../enterprise/web/htdocs/themes/classic/scss \ No newline at end of file diff --git a/web/htdocs/themes/classic/scss/cme b/web/htdocs/themes/classic/scss/cme new file mode 120000 index 0000000..e88bc7e --- /dev/null +++ b/web/htdocs/themes/classic/scss/cme @@ -0,0 +1 @@ +../../../../../managed/web/htdocs/themes/classic/scss \ No newline at end of file diff --git a/web/htdocs/themes/classic/theme.scss b/web/htdocs/themes/classic/theme.scss index 4c00782..decdcfb 100644 --- a/web/htdocs/themes/classic/theme.scss +++ b/web/htdocs/themes/classic/theme.scss @@ -15,15 +15,18 @@ @import "scss/_sidebar.scss"; @import "scss/_snapins.scss"; -// CEE specific files -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_graphs.scss"; -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_reporting.scss"; +// CEE specific files. Would love to add some kind of conditional import here, +// but that is simply not possible at the moment using SCSS. Hack around this +// using symlinks in the git during development and replace the links with empty +// files during the build procedure of other editions. +@import "../classic/scss/cee/_graphs.scss"; +@import "../classic/scss/cee/_reporting.scss"; @if $ENTERPRISE = "yes" { @include graphs; @include reporting; } -//@import "../../../../managed/web/htdocs/themes/classic/scss/_managed.scss"; -//@if $MANAGED = "yes" { -// @include managed; -//} +@import "../classic/scss/cme/_managed.scss"; +@if $MANAGED = "yes" { + @include managed; +} diff --git a/web/htdocs/themes/facelift/theme.scss b/web/htdocs/themes/facelift/theme.scss index c4e609d..1cb3f39 100644 --- a/web/htdocs/themes/facelift/theme.scss +++ b/web/htdocs/themes/facelift/theme.scss @@ -17,18 +17,21 @@ @import "../classic/scss/_wato.scss"; @import "../classic/scss/_mobile.scss"; -// CEE specific files -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_graphs.scss"; -@import "../../../../enterprise/web/htdocs/themes/classic/scss/_reporting.scss"; +// CEE specific files. Would love to add some kind of conditional import here, +// but that is simply not possible at the moment using SCSS. Hack around this +// using symlinks in the git during development and replace the links with empty +// files during the build procedure of other editions. +@import "../classic/scss/cee/_graphs.scss"; +@import "../classic/scss/cee/_reporting.scss"; @if $ENTERPRISE = "yes" { @include graphs; @include reporting; } -//@import "../../../../managed/web/htdocs/themes/classic/scss/_managed.scss"; -//@if $MANAGED = "yes" { -// @include managed; -//} +@import "../classic/scss/cme/_managed.scss"; +@if $MANAGED = "yes" { + @include managed; +} @import "scss/_variables.scss"; @import "scss/_main.scss";

5 years, 6 months

Add opsgenie_swagger dependency for upcoming notification plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: c202eb05071be647ae9546cd9edfa2902e91f04c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c202eb05071be6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 9 10:06:59 2019 +0200 Add opsgenie_swagger dependency for upcoming notification plugin Pin yapf to 0.26.0 for the moment to prevent whole code base reformatting. Change-Id: Id32288d0e49fbde1bc4548aff2378bd07ad35f97 --- Pipfile | 5 ++++- Pipfile.lock | 17 ++++++++++++----- omd/packages/python-modules/python-modules.make | 1 + .../python-modules/src/opsgenie_swagger-0.3.2.tar.gz | Bin 0 -> 579638 bytes 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Pipfile b/Pipfile index b0f9a28..382cc79 100644 --- a/Pipfile +++ b/Pipfile @@ -15,7 +15,8 @@ bandit = "*" lxml = "*" pylint = "*" pyenchant = "*" -yapf = "*" +# Keep 0.26.0 for the moment because 0.27.0 needs whole code base reformatting or config change +yapf = "==0.26.0" docker = "*" mockldap = "*" isort = "*" @@ -113,6 +114,8 @@ kubernetes = "==8.0.0" defusedxml = "==0.5.0" requests-toolbelt = "==0.9.1" jira = "==2.0.0" +# Has been added for opsgenie notification plugin +opsgenie_swagger = "==0.3.2" [requires] python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock index 8bf0f2f..526eb35 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "6261d8b61efc33482eeae3b31b4c22d29978667c28d7673e9b8983404cba8d70" + "sha256": "59e4fd8bc93b820ba89ce46c0dc2606244c09b6b5326c474036188ec84f09ffa" }, "pipfile-spec": 6, "requires": { @@ -420,6 +420,13 @@ "index": "pypi", "version": "==2.1.0" }, + "opsgenie-swagger": { + "hashes": [ + "sha256:099baa2c6a4db309b449387cca075f8ad4b9404de0d5d3ae25e3baadda193225" + ], + "index": "pypi", + "version": "==0.3.2" + }, "ordereddict": { "hashes": [ "sha256:1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f" @@ -1139,7 +1146,7 @@ "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50" ], - "markers": "python_version < '3.3'", + "markers": "python_version < '3.0'", "version": "==1.0.2" }, "futures": { @@ -1182,11 +1189,11 @@ }, "isort": { "hashes": [ - "sha256:08f8e3f0f0b7249e9fad7e5c41e2113aba44969798a26452ee790c06f155d4ec", - "sha256:4e9e9c4bd1acd66cf6c36973f29b031ec752cbfd991c69695e4e259f9a756927" + "sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", + "sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" ], "index": "pypi", - "version": "==4.3.16" + "version": "==4.3.17" }, "lazy-object-proxy": { "hashes": [ diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index ac8ad90..e2b0d95 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -195,6 +195,7 @@ PYTHON_MODULES_LIST += kubernetes-8.0.0.tar.gz PYTHON_MODULES_LIST += defusedxml-0.5.0.tar.gz PYTHON_MODULES_LIST += requests-toolbelt-0.9.1.tar.gz PYTHON_MODULES_LIST += jira-2.0.0.tar.gz +PYTHON_MODULES_LIST += opsgenie_swagger-0.3.2.tar.gz # NOTE: Cruel hack below! We need to have a recent GCC visible in the PATH diff --git a/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz b/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz new file mode 100644 index 0000000..a901efa Binary files /dev/null and b/omd/packages/python-modules/src/opsgenie_swagger-0.3.2.tar.gz differ

5 years, 6 months

Cleaned up path handling. Improved logging. Better naming.

by Sven Panne

Module: check_mk Branch: master Commit: 10bc1a51bfa902b3203992ebc11a5f6f1fc8120f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10bc1a51bfa902… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 9 09:04:10 2019 +0200 Cleaned up path handling. Improved logging. Better naming. Change-Id: I75764b72a0009b573b741aa15f98638bead242c9 --- livestatus/src/module.cc | 203 ++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 106 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=10bc1a51bf…

5 years, 6 months

Prefer C++ strings, simplifying things.

by Sven Panne

Module: check_mk Branch: master Commit: 323dc272f11aabd88cadade78fad29b067ba5361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=323dc272f11aab… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 9 09:44:48 2019 +0200 Prefer C++ strings, simplifying things. Change-Id: I457901f9c2d8247983437ec42909b591acd61152 --- livestatus/src/module.cc | 78 +++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index d725017..f9ed3c4 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -1024,13 +1024,14 @@ void livestatus_parse_arguments(Logger *logger, const char *args_orig) { while (char *token = next_field(&args)) { /* find = */ char *part = token; - char *left = next_token(&part, '='); - char *right = next_token(&part, 0); - if (right == nullptr) { + std::string left = safe_next_token(&part, '='); + const char *right_token = next_token(&part, 0); + if (right_token == nullptr) { fl_paths._socket = left; } else { - if (strcmp(left, "debug") == 0) { - int debug_level = atoi(right); + std::string right{right_token}; + if (left == "debug") { + int debug_level = atoi(right.c_str()); if (debug_level >= 2) { fl_livestatus_log_level = LogLevel::debug; } else if (debug_level >= 1) { @@ -1040,32 +1041,35 @@ void livestatus_parse_arguments(Logger *logger, const char *args_orig) { } Notice(logger) << "setting debug level to " << fl_livestatus_log_level; - } else if (strcmp(left, "log_file") == 0) { + } else if (left == "log_file") { fl_paths._logfile = right; - } else if (strcmp(left, "mkeventd_socket") == 0) { + } else if (left == "mkeventd_socket") { fl_paths._mkeventd_socket = right; - } else if (strcmp(left, "max_cached_messages") == 0) { - fl_limits._max_cached_messages = strtoul(right, nullptr, 10); + } else if (left == "max_cached_messages") { + fl_limits._max_cached_messages = + strtoul(right.c_str(), nullptr, 10); Notice(logger) << "setting max number of cached log messages to " << fl_limits._max_cached_messages; - } else if (strcmp(left, "max_lines_per_logfile") == 0) { - fl_limits._max_lines_per_logfile = strtoul(right, nullptr, 10); + } else if (left == "max_lines_per_logfile") { + fl_limits._max_lines_per_logfile = + strtoul(right.c_str(), nullptr, 10); Notice(logger) << "setting max number lines per logfile to " << fl_limits._max_lines_per_logfile; - } else if (strcmp(left, "thread_stack_size") == 0) { - g_thread_stack_size = strtoul(right, nullptr, 10); + } else if (left == "thread_stack_size") { + g_thread_stack_size = strtoul(right.c_str(), nullptr, 10); Notice(logger) << "setting size of thread stacks to " << g_thread_stack_size; - } else if (strcmp(left, "max_response_size") == 0) { - fl_limits._max_response_size = strtoul(right, nullptr, 10); + } else if (left == "max_response_size") { + fl_limits._max_response_size = + strtoul(right.c_str(), nullptr, 10); Notice(logger) << "setting maximum response size to " << fl_limits._max_response_size << " bytes (" << (fl_limits._max_response_size / (1024.0 * 1024.0)) << " MB)"; - } else if (strcmp(left, "num_client_threads") == 0) { - int c = atoi(right); + } else if (left == "num_client_threads") { + int c = atoi(right.c_str()); if (c <= 0 || c > 1000) { Warning(logger) << "cannot set num_client_threads to " << c << ", must be > 0 and <= 1000"; @@ -1074,8 +1078,8 @@ void livestatus_parse_arguments(Logger *logger, const char *args_orig) { << "setting number of client threads to " << c; g_livestatus_threads = c; } - } else if (strcmp(left, "query_timeout") == 0) { - int c = atoi(right); + } else if (left == "query_timeout") { + int c = atoi(right.c_str()); if (c < 0) { Warning(logger) << "query_timeout must be >= 0"; } else { @@ -1088,8 +1092,8 @@ void livestatus_parse_arguments(Logger *logger, const char *args_orig) { << " ms"; } } - } else if (strcmp(left, "idle_timeout") == 0) { - int c = atoi(right); + } else if (left == "idle_timeout") { + int c = atoi(right.c_str()); if (c < 0) { Warning(logger) << "idle_timeout must be >= 0"; } else { @@ -1101,50 +1105,50 @@ void livestatus_parse_arguments(Logger *logger, const char *args_orig) { << "setting idle timeout to " << c << " ms"; } } - } else if (strcmp(left, "service_authorization") == 0) { - if (strcmp(right, "strict") == 0) { + } else if (left == "service_authorization") { + if (right == "strict") { fl_authorization._service = AuthorizationKind::strict; - } else if (strcmp(right, "loose") == 0) { + } else if (right == "loose") { fl_authorization._service = AuthorizationKind::loose; } else { Warning(logger) << "invalid service authorization mode, " "allowed are strict and loose"; } - } else if (strcmp(left, "group_authorization") == 0) { - if (strcmp(right, "strict") == 0) { + } else if (left == "group_authorization") { + if (right == "strict") { fl_authorization._group = AuthorizationKind::strict; - } else if (strcmp(right, "loose") == 0) { + } else if (right == "loose") { fl_authorization._group = AuthorizationKind::loose; } else { Warning(logger) << "invalid group authorization mode, allowed are strict and loose"; } - } else if (strcmp(left, "pnp_path") == 0) { + } else if (left == "pnp_path") { fl_paths._pnp = check_path("PNP perfdata directory", right); - } else if (strcmp(left, "mk_inventory_path") == 0) { + } else if (left == "mk_inventory_path") { fl_paths._mk_inventory = check_path("Check_MK Inventory directory", right); - } else if (strcmp(left, "structured_status_path") == 0) { + } else if (left == "structured_status_path") { fl_paths._structured_status = check_path("Check_MK structured status directory", right); - } else if (strcmp(left, "mk_logwatch_path") == 0) { + } else if (left == "mk_logwatch_path") { fl_paths._mk_logwatch = check_path("Check_MK logwatch directory", right); - } else if (strcmp(left, "data_encoding") == 0) { - if (strcmp(right, "utf8") == 0) { + } else if (left == "data_encoding") { + if (right == "utf8") { fl_data_encoding = Encoding::utf8; - } else if (strcmp(right, "latin1") == 0) { + } else if (right == "latin1") { fl_data_encoding = Encoding::latin1; - } else if (strcmp(right, "mixed") == 0) { + } else if (right == "mixed") { fl_data_encoding = Encoding::mixed; } else { Warning(logger) << "invalid data_encoding " << right << ", allowed are utf8, latin1 and mixed"; } - } else if (strcmp(left, "livecheck") == 0) { + } else if (left == "livecheck") { Warning(logger) << "livecheck has been removed from Livestatus, sorry."; - } else if (strcmp(left, "disable_statehist_filtering") == 0) { + } else if (left == "disable_statehist_filtering") { Warning(logger) << "the disable_statehist_filtering option has been removed, filtering is always active now."; } else {

5 years, 6 months

Split up format targets a bit more.

by Sven Panne

Module: check_mk Branch: master Commit: 10314ddd424a9793f44f8e9a7694b963c352840f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10314ddd424a97… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 9 09:58:23 2019 +0200 Split up format targets a bit more. Change-Id: I35a60f834ab657bc88f76a596f82ddc076cbff1d --- Makefile | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d8c9296..5944705 100644 --- a/Makefile +++ b/Makefile @@ -76,11 +76,14 @@ LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ src/{Makefile.am,*.{cc,h}} standalone/config_files.m4 -FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ +FILES_TO_FORMAT_WINDOWS := \ + $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/,*.cc *.h)) \ $(wildcard $(addprefix agents/windows/sections/,*.cc *.h)) \ $(wildcard $(addprefix agents/windows/test/,*.cc *.h)) \ $(wildcard $(addprefix agents/windows/test/sections,*.cc *.h)) \ + +FILES_TO_FORMAT_LINUX := \ $(wildcard $(addprefix livestatus/api/c++/,*.cc *.h)) \ $(wildcard $(addprefix livestatus/src/,*.cc *.h)) \ $(wildcard $(addprefix livestatus/src/test/,*.cc *.h)) \ @@ -96,11 +99,11 @@ JAVASCRIPT_SOURCES := $(filter-out %_min.js,$(wildcard $(addsuffix /web/htdocs/j PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs/images/icons enterprise/web/htdocs/images enterprise/web/htdocs/images/icons managed/web/htdocs/images managed/web/htdocs/images/icons)) -.PHONY: all analyze build check check-binaries check-permissions \ - check-version clean compile-neb-cmc cppcheck dist documentation format format-c format-python \ - GTAGS headers help install iwyu mrproper \ - optimize-images packages setup setversion tidy version \ - am--refresh skel +.PHONY: all analyze build check check-binaries check-permissions check-version \ + clean compile-neb-cmc cppcheck dist documentation format format-c \ + format-windows format-linux format-python GTAGS headers help install \ + iwyu mrproper optimize-images packages setup setversion tidy version \ + am--refresh skel help: @echo "setup --> Prepare system for development and building" @@ -486,8 +489,13 @@ format: format-python format-c # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only # available from e.g. Ubuntu Saucy (13) onwards, so some magic is needed. -format-c: - $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) +format-c: format-windows format-linux + +format-windows: + $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT_WINDOWS) + +format-linux: + $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT_LINUX) format-python: .venv # Explicitly specify --style [FILE] to prevent costly searching in parent directories

5 years, 6 months

Revert "Add python-language-server as dev dependency"

by Lars Michelsen

Module: check_mk Branch: master Commit: f2724d6f2a0e80d2e592d13ccf5c029670cf6241 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2724d6f2a0e80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 20:39:43 2019 +0200 Revert "Add python-language-server as dev dependency" This reverts commit 4f63f94b1b8e65a26ec18b25a8144208d687c383. --- Pipfile | 1 - Pipfile.lock | 49 ++++++++----------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/Pipfile b/Pipfile index 9352b64..b0f9a28 100644 --- a/Pipfile +++ b/Pipfile @@ -19,7 +19,6 @@ yapf = "*" docker = "*" mockldap = "*" isort = "*" -python-language-server = "*" pdbpp = "*" freezegun = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 0ee4fa3..8bf0f2f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ada42c17ce4bd4dbef0bbdee868b5ed5514a1e734f678d2e72e97276cd26a221" + "sha256": "6261d8b61efc33482eeae3b31b4c22d29978667c28d7673e9b8983404cba8d70" }, "pipfile-spec": 6, "requires": { @@ -996,7 +996,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.4'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1142,12 +1142,6 @@ "markers": "python_version < '3.3'", "version": "==1.0.2" }, - "future": { - "hashes": [ - "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" - ], - "version": "==0.17.1" - }, "futures": { "hashes": [ "sha256:9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", @@ -1188,18 +1182,11 @@ }, "isort": { "hashes": [ - "sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", - "sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" + "sha256:08f8e3f0f0b7249e9fad7e5c41e2113aba44969798a26452ee790c06f155d4ec", + "sha256:4e9e9c4bd1acd66cf6c36973f29b031ec752cbfd991c69695e4e259f9a756927" ], "index": "pypi", - "version": "==4.3.17" - }, - "jedi": { - "hashes": [ - "sha256:2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b", - "sha256:2c6bcd9545c7d6440951b12b44d373479bf18123a401a52025cf98563fbd826c" - ], - "version": "==0.13.3" + "version": "==4.3.16" }, "lazy-object-proxy": { "hashes": [ @@ -1299,13 +1286,6 @@ "markers": "python_version <= '2.7'", "version": "==5.0.0" }, - "parso": { - "hashes": [ - "sha256:17cc2d7a945eb42c3569d4564cdf49bde221bc2b552af3eca9c1aad517dcdd33", - "sha256:2e9574cb12e7112a87253e14e2c380ce312060269d04bd018478a3c92ea9a376" - ], - "version": "==0.4.0" - }, "pathlib2": { "hashes": [ "sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83", @@ -1421,19 +1401,6 @@ "index": "pypi", "version": "==2.7.5" }, - "python-jsonrpc-server": { - "hashes": [ - "sha256:09b418e3b1ba9032aecc7aefdd185511dd230fb8dacf18ec195d14dfd89d9e54" - ], - "version": "==0.1.2" - }, - "python-language-server": { - "hashes": [ - "sha256:1a746a4031938df03ee546fa4760895b6a6e420a07d58161b064945add6449ef" - ], - "index": "pypi", - "version": "==0.26.1" - }, "python-ldap": { "hashes": [ "sha256:41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5" @@ -1553,11 +1520,11 @@ }, "yapf": { "hashes": [ - "sha256:34f6f80c446dcb2c44bd644c4037a2024b6645e293a4c9c4521983dd0bb247a1", - "sha256:613deba14233623ff3432d9d5032631b5f600be97b39f66932cbe67648bfa8ea" + "sha256:edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b", + "sha256:f58069d5e0df60c078f3f986b8a63acfda73aa6ebb7cd423f6eabd1cb06420ba" ], "index": "pypi", - "version": "==0.27.0" + "version": "==0.26.0" } } }

5 years, 6 months

Add python-language-server as dev dependency

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f63f94b1b8e65a26ec18b25a8144208d687c383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f63f94b1b8e65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 19:33:17 2019 +0200 Add python-language-server as dev dependency This supports ALE completion and goto commands Change-Id: Iaa7ed2d78ed9028b47ab28ed97109be68fd71de8 --- Pipfile | 1 + Pipfile.lock | 49 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Pipfile b/Pipfile index b0f9a28..9352b64 100644 --- a/Pipfile +++ b/Pipfile @@ -19,6 +19,7 @@ yapf = "*" docker = "*" mockldap = "*" isort = "*" +python-language-server = "*" pdbpp = "*" freezegun = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 8bf0f2f..0ee4fa3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "6261d8b61efc33482eeae3b31b4c22d29978667c28d7673e9b8983404cba8d70" + "sha256": "ada42c17ce4bd4dbef0bbdee868b5ed5514a1e734f678d2e72e97276cd26a221" }, "pipfile-spec": 6, "requires": { @@ -996,7 +996,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version == '2.7'", + "markers": "python_version < '3.4'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1142,6 +1142,12 @@ "markers": "python_version < '3.3'", "version": "==1.0.2" }, + "future": { + "hashes": [ + "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" + ], + "version": "==0.17.1" + }, "futures": { "hashes": [ "sha256:9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265", @@ -1182,11 +1188,18 @@ }, "isort": { "hashes": [ - "sha256:08f8e3f0f0b7249e9fad7e5c41e2113aba44969798a26452ee790c06f155d4ec", - "sha256:4e9e9c4bd1acd66cf6c36973f29b031ec752cbfd991c69695e4e259f9a756927" + "sha256:01cb7e1ca5e6c5b3f235f0385057f70558b70d2f00320208825fa62887292f43", + "sha256:268067462aed7eb2a1e237fcb287852f22077de3fb07964e87e00f829eea2d1a" ], "index": "pypi", - "version": "==4.3.16" + "version": "==4.3.17" + }, + "jedi": { + "hashes": [ + "sha256:2bb0603e3506f708e792c7f4ad8fc2a7a9d9c2d292a358fbbd58da531695595b", + "sha256:2c6bcd9545c7d6440951b12b44d373479bf18123a401a52025cf98563fbd826c" + ], + "version": "==0.13.3" }, "lazy-object-proxy": { "hashes": [ @@ -1286,6 +1299,13 @@ "markers": "python_version <= '2.7'", "version": "==5.0.0" }, + "parso": { + "hashes": [ + "sha256:17cc2d7a945eb42c3569d4564cdf49bde221bc2b552af3eca9c1aad517dcdd33", + "sha256:2e9574cb12e7112a87253e14e2c380ce312060269d04bd018478a3c92ea9a376" + ], + "version": "==0.4.0" + }, "pathlib2": { "hashes": [ "sha256:8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83", @@ -1401,6 +1421,19 @@ "index": "pypi", "version": "==2.7.5" }, + "python-jsonrpc-server": { + "hashes": [ + "sha256:09b418e3b1ba9032aecc7aefdd185511dd230fb8dacf18ec195d14dfd89d9e54" + ], + "version": "==0.1.2" + }, + "python-language-server": { + "hashes": [ + "sha256:1a746a4031938df03ee546fa4760895b6a6e420a07d58161b064945add6449ef" + ], + "index": "pypi", + "version": "==0.26.1" + }, "python-ldap": { "hashes": [ "sha256:41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5" @@ -1520,11 +1553,11 @@ }, "yapf": { "hashes": [ - "sha256:edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b", - "sha256:f58069d5e0df60c078f3f986b8a63acfda73aa6ebb7cd423f6eabd1cb06420ba" + "sha256:34f6f80c446dcb2c44bd644c4037a2024b6645e293a4c9c4521983dd0bb247a1", + "sha256:613deba14233623ff3432d9d5032631b5f600be97b39f66932cbe67648bfa8ea" ], "index": "pypi", - "version": "==0.26.0" + "version": "==0.27.0" } } }

5 years, 6 months

7434 winperf_phydisk: Optional configuration of disk io operations

by Florian Kromer

Module: check_mk Branch: master Commit: a35c7e28a9709c198db2d504aa3c6ac4736ceb3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a35c7e28a9709c… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Fri Apr 5 14:11:14 2019 +0200 7434 winperf_phydisk: Optional configuration of disk io operations This werk adds support for the configuration of Disk IO operation values for Windows in WATO rule "Levels on disk IO (old style checks)". CMK-1780 Change-Id: I66e13f186ed77236f7e0d7b135fdf45111bee77b --- .werks/7434 | 13 +++++++++++++ cmk/gui/plugins/wato/check_parameters/disk_io.py | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.werks/7434 b/.werks/7434 new file mode 100644 index 0000000..d66c539 --- /dev/null +++ b/.werks/7434 @@ -0,0 +1,13 @@ +Title: winperf_phydisk: Optional configuration of disk io operations +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554463850 +Class: feature + +This werk adds support for the configuration of Levels for disk I/O operations +for Windows in WATO rule "Levels on disk IO (old style checks)". + +CMK-1780 diff --git a/cmk/gui/plugins/wato/check_parameters/disk_io.py b/cmk/gui/plugins/wato/check_parameters/disk_io.py index 19aa647..c07adf6 100644 --- a/cmk/gui/plugins/wato/check_parameters/disk_io.py +++ b/cmk/gui/plugins/wato/check_parameters/disk_io.py @@ -128,6 +128,18 @@ class RulespecCheckgroupParametersDiskIo(CheckParameterRulespecWithItem): "cause incompatibilities with existing historical data " "if you are running PNP4Nagios in SINGLE mode.")), ), + ("read_ios", + Levels( + title=_("Read operations"), + unit=_("1/s"), + default_levels=(400.0, 600.0), + )), + ("write_ios", + Levels( + title=_("Write operations"), + unit=_("1/s"), + default_levels=(300.0, 400.0), + )), ],) @property

5 years, 6 months

← Newer
1
...
35
36
37
38
39
40
41
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019