Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

[CMK-1850] - fixed error when bakery uses legacy baked_container.msi

by Sergey Kipnis

Module: check_mk Branch: master Commit: cfda3eac05ef1e5a1b7523d52f5a15314b84bb9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfda3eac05ef1e… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Mon Apr 8 12:27:38 2019 +0200 [CMK-1850] - fixed error when bakery uses legacy baked_container.msi - removed baked_container from the build script - msi-update uses instead of baked_container.msi check_mk_agent.msi Change-Id: I8d107105db09330f1a7a8d9151879f142083db0e --- agents/windows/msibuild/msi-update | 4 ++++ agents/wnx/build_release.cmd | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update index fa55685..100bc71 100755 --- a/agents/windows/msibuild/msi-update +++ b/agents/windows/msibuild/msi-update @@ -136,6 +136,10 @@ try: # MSI container to modify msi_file = sys.argv[1] + if msi_file.find("baked_container.msi"): + verbose("changing baked_container.msi to check_mk_agent.msi") + msi_file = msi_file.replace("baked_container.msi", + "check_mk_agent.msi") # The same container for all cases # Directory where the sources are contained source_dir = sys.argv[2] diff --git a/agents/wnx/build_release.cmd b/agents/wnx/build_release.cmd index 63ef90a..7351b85 100644 --- a/agents/wnx/build_release.cmd +++ b/agents/wnx/build_release.cmd @@ -96,7 +96,6 @@ exit 100 pushd %REMOTE_MACHINE% copy check_mk_service.msi check_mk_agent.msi -copy check_mk_service.msi baked_container.msi copy check_mk_service32.exe check_mk_agent.exe copy check_mk_service64.exe check_mk_agent-64.exe

5 years, 6 months

RRD data query has configurable limit on data length

by Óscar Nájera

Module: check_mk Branch: master Commit: ab6113372ffa64ad4968374353db52c94c3d7d9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6113372ffa64… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Apr 5 15:46:08 2019 +0200 RRD data query has configurable limit on data length RRDtool has a configurable default limit of 400 points per query. Livestatus did not configure that value until now, but we may need to do queries over large periods of time and we don't want down sampling. This change offers backwards compatibility, leaving this parameter as optional. The off by one in the query to result arises on the new way result bounds are given. Now the result bounds contain the query bounds instead of providing a shift of bounds between query and response. CMK-1935 Change-Id: I2bcd22396887fe04f7617cb6e1248225662482c1 --- cmk/utils/prediction.py | 8 +++----- tests/integration/cmk_base/test_services_prediction.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cmk/utils/prediction.py b/cmk/utils/prediction.py index 8aab80d..c1236af 100644 --- a/cmk/utils/prediction.py +++ b/cmk/utils/prediction.py @@ -111,15 +111,13 @@ class TimeSeries(object): return self.start == other.start and self.end == other.end and self.step == other.step and self.values == other.values -def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime): +def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime, max_entries=400): """Fetch RRD historic metrics data of a specific service, within the specified time range returns a TimeSeries object holding interval and data information Query to livestatus always returns if database is found, thus: - Values can be None when there is no data for a given timestamp - - Livestatus/rrdtool returns a maximum of 400 data-points per query, - even if better resolution is available within the time range. - Reply from livestatus/rrdtool is always enough to describe the queried interval. That means, the returned bounds are always outside the queried interval. @@ -140,11 +138,11 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime rpn = "%s.%s" % (varname, cf.lower()) # "MAX" -> "max" lql = "GET services\n" \ - "Columns: rrddata:m1:%s:%s:%s:%s\n" \ + "Columns: rrddata:m1:%s:%s:%s:%s:%s\n" \ "OutputFormat: python\n" \ "Filter: host_name = %s\n" \ "Filter: description = %s\n" % tuple(map(livestatus.lqencode, - map(str, (rpn, fromtime, untiltime, step, + map(str, (rpn, fromtime, untiltime, step, max_entries, hostname, service_description)))) try: diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index fa6e331..a5a279b 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -88,6 +88,16 @@ def test_get_rrd_data(cfg_setup, utcdate, timezone, period, result): assert (timeseries.step, len(timeseries.values)) == result +(a)pytest.mark.parametrize("max_entries, result", [(400, (180, 401)), (20, (3600, 21)), + (50, (1800, 41)), (1000, (120, 600)), + (1200, (60, 1200))]) +def test_get_rrd_data_point_max(cfg_setup, max_entries, result): + from_time, until_time = 1543430040, 1543502040 + timeseries = cmk.utils.prediction.get_rrd_data('test-prediction', 'CPU load', 'load15', 'MAX', + from_time, until_time, max_entries) + assert (timeseries.step, len(timeseries.values)) == result + + @pytest.mark.parametrize('utcdate, timezone, params, reference', [ ("2018-09-01 07:00", "Europe/Berlin", { 'period': 'wday',

5 years, 6 months

7394 FIX cisco_vlans: Cisco VLANs missing from HW/SW-Inventory

by Moritz Kiemer

Module: check_mk Branch: master Commit: a9e962cf246421722124022b910ff54784c9486c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9e962cf246421… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 8 08:21:14 2019 +0200 7394 FIX cisco_vlans: Cisco VLANs missing from HW/SW-Inventory Change-Id: I3a99a7964c476729b53f13a060cd6c8af913d0b2 --- .werks/7394 | 10 ++++++++++ inventory/cisco_vlans | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/7394 b/.werks/7394 new file mode 100644 index 0000000..29d5ab5 --- /dev/null +++ b/.werks/7394 @@ -0,0 +1,10 @@ +Title: cisco_vlans: Cisco VLANs missing from HW/SW-Inventory +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554704404 +Class: fix + + diff --git a/inventory/cisco_vlans b/inventory/cisco_vlans index 7ec6b6d..405c4c8 100644 --- a/inventory/cisco_vlans +++ b/inventory/cisco_vlans @@ -87,8 +87,8 @@ def parse_multi_vlan(vlan_multi): return ", ".join(infotexts) -def inv_cisco_vlans(info, params): - node = inv_tree("networking.interfaces:") +def inv_cisco_vlans(info, inventory_tree): + node = inventory_tree.get_list("networking.interfaces:") map_vlans = { '1': 'static', '2': 'dynamic',

5 years, 6 months

Reduce visual clutter in WATO folder host list

by Lars Michelsen

Module: check_mk Branch: master Commit: 62917296f47162ac5391c61e00d9b4db2f4db147 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62917296f47162… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Apr 6 23:35:58 2019 +0200 Reduce visual clutter in WATO folder host list In a lot of situations several of the standard columns are not filled at all, e.g. the IPv6 address column is useless in non IPv6 networks. Instead of showing the empty columns they are now completely hidden from the user. Change-Id: I7b95becace7062340178b83019cdfbf943fbb95d --- cmk/gui/table.py | 29 ++++++++++++++++++++++++----- cmk/gui/wato/pages/folders.py | 5 +++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/cmk/gui/table.py b/cmk/gui/table.py index 66846b6..4dbb95a 100644 --- a/cmk/gui/table.py +++ b/cmk/gui/table.py @@ -91,6 +91,7 @@ class Table(object): self.options = { "collect_headers": False, # also: True, "finished" "omit_if_empty": kwargs.get("omit_if_empty", False), + "omit_empty_columns": kwargs.get("omit_empty_columns", False), "omit_headers": kwargs.get("omit_headers", False), "searchable": kwargs.get("searchable", True), "sortable": kwargs.get("sortable", True), @@ -277,12 +278,18 @@ class Table(object): table_id = self.id num_cols = len(self.headers) + empty_columns = self._get_empty_columns(rows, num_cols) + num_cols -= len([v for v in empty_columns if v]) html.open_table(class_=["data", "oddeven", self.css]) # If we have no group headers then paint the headers now if self.rows and self.rows[0][2] != "header": - self._render_headers(actions_enabled, actions_visible) + self._render_headers( + actions_enabled, + actions_visible, + empty_columns, + ) if actions_enabled and actions_visible: html.open_tr(class_=["data", "even0", "actions"]) @@ -311,7 +318,6 @@ class Table(object): html.close_tr() for nr, (row_spec, css, state, _fixed, attrs) in enumerate(rows): - if not css and "class_" in attrs: css = attrs.pop("class_") if not css and "class" in attrs: @@ -329,14 +335,17 @@ class Table(object): html.close_td() html.close_tr() - self._render_headers(actions_enabled, actions_visible) + self._render_headers(actions_enabled, actions_visible, empty_columns) continue oddeven_name = "even" if (nr - 1) % 2 == 0 else "odd" html.open_tr( class_=["data", "%s%d" % (oddeven_name, state), css if css else None], **attrs) - for cell_content, css_classes, colspan in row_spec: + for col_index, (cell_content, css_classes, colspan) in enumerate(row_spec): + if self.options["omit_empty_columns"] and empty_columns[col_index]: + continue + html.open_td( class_=css_classes if css_classes else None, colspan=colspan if colspan else None) @@ -351,6 +360,13 @@ class Table(object): html.close_table() + def _get_empty_columns(self, rows, num_cols): + empty_columns = [True] * num_cols + for row_spec, _css, _state, _fixed, _attrs in rows: + for col_index, (cell_content, _css_classes, _colspan) in enumerate(row_spec): + empty_columns[col_index] &= not cell_content + return empty_columns + def _write_csv(self, csv_separator): rows = self.rows @@ -377,7 +393,7 @@ class Table(object): ])) html.write("\n") - def _render_headers(self, actions_enabled, actions_visible): + def _render_headers(self, actions_enabled, actions_visible, empty_columns): if self.options["omit_headers"]: return @@ -386,6 +402,9 @@ class Table(object): html.open_tr() first_col = True for nr, (header, css, help_txt, sortable) in enumerate(self.headers): + if self.options["omit_empty_columns"] and empty_columns[nr]: + continue + text = header if help_txt: diff --git a/cmk/gui/wato/pages/folders.py b/cmk/gui/wato/pages/folders.py index 8e58c1a..d095e39 100644 --- a/cmk/gui/wato/pages/folders.py +++ b/cmk/gui/wato/pages/folders.py @@ -406,7 +406,8 @@ class ModeFolder(WatoMode): # Show table of hosts in this folder html.begin_form("hosts", method="POST") - with table_element("hosts", title=_("Hosts"), searchable=False) as table: + with table_element( + "hosts", title=_("Hosts"), searchable=False, omit_empty_columns=True) as table: # Remember if that host has a target folder (i.e. was imported with # a folder information but not yet moved to that folder). If at least @@ -554,7 +555,7 @@ class ModeFolder(WatoMode): icon = "autherr" title = html.strip_tags(reason) - table.cell(_('Auth'), html.render_icon(icon, title), sortable=False) + table.cell(_('Auth'), html.render_icon(icon, title), css="buttons", sortable=False) # Permissions and Contact groups - through complete recursion and inhertance permitted_groups, host_contact_groups, _use_for_services = host.groups()

5 years, 6 months

Made path tests work with new pathlib path

by Lars Michelsen

Module: check_mk Branch: master Commit: e1fd17d5734c5be81a2887934032b3109e469e2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1fd17d5734c5b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 13:42:46 2019 +0200 Made path tests work with new pathlib path Change-Id: I65d4ae8c9d68df0ef1b1f56e040c0d2513cf4584 --- tests/integration/cmk/gui/test_webapi.py | 1 + tests/integration/cmk/utils/test_paths.py | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 991ce76..031c12c 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -319,6 +319,7 @@ def test_write_host_tags(web, site): "FOLDER_PATH": "/", "all_hosts": [], "host_tags": {}, + "host_labels": {}, "ipaddresses": {}, "host_attributes": {}, } diff --git a/tests/integration/cmk/utils/test_paths.py b/tests/integration/cmk/utils/test_paths.py index 3e250af..7871234 100644 --- a/tests/integration/cmk/utils/test_paths.py +++ b/tests/integration/cmk/utils/test_paths.py @@ -1,13 +1,22 @@ import os +from pathlib2 import Path import cmk.utils.paths +pathlib_paths = [ + "discovered_host_labels_dir", +] + def _check_paths(root): for var, value in cmk.utils.paths.__dict__.iteritems(): if not var.startswith("_") and var not in ('Path', 'os'): - assert isinstance(value, str) - assert value.startswith(root) + if var in pathlib_paths: + assert isinstance(value, Path) + assert str(value).startswith(root) + else: + assert isinstance(value, str) + assert value.startswith(root) def test_paths_in_site(site): @@ -16,8 +25,10 @@ def test_paths_in_site(site): def test_paths_in_omd_root(monkeypatch): omd_root = '/omd/sites/dingeling' - with monkeypatch.context() as m: - m.setitem(os.environ, 'OMD_ROOT', omd_root) + try: + with monkeypatch.context() as m: + m.setitem(os.environ, 'OMD_ROOT', omd_root) + reload(cmk.utils.paths) + _check_paths(omd_root) + finally: reload(cmk.utils.paths) - _check_paths(omd_root) - reload(cmk.utils.paths)

5 years, 6 months

Allocate NagiosCore dynamically, reducing global variable usage a bit.

by Sven Panne

Module: check_mk Branch: master Commit: a5b161f1a51d145d1279fc9258ef99f9c2cffee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5b161f1a51d14… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 12:08:33 2019 +0200 Allocate NagiosCore dynamically, reducing global variable usage a bit. Change-Id: I10cf45b6fbdc862bc33729a93e1e141c90c2c223 --- livestatus/src/module.cc | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3e0b28b..cde81ba 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -581,6 +581,9 @@ int broker_event(int event_type __attribute__((__unused__)), void *data) { class NagiosCore : public MonitoringCore { public: + NagiosCore(const NagiosPaths &paths, const NagiosLimits &limits) + : _paths(paths), _limits(limits) {} + Host *find_host(const std::string &name) override { // Older Nagios headers are not const-correct... :-P return fromImpl(::find_host(const_cast<char *>(name.c_str()))); @@ -630,7 +633,7 @@ public: } size_t maxLinesPerLogFile() const override { - return fl_limits._max_lines_per_logfile; + return _limits._max_lines_per_logfile; } Command find_command(const std::string &name) const override { @@ -678,16 +681,14 @@ public: } std::string mkeventdSocketPath() override { - return fl_paths._mkeventd_socket_path; - } - std::string mkLogwatchPath() override { return fl_paths._mk_logwatch_path; } - std::string mkInventoryPath() override { - return fl_paths._mk_inventory_path; + return _paths._mkeventd_socket_path; } + std::string mkLogwatchPath() override { return _paths._mk_logwatch_path; } + std::string mkInventoryPath() override { return _paths._mk_inventory_path; } std::string structuredStatusPath() override { - return fl_paths._structured_status_path; + return _paths._structured_status_path; } - std::string pnpPath() override { return fl_paths._pnp_path; } + std::string pnpPath() override { return _paths._pnp_path; } std::string historyFilePath() override { return log_file; } std::string logArchivePath() override { extern char *log_archive_path; @@ -695,10 +696,8 @@ public: } Encoding dataEncoding() override { return fl_data_encoding; } - size_t maxResponseSize() override { return fl_limits._max_response_size; } - size_t maxCachedMessages() override { - return fl_limits._max_cached_messages; - } + size_t maxResponseSize() override { return _limits._max_response_size; } + size_t maxCachedMessages() override { return _limits._max_cached_messages; } // TODO(sp) Unused in Livestatus NEB: Strange & ugly... AuthorizationKind hostAuthorization() const override { @@ -751,6 +750,9 @@ public: } private: + const NagiosPaths &_paths; + const NagiosLimits &_limits; + void *implInternal() const override { return fl_store; } static const Contact *fromImpl(const contact *c) { @@ -819,7 +821,7 @@ private: } }; -NagiosCore core; +static NagiosCore *fl_core = nullptr; int broker_process(int event_type __attribute__((__unused__)), void *data) { auto ps = static_cast<struct nebstruct_process_struct *>(data); @@ -834,7 +836,8 @@ int broker_process(int event_type __attribute__((__unused__)), void *data) { } fl_hosts_by_designation[mk::unsafe_tolower(hst->name)] = hst; } - fl_store = new Store(&core); + fl_core = new NagiosCore(fl_paths, fl_limits); + fl_store = new Store(fl_core); fl_client_queue = new ClientQueue(); g_timeperiods_cache = new TimeperiodsCache(fl_logger_nagios); break; @@ -1252,12 +1255,19 @@ extern "C" int nebmodule_deinit(int flags __attribute__((__unused__)), Notice(fl_logger_nagios) << "deinitializing"; terminate_threads(); close_unix_socket(); - delete fl_store; - fl_store = nullptr; - delete fl_client_queue; - fl_client_queue = nullptr; + deregister_callbacks(); + delete g_timeperiods_cache; g_timeperiods_cache = nullptr; - deregister_callbacks(); + + delete fl_client_queue; + fl_client_queue = nullptr; + + delete fl_store; + fl_store = nullptr; + + delete fl_core; + fl_core = nullptr; + return 0; }

5 years, 6 months

add winperf_phydisk_regression.py

by Moritz Kiemer

Module: check_mk Branch: master Commit: df76d5efb5c6c0c5a7104aa10e5149dc764d8b0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df76d5efb5c6c0… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 8 12:18:52 2019 +0200 add winperf_phydisk_regression.py Change-Id: I42075eeae130bfc45cab8b66b9f84a7793a6278c --- .../datasets/winperf_phydisk_regression.py | 82 ++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/winperf_phydisk_regression.py b/tests/unit/checks/generictests/datasets/winperf_phydisk_regression.py new file mode 100644 index 0000000..2301956 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/winperf_phydisk_regression.py @@ -0,0 +1,82 @@ +# yapf: disable + + +checkname = 'winperf_phydisk' + + +info = [[None, u'1435670669.29', u'234'], + [None, u'2', u'instances:', u'0_C:', u'_Total'], + [None, u'-36', u'0', u'0', u'rawcount'], + [None, u'-34', u'2446915000', u'2446915000', u'type(20570500)'], + [None, + u'-34', + u'130801442692895024', + u'130801442692895024', + u'type(40030500)'], + [None, u'1166', u'2446915000', u'2446915000', u'type(550500)'], + [None, u'-32', u'1552698000', u'1552698000', u'type(20570500)'], + [None, + u'-32', + u'130801442692895024', + u'130801442692895024', + u'type(40030500)'], + [None, u'1168', u'1552698000', u'1552698000', u'type(550500)'], + [None, u'-30', u'894217000', u'894217000', u'type(20570500)'], + [None, + u'-30', + u'130801442692895024', + u'130801442692895024', + u'type(40030500)'], + [None, u'1170', u'894217000', u'894217000', u'type(550500)'], + [None, u'-28', u'732825839', u'732825839', u'average_timer'], + [None, u'-28', u'64858', u'64858', u'average_base'], + [None, u'-26', u'465017058', u'465017058', u'average_timer'], + [None, u'-26', u'40852', u'40852', u'average_base'], + [None, u'-24', u'267808781', u'267808781', u'average_timer'], + [None, u'-24', u'24006', u'24006', u'average_base'], + [None, u'-22', u'64858', u'64858', u'counter'], + [None, u'-20', u'40852', u'40852', u'counter'], + [None, u'-18', u'24006', u'24006', u'counter'], + [None, u'-16', u'2644868608', u'2644868608', u'bulk_count'], + [None, u'-14', u'1725201408', u'1725201408', u'bulk_count'], + [None, u'-12', u'919667200', u'919667200', u'bulk_count'], + [None, u'-10', u'2644868608', u'2644868608', u'average_bulk'], + [None, u'-10', u'64858', u'64858', u'average_base'], + [None, u'-8', u'1725201408', u'1725201408', u'average_bulk'], + [None, u'-8', u'40852', u'40852', u'average_base'], + [None, u'-6', u'919667200', u'919667200', u'average_bulk'], + [None, u'-6', u'24006', u'24006', u'average_base'], + [None, u'1248', u'103228432000', u'103228432000', u'type(20570500)'], + [None, + u'1248', + u'130801442692895024', + u'130801442692895024', + u'type(40030500)'], + [None, u'1250', u'7908', u'7908', u'counter']] + + +discovery = {'': [('SUMMARY', 'diskstat_default_levels')]} + + +checks = { + '': [ + ('SUMMARY', {}, [ + (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0, None, None, None, None)]), + (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0, None, None, None, None)]), + (0, 'Average Read Queue Length: 0.00', [('disk_read_ql', 0.0, None, None, None, None)]), + (0, 'Average Write Queue Length: 0.00', [('disk_write_ql', 0.0, None, None, None, None)]), + (0, 'Read operations: 0.00 1/s', [('disk_read_ios', 0.0, None, None, None, None)]), + (0, 'Write operations: 0.00 1/s', [('disk_write_ios', 0.0, None, None, None, None)]), + ]), + ('SUMMARY', {"read_ios": (-2, 2), "write_ios": (-4, -2)}, [ + (0, 'Read: 0.00 B/s', [('disk_read_throughput', 0.0, None, None, None, None)]), + (0, 'Write: 0.00 B/s', [('disk_write_throughput', 0.0, None, None, None, None)]), + (0, 'Average Read Queue Length: 0.00', [('disk_read_ql', 0.0, None, None, None, None)]), + (0, 'Average Write Queue Length: 0.00', [('disk_write_ql', 0.0, None, None, None, None)]), + (1, 'Read operations: 0.00 1/s (warn/crit at -2.00 1/s/2.00 1/s)', [ + ('disk_read_ios', 0.0, -2, 2, None, None)]), + (2, 'Write operations: 0.00 1/s (warn/crit at -4.00 1/s/-2.00 1/s)', [ + ('disk_write_ios', 0.0, -4, -2, None, None)]), + ]), + ], +}

5 years, 6 months

Fix issue in recent page registration change + regression test

by Lars Michelsen

Module: check_mk Branch: master Commit: 39a46945dd6b1587322920a66983f2be5e003795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39a46945dd6b15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 11:55:18 2019 +0200 Fix issue in recent page registration change + regression test Change-Id: I8f784828b4ad848c20365cd1b6beff71c239b9ab --- cmk/gui/pages.py | 4 ++-- tests/unit/cmk/gui/test_pages.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk/gui/pages.py b/cmk/gui/pages.py index 774cde3..2f50cad 100644 --- a/cmk/gui/pages.py +++ b/cmk/gui/pages.py @@ -147,7 +147,7 @@ def get_page_handler(name, dflt=None): In case dflt is given it returns dflt instead of None when there is no page handler for the requested name.""" - handle_class = page_registry.get(name, dflt) + handle_class = page_registry.get(name) if handle_class is None: - return None + return dflt return lambda: handle_class().handle_page() diff --git a/tests/unit/cmk/gui/test_pages.py b/tests/unit/cmk/gui/test_pages.py index f3da112..16e78ca 100644 --- a/tests/unit/cmk/gui/test_pages.py +++ b/tests/unit/cmk/gui/test_pages.py @@ -190,3 +190,8 @@ def test_page_registry_register_page(monkeypatch, capsys): handler().handle_page() assert capsys.readouterr()[0] == "234" + + +def test_get_page_handler_default(): + handler = cmk.gui.pages.get_page_handler("123handler", "XYZ") + assert handler == "XYZ"

5 years, 6 months

Group Nagios paths into a struct.

by Sven Panne

Module: check_mk Branch: master Commit: d741bcc34588a41eb463e9e133567c079b38d7df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d741bcc34588a4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 11:26:58 2019 +0200 Group Nagios paths into a struct. Change-Id: Ieb483a069ae0ba4971c477087db765bb46b0a805 --- livestatus/src/module.cc | 135 ++++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d741bcc345…

5 years, 6 months

Group Nagios limits into a struct.

by Sven Panne

Module: check_mk Branch: master Commit: e034a1869e9eb9ccd7e430d8490c06fc4551bc90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e034a1869e9eb9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 8 11:31:26 2019 +0200 Group Nagios limits into a struct. Change-Id: I9ee4e9666dde68c2fff2ba50632484fa6f8dc2a7 --- livestatus/src/module.cc | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index a278702..3e0b28b 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -116,10 +116,18 @@ struct ThreadInfo { static std::vector<ThreadInfo> fl_thread_info; static thread_local ThreadInfo *tl_info; -size_t fl_max_cached_messages = 500000; -// do never read more than that number of lines from a logfile -static size_t fl_max_lines_per_logfile = 1000000; -size_t fl_max_response_size = 100 * 1024 * 1024; // limit answer to 10 MB + +struct NagiosLimits { + size_t _max_cached_messages; + size_t _max_lines_per_logfile; + size_t _max_response_size; +}; +static NagiosLimits fl_limits{ + ._max_cached_messages = 500000, + ._max_lines_per_logfile = 1000000, + ._max_response_size = 100 * 1024 * 1024, +}; + int g_thread_running = 0; static AuthorizationKind fl_service_authorization = AuthorizationKind::loose; static AuthorizationKind fl_group_authorization = AuthorizationKind::strict; @@ -622,7 +630,7 @@ public: } size_t maxLinesPerLogFile() const override { - return fl_max_lines_per_logfile; + return fl_limits._max_lines_per_logfile; } Command find_command(const std::string &name) const override { @@ -687,8 +695,10 @@ public: } Encoding dataEncoding() override { return fl_data_encoding; } - size_t maxResponseSize() override { return fl_max_response_size; } - size_t maxCachedMessages() override { return fl_max_cached_messages; } + size_t maxResponseSize() override { return fl_limits._max_response_size; } + size_t maxCachedMessages() override { + return fl_limits._max_cached_messages; + } // TODO(sp) Unused in Livestatus NEB: Strange & ugly... AuthorizationKind hostAuthorization() const override { @@ -1010,25 +1020,26 @@ void livestatus_parse_arguments(const char *args_orig) { } else if (strcmp(left, "mkeventd_socket_path") == 0) { fl_paths._mkeventd_socket_path = right; } else if (strcmp(left, "max_cached_messages") == 0) { - fl_max_cached_messages = strtoul(right, nullptr, 10); + fl_limits._max_cached_messages = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting max number of cached log messages to " - << fl_max_cached_messages; + << fl_limits._max_cached_messages; } else if (strcmp(left, "max_lines_per_logfile") == 0) { - fl_max_lines_per_logfile = strtoul(right, nullptr, 10); + fl_limits._max_lines_per_logfile = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting max number lines per logfile to " - << fl_max_lines_per_logfile; + << fl_limits._max_lines_per_logfile; } else if (strcmp(left, "thread_stack_size") == 0) { g_thread_stack_size = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting size of thread stacks to " << g_thread_stack_size; } else if (strcmp(left, "max_response_size") == 0) { - fl_max_response_size = strtoul(right, nullptr, 10); + fl_limits._max_response_size = strtoul(right, nullptr, 10); Notice(fl_logger_nagios) << "setting maximum response size to " - << fl_max_response_size << " bytes (" - << (fl_max_response_size / (1024.0 * 1024.0)) << " MB)"; + << 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); if (c <= 0 || c > 1000) {

5 years, 6 months

← Newer
1
...
37
38
39
40
41
42
43
...
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