Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

[CMK-1791] - move some annoying logs into trace group

by Sergey Kipnis

Module: check_mk Branch: master Commit: 3ad86a9c5271c891cd55bd78d58a4b7b7d5f2eaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ad86a9c5271c8… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Mar 28 09:15:26 2019 +0100 [CMK-1791] - move some annoying logs into trace group Change-Id: I5046353035da9c5d723b91bd0597e18c929eb645 --- agents/wnx/src/engine/providers/ps.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/wnx/src/engine/providers/ps.cpp b/agents/wnx/src/engine/providers/ps.cpp index c3f061a..53554b3 100644 --- a/agents/wnx/src/engine/providers/ps.cpp +++ b/agents/wnx/src/engine/providers/ps.cpp @@ -83,7 +83,7 @@ std::string ExtractProcessOwner(HANDLE Process) { HANDLE raw_handle = INVALID_HANDLE_VALUE; if (!::OpenProcessToken(Process, TOKEN_READ, &raw_handle)) { - XLOG::l.w("Failed to open process to get a token {} ", GetLastError()); + XLOG::t.w("Failed to open process to get a token {} ", GetLastError()); return {}; } ON_OUT_OF_SCOPE(CloseHandle(raw_handle)); @@ -228,7 +228,7 @@ std::string GetProcessOwner(int64_t ProcessId) { auto owner = ExtractProcessOwner(process_handle); if (owner.empty()) { - XLOG::l.t("Owner of {} is empty, assuming system", process_id); + XLOG::t.t("Owner of {} is empty, assuming system", process_id); return "SYSTEM"; }

5 years, 3 months

Integration tests for rrdtool

by Óscar Nájera

Module: check_mk Branch: master Commit: e05f0d9ee0ca46be65df5ad795f86edcbe0569a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e05f0d9ee0ca46… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Mar 18 18:42:32 2019 +0100 Integration tests for rrdtool - Test python binding for direct memory access - Test CLI export tool for matching representation of memory - Update core RRDcolumn comments and behavior CMK-1837 Change-Id: I3e7e4cca64e64a193c37d62dc68d7a41b68102ff --- tests/integration/omd/test_rrdtool.py | 170 ++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/tests/integration/omd/test_rrdtool.py b/tests/integration/omd/test_rrdtool.py new file mode 100644 index 0000000..59bedfe --- /dev/null +++ b/tests/integration/omd/test_rrdtool.py @@ -0,0 +1,170 @@ +""" +Test the rrdtool python binding and CLI + +This tests works on the rrdtool itself and is not related to our +livestatus. It is just a simpler test to keep things working the way we +understand them today. This same message is on RRDColumn.cc + + +XPORT takes a closed timewindow in its query and returns the timestamped +values that represent an intersection with the query window. The returned +interval description is right closed. + +The timestamps associated with a value in RRDtool ALWAYS represent the time +the sample was taken. Since any value you sample will represent some sort +of past state your sampling apparatus has gathered, the timestamp will +always be at the end of the sampling period. + +LEGEND +O timestamps of measurements +| query values, _start_time and _end_time +x returned start, no data contained +v returned data rows, includes end y + +--O---O---O---O---O---O---O---O + |---------------| + x---v---v---v---v---y +""" +import subprocess +import pytest + +import rrdtool + + +(a)pytest.fixture(scope="session") +def rrd_database(tmp_path_factory): + "Create rrd database for integration test" + database = tmp_path_factory.mktemp("databases") / "test.rrd" + + # Choosing a time that is easy on the eyes on the terminal + # Fri Jul 14 04:40:00 CEST 2017 + start = 1500000000 + + rrdtool.create([ + str(database), + "--start", + str(start - 60), + "--step", + "10s", + "DS:one:GAUGE:100:0:100000000", + "RRA:AVERAGE:0.5:1:10", + "RRA:AVERAGE:0.5:4:10", + ]) + + for i in range(0, 401, 10): + rrdtool.update([str(database), "-t", "one", "%i:%i" % (start + i, i)]) + return database + + +(a)pytest.mark.parametrize("bounds, result", [ + pytest.param( + (1500000343, 1500000401), { + "data": [(350.0,), (360.0,), (370.0,), (380.0,), (390.0,), (400.0,), (None,)], + "meta": { + "start": 1500000340, + "end": 1500000410, + "step": 10, + "rows": 7, + "columns": 1, + "legend": [""], + } + }, + id="High res"), + pytest.param( + (1500000066, 1500000360), { + "data": [(65.0,), (105.0,), (145.0,), (185.0,), (225.0,), (265.0,), (305.0,), (345.0,)], + "meta": { + "start": 1500000040, + "end": 1500000360, + "step": 40, + "rows": 8, + "columns": 1, + "legend": [""], + } + }, + id="Low res, large span"), + pytest.param( + (1500000022, 1500000048), { + "data": [(25.0,), (65.0,)], + "meta": { + "start": 1500000000, + "end": 1500000080, + "step": 40, + "rows": 2, + "columns": 1, + "legend": [""], + } + }, + id="Low res, old data"), +]) +def test_xport(rrd_database, bounds, result): + "Test python binding and that direct memory access behaves correctly" + qstart, qend = bounds + assert (rrdtool.xport([ + "DEF:fir=%s:one:AVERAGE" % rrd_database, + "XPORT:fir", + "-s", + str(qstart), + "-e", + str(qend), + ]) == result) + + +(a)pytest.mark.parametrize("bounds, out_fmt, result", [ + pytest.param((1500000322, 1500000378), ["-t", "--json"], + """{ "about": "RRDtool graph JSON output", + "meta": { + "start": 1500000320, + "end": 1500000380, + "step": 10, + "legend": [ + "" + ] + }, + "data": [ + [ "1500000330",3.3000000000e+02 ], + [ "1500000340",3.4000000000e+02 ], + [ "1500000350",3.5000000000e+02 ], + [ "1500000360",3.6000000000e+02 ], + [ "1500000370",3.7000000000e+02 ], + [ "1500000380",3.8000000000e+02 ] + ] +}\n""", + id="JSON output"), + pytest.param((1500000126, 1500000158), ["-t"], + """<?xml version="1.0" encoding="ISO-8859-1"?>\n +<xport> + <meta> + <start>1500000120</start> + <end>1500000160</end> + <step>40</step> + <rows>1</rows> + <columns>1</columns> + <legend> + <entry></entry> + </legend> + </meta> + <data> + <row><t>1500000160</t><v>1.4500000000e+02</v></row> + </data> +</xport>\n""", + id="XML output"), +]) +def test_cli_xport(rrd_database, bounds, out_fmt, result): + """Test CLI so that when debugging output from tool it matches state in memory + + RRDTool composes the XML/JSON outputs explicitly and one may rely for + now that the order of elements be always the same.""" + qstart, qend = bounds + stdout = subprocess.check_output([ + 'rrdtool', + "xport", + "DEF:fir=%s:one:AVERAGE" % rrd_database, + "XPORT:fir", + "-s", + str(qstart), + "-e", + str(qend), + ] + out_fmt) + + assert stdout == result

5 years, 3 months

Web-API: Set Access-Control-Allow-Origin header

by Lars Michelsen

Module: check_mk Branch: master Commit: a6fd1dacb2642580f28c576481efb2be6436019a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6fd1dacb26425… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 27 18:15:32 2019 +0100 Web-API: Set Access-Control-Allow-Origin header This header is set to make cross origin HTTP requests possible when using browsers as clients for the web API. Change-Id: I013da001b150a07426ff802b2d31d78ca0005872 --- cmk/gui/webapi.py | 2 ++ tests/testlib/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index c1e246f..86623d2 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -119,6 +119,8 @@ _FORMATTERS = { @cmk.gui.pages.register("webapi") def page_api(): try: + html.response.headers["Access-Control-Allow-Origin"] = "*" + pretty_print = False if not html.request.has_var("output_format"): html.set_output_format("json") diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 3153e0f..5dbe663 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1284,6 +1284,8 @@ class CMKWebSession(WebSession): else: raise NotImplementedError() + assert req.headers["access-control-allow-origin"] == "*" + if not expect_error: assert response["result_code"] == 0, \ "An error occured: %r" % response

5 years, 3 months

7331 FIX Fixed decreased performance in host / service views since 1.5.0p5

by Lars Michelsen

Module: check_mk Branch: master Commit: 14d8dbca7bb2f68cb0c18adc1c45c7c46fe664d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d8dbca7bb2f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 28 14:28:37 2019 +0100 7331 FIX Fixed decreased performance in host / service views since 1.5.0p5 When using the HW/SW inventory the performance of views, especially in distributed setups with slower responding sites, could be decreased significantly because the GUI performed too many livestatus requests in the background. This was caused by werk #6594 which was added in 1.5.0p5. CMK-1861 Change-Id: If4c7b04a09b516706dab20968d46bdfbd7e4c4d5 --- .werks/7331 | 16 ++++++++++++++++ cmk/gui/plugins/views/inventory.py | 24 ++++++++++++++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.werks/7331 b/.werks/7331 new file mode 100644 index 0000000..f29d031 --- /dev/null +++ b/.werks/7331 @@ -0,0 +1,16 @@ +Title: Fixed decreased performance in host / service views since 1.5.0p5 +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553774075 + +When using the HW/SW inventory the performance of views, especially in +distributed setups with slower responding sites, could be decreased +significantly because the GUI performed too many livestatus requests in the +background. + +This was caused by werk #6594 which was added in 1.5.0p5. diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index 5bd54e9..24edb67 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -36,7 +36,7 @@ import cmk.gui.sites as sites import cmk.gui.utils as utils import cmk.gui.inventory as inventory from cmk.gui.i18n import _ -from cmk.gui.globals import html +from cmk.gui.globals import html, current_app from cmk.gui.htmllib import HTML from cmk.gui.valuespec import Checkbox, Hostname from cmk.gui.exceptions import MKUserError @@ -1696,11 +1696,7 @@ def _create_view_enabled_check_func(invpath, is_history=False): # FIXME In order to decide whether this view is enabled # do we really need to load the whole tree? - if is_history: - struct_tree = inventory.load_filtered_inventory_tree(hostname) - else: - row = inventory.get_status_data_via_livestatus(context.get("site"), hostname) - struct_tree = inventory.load_filtered_and_merged_tree(row) + struct_tree = _get_struct_tree(is_history, hostname, context.get("site")) if not struct_tree: return False @@ -1720,6 +1716,22 @@ def _create_view_enabled_check_func(invpath, is_history=False): return _check_view_enabled +def _get_struct_tree(is_history, hostname, site_id): + struct_tree_cache = current_app.g.setdefault("struct_tree_cache", {}) + cache_id = (is_history, hostname, site_id) + if cache_id in struct_tree_cache: + return struct_tree_cache[cache_id] + + if is_history: + struct_tree = inventory.load_filtered_inventory_tree(hostname) + else: + row = inventory.get_status_data_via_livestatus(site_id, hostname) + struct_tree = inventory.load_filtered_and_merged_tree(row) + + struct_tree_cache[cache_id] = struct_tree + return struct_tree + + # Now declare Multisite views for a couple of embedded tables declare_invtable_view( "invswpac",

5 years, 3 months

7203 FIX agent_prism: Fixed handling of informational messages

by Ronny Bruska

Module: check_mk Branch: master Commit: ac5d1624756bf814bb88b3e1001c961ba9245ab4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac5d1624756bf8… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Mar 21 09:09:33 2019 +0100 7203 FIX agent_prism: Fixed handling of informational messages We have seen informational messages in format: {dev_type} drive {dev_name} on host {ip_address} has the following problems: {err_msg} In order to handle such cases, we now deal with this message format differently. Change-Id: I52ef1fcae1cae5d9ee558b0fd5fd51bf16524828 --- .werks/7203 | 15 +++++++++++ agents/special/agent_prism | 9 ++++++- checks/prism_alerts | 13 +++++++--- .../checks/generictests/datasets/prism_alerts.py | 30 ++++++++++++---------- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/.werks/7203 b/.werks/7203 new file mode 100644 index 0000000..3a83238 --- /dev/null +++ b/.werks/7203 @@ -0,0 +1,15 @@ +Title: agent_prism: Fixed handling of informational messages +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1553155607 +Class: fix + +We have seen informational messages in format: +{dev_type} drive {dev_name} on host {ip_address} has the following problems: {err_msg} + +In order to handle such cases, we now deal with this message format differently. + + diff --git a/agents/special/agent_prism b/agents/special/agent_prism index 65ac76c..ea51c52 100755 --- a/agents/special/agent_prism +++ b/agents/special/agent_prism @@ -164,7 +164,14 @@ def output_alerts(opener, headers): # actual values are stored in context_values, the keys in # context_types context = zip(entity['contextTypes'], entity['contextValues']) - message = entity['message'].format(**dict(context)) + # We have seen informational messages in format: + # {dev_type} drive {dev_name} on host {ip_address} has the following problems: {err_msg} + # In this case the keys have no values so we can not assign it to the message + # To handle this, we output a message without assigning the keys + try: + message = entity['message'].format(**dict(context)) + except KeyError: + message = entity['message'] writer.writerow([entity['createdTimeStampInUsecs'], message, entity['severity']]) diff --git a/checks/prism_alerts b/checks/prism_alerts index e7b3baf..be79ce2 100644 --- a/checks/prism_alerts +++ b/checks/prism_alerts @@ -40,7 +40,8 @@ def check_prism_alerts(__no_item, __no_params, parsed): return {'kInfo': (0, 0), 'kWarning': (1, 1), 'kCritical': (3, 2)}.get(name, (2, 3)) if len(parsed) == 0: - return 0, "No alerts" + yield 0, "No alerts" + return # sort messages by severity, then timestamp, both reversed # this way the first element should be the newest among those @@ -49,8 +50,14 @@ def check_prism_alerts(__no_item, __no_params, parsed): parsed, key=lambda x: (severity(x['severity'][0]), x['timestamp']), reverse=True) sever = row_sorted[0] time_str = time.strftime("%c", time.localtime(int(sever['timestamp']) / 1000000)) - return severity(sever['severity'])[1], "%d alerts, Last worst on %s: \"%s\"" %\ - (len(row_sorted), time_str, sever['message']) + yield severity(sever['severity'])[1], "%d alerts" % len(row_sorted) + + message = sever['message'] + if "has the following problems" in message: + state = 1 + else: + state = 0 + yield state, "Last worst on %s: \"%s\"" % (time_str, message) check_info['prism_alerts'] = { diff --git a/tests/unit/checks/generictests/datasets/prism_alerts.py b/tests/unit/checks/generictests/datasets/prism_alerts.py index 7b46263..41fe6d1 100644 --- a/tests/unit/checks/generictests/datasets/prism_alerts.py +++ b/tests/unit/checks/generictests/datasets/prism_alerts.py @@ -1,19 +1,23 @@ # yapf: disable + + checkname = 'prism_alerts' -info = [ - ['timestamp', 'message', 'severity'], - [ - '1456749413140000', - 'DIMM fault detected on host 172.25.209.110. The node is running with 384 GB whereas 512 GB was installed.', - 'kCritical' - ], ['1456749413150000', 'Some warning message.', 'kWarning'], - ['1456749413160000', 'Some info message.', 'kInfo'] -] + +info = [['timestamp', 'message', 'severity'], + ['1456749413140000', + 'DIMM fault detected on host 172.25.209.110. The node is running with 384 GB whereas 512 GB was installed.', + 'kCritical'], + ['1456749413150000', 'Some warning message.', 'kWarning'], + ['1456749413160000', 'Some info message.', 'kInfo']] + discovery = {'': [(None, None)]} -checks = { - '': [(None, {}, [(0, '3 alerts, Last worst on Mon Feb 29 13:36:53 2016: "Some info message."', - [])])] -} + +checks = {'': [(None, + {}, + [(0, '3 alerts', []), + (0, + 'Last worst on Mon Feb 29 13:36:53 2016: "Some info message."', + [])])]} \ No newline at end of file

5 years, 3 months

Patch rrdtool xport

by Óscar Nájera

Module: check_mk Branch: master Commit: 50ebf44b0b8f5ad5217245db1c5dbcf8a3491e0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50ebf44b0b8f5a… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Tue Mar 26 14:04:17 2019 +0100 Patch rrdtool xport Changes the bounds for recovering data from the image struct. This allows to obtain enough datapoints to reconstruct measured states in the queried time window. Github PR#980 https://github.com/oetiker/rrdtool-1.x/pull/980 Patch includes clang formatting of file done after v1.7.1 Change-Id: Ic89a46995f56ce8edb95212dd5e4ea63d71fb7c3 --- .../rrdtool/patches/0003-fix-xport-range.dif | 1892 ++++++++++++++++++++ 1 file changed, 1892 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=50ebf44b0b…

5 years, 3 months

GUI CSS: Moved wiki and quicksearch snapin styles to _snapins.scss and got rid of some !important styles (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 57eca2bcb4cba9d25e1c5f0208d6c8f7bc0869f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57eca2bcb4cba9… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Mar 27 13:00:26 2019 +0100 GUI CSS: Moved wiki and quicksearch snapin styles to _snapins.scss and got rid of some !important styles (CMK-1171) Change-Id: I4c10544dd926064fc15d8645e20d8b09793fda6d --- .../themes/classic/scss/_sidebar_quicksearch.scss | 109 ----------------- web/htdocs/themes/classic/scss/_sidebar_wiki.scss | 70 ----------- web/htdocs/themes/classic/scss/_snapins.scss | 132 +++++++++++++++++++++ web/htdocs/themes/classic/theme.scss | 2 - web/htdocs/themes/facelift/scss/_sidebar.scss | 101 +--------------- web/htdocs/themes/facelift/scss/_snapins.scss | 119 +++++++++++++++++-- 6 files changed, 245 insertions(+), 288 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57eca2bcb4…

5 years, 3 months

GUI CSS: Removed snapin styles from py modules and added a _snapins.scss for the classic theme (CMK-1171)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 58c0db02858fca25ce81319c4c917fb86245cd8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58c0db02858fca… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Wed Mar 27 12:07:27 2019 +0100 GUI CSS: Removed snapin styles from py modules and added a _snapins.scss for the classic theme (CMK-1171) Change-Id: Id6e128281315df2c3d077528fa77df540964b7fa --- cmk/gui/plugins/sidebar/bookmarks.py | 13 - cmk/gui/plugins/sidebar/custom_links.py | 14 - cmk/gui/plugins/sidebar/host_matrix.py | 8 - cmk/gui/plugins/sidebar/hosts.py | 6 - cmk/gui/plugins/sidebar/master_control.py | 28 -- cmk/gui/plugins/sidebar/mkeventd.py | 31 -- cmk/gui/plugins/sidebar/nagvis_maps.py | 22 -- cmk/gui/plugins/sidebar/performance.py | 26 -- cmk/gui/plugins/sidebar/server_time.py | 16 - cmk/gui/plugins/sidebar/site_status.py | 33 -- cmk/gui/plugins/sidebar/speedometer.py | 20 -- cmk/gui/plugins/sidebar/tactical_overview.py | 53 ---- cmk/gui/plugins/sidebar/virtual_host_tree.py | 59 ---- cmk/gui/plugins/sidebar/wato.py | 38 --- web/htdocs/themes/classic/scss/_snapins.scss | 429 ++++++++++++++++++++++++++ web/htdocs/themes/classic/theme.scss | 1 + web/htdocs/themes/facelift/scss/_snapins.scss | 70 ++--- 17 files changed, 461 insertions(+), 406 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=58c0db0285…

5 years, 3 months

Update rrdtool from 1.7.0 to 1.7.1.

by Alex Zurhake

Module: check_mk Branch: master Commit: 18aab0110fae1081df211f680f37b5bb8e9880c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18aab0110fae10… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 14 08:18:15 2019 +0100 Update rrdtool from 1.7.0 to 1.7.1. rrdtool update from version 1.7.0 to 1.7.1 because a major bug was fixed in this version. Commit 865a9bade72f93cf72ca59954c6df01e8c48915d from the upstream repository is applied as patch during build time. This Fix will be included in rrdtool 1.7.2. Change-Id: I7347b78c0e904962ce81c3904d174134a75a4e3b --- ...no-rule-to-make-target-etc-rrdcached.socket.dif | 28 +++++++++++++++++++++ omd/packages/rrdtool/rrdtool-1.7.0.tar.gz | Bin 2749855 -> 0 bytes omd/packages/rrdtool/rrdtool-1.7.1.tar.gz | Bin 0 -> 2881346 bytes omd/packages/rrdtool/rrdtool.make | 2 +- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/omd/packages/rrdtool/patches/0002-fixed-no-rule-to-make-target-etc-rrdcached.socket.dif b/omd/packages/rrdtool/patches/0002-fixed-no-rule-to-make-target-etc-rrdcached.socket.dif new file mode 100644 index 0000000..e0c6a4a --- /dev/null +++ b/omd/packages/rrdtool/patches/0002-fixed-no-rule-to-make-target-etc-rrdcached.socket.dif @@ -0,0 +1,28 @@ +diff -Naur rrdtool-1.7.1.orig/etc/Makefile.am rrdtool-1.7.1/etc/Makefile.am +--- rrdtool-1.7.1.orig/etc/Makefile.am 2019-03-14 08:13:47.071098825 +0100 ++++ rrdtool-1.7.1/etc/Makefile.am 2019-03-14 08:14:04.635009536 +0100 +@@ -3,6 +3,6 @@ + + if HAVE_SYSTEMD + systemdsystemunit_DATA = \ +- etc/rrdcached.socket \ +- etc/rrdcached.service +-endif +\ No newline at end of file ++ rrdcached.socket \ ++ rrdcached.service ++endif +diff -Naur rrdtool-1.7.1.orig/etc/Makefile.in rrdtool-1.7.1/etc/Makefile.in +--- rrdtool-1.7.1.orig/etc/Makefile.in 2019-03-14 08:13:47.071098825 +0100 ++++ rrdtool-1.7.1/etc/Makefile.in 2019-03-14 08:14:15.266954056 +0100 +@@ -368,8 +368,8 @@ + rrdcached.socket.in rrdcached.service.in + + @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \ +-@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service ++@HAVE_SYSTEMD_TRUE@ rrdcached.socket \ ++@HAVE_SYSTEMD_TRUE@ rrdcached.service + + all: all-am + diff --git a/omd/packages/rrdtool/rrdtool-1.7.0.tar.gz b/omd/packages/rrdtool/rrdtool-1.7.0.tar.gz deleted file mode 100644 index 3f31c19..0000000 Binary files a/omd/packages/rrdtool/rrdtool-1.7.0.tar.gz and /dev/null differ diff --git a/omd/packages/rrdtool/rrdtool-1.7.1.tar.gz b/omd/packages/rrdtool/rrdtool-1.7.1.tar.gz new file mode 100644 index 0000000..8a0f4be Binary files /dev/null and b/omd/packages/rrdtool/rrdtool-1.7.1.tar.gz differ diff --git a/omd/packages/rrdtool/rrdtool.make b/omd/packages/rrdtool/rrdtool.make index 0ce7129..69b6f04 100644 --- a/omd/packages/rrdtool/rrdtool.make +++ b/omd/packages/rrdtool/rrdtool.make @@ -1,6 +1,6 @@ RRDTOOL := rrdtool # Note: We actually use the snapshot f1edd121a from 2017-06-11 -RRDTOOL_VERS := 1.7.0 +RRDTOOL_VERS := 1.7.1 RRDTOOL_DIR := $(RRDTOOL)-$(RRDTOOL_VERS) RRDTOOL_BUILD := $(BUILD_HELPER_DIR)/$(RRDTOOL_DIR)-build

5 years, 3 months

Remove narrow style from check plugin list

by Mathias Kettner

Module: check_mk Branch: master Commit: 695443a1efdffa39c6f00aa28ec03464fb0eeb7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=695443a1efdffa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 28 10:45:56 2019 +0100 Remove narrow style from check plugin list This is in the renderer for our homepage --- cmk/utils/man_pages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/utils/man_pages.py b/cmk/utils/man_pages.py index e7d73f4..94aa6f8 100644 --- a/cmk/utils/man_pages.py +++ b/cmk/utils/man_pages.py @@ -819,7 +819,7 @@ class NowikiManPageRenderer(ManPageRenderer): self.output = StringIO.StringIO() def index_entry(self): - return "<tr><td class=\"tt narrow\">%s</td><td>[check_%s|%s]</td></tr>\n" % \ + return "<tr><td class=\"tt\">%s</td><td>[check_%s|%s]</td></tr>\n" % \ (self.name, self.name, self.man_page["header"]["title"]) def render(self):

5 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019