Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Updated werk 5607 and minor cleanup of paint functions

by Simon Betz

Module: check_mk Branch: master Commit: 47aeaaf7b66e681b4743309c8024af90dc7b84d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47aeaaf7b66e68… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 13 12:46:38 2018 +0100 Updated werk 5607 and minor cleanup of paint functions Change-Id: I7d7652bd74ea08e57c527b1bfcb0ff2b5eb81dae --- .werks/5607 | 4 +- cmk/structured_data.py | 61 ++++++++++-- web/htdocs/inventory.py | 13 +-- web/htdocs/wato.py | 25 +++-- web/plugins/views/inventory.py | 220 ++++++++++++++++++++++++----------------- 5 files changed, 209 insertions(+), 114 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47aeaaf7b6…

6 years, 4 months

Fixed merge bug.

by Sven Panne

Module: check_mk Branch: master Commit: d6134cbfaaa9d7d98143d8bb3977103bbfc58d7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6134cbfaaa9d7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 14 15:21:51 2018 +0100 Fixed merge bug. Change-Id: I05fe52047b05747aa361c0933066bfb0c9cee91f --- bin/mkeventd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index b173ac8..2c2ace5 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -207,19 +207,19 @@ def convert_history_line(values): else: values[22] = unsplit(values[22]) if num_values <= 23: # event_ipaddress - values.append(history_columns[24][1]) + values.append(StatusTableHistory.columns[24][1]) if num_values <= 24: # event_orig_host - values.append(history_columns[25][1]) + values.append(StatusTableHistory.columns[25][1]) if num_values <= 25: # event_contact_groups_precedence - values.append(history_columns[26][1]) + values.append(StatusTableHistory.columns[26][1]) if num_values <= 26: # event_core_host - values.append(history_columns[27][1]) + values.append(StatusTableHistory.columns[27][1]) if num_values <= 27: # event_host_in_downtime - values.append(history_columns[28][1]) + values.append(StatusTableHistory.columns[28][1]) else: values[27] = values[27] == "1" if num_values <= 28: # event_match_groups_syslog_application - values.append(history_columns[29][1]) + values.append(StatusTableHistory.columns[29][1]) else: values[28] = unsplit(values[28])

6 years, 4 months

Handle history files from older EC versions, which have fewer columns.

by Sven Panne

Module: check_mk Branch: master Commit: 2b05636ddbbba3ebefc267e50d06727b31bb8b7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b05636ddbbba3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 14 14:54:15 2018 +0100 Handle history files from older EC versions, which have fewer columns. Change-Id: Id7dba3fcb2416f5a89a9ad496c3bc97b95a61c6c --- bin/mkeventd | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2fbc162..b173ac8 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -189,6 +189,7 @@ def unsplit(s): # Speed-critical function for converting string representation # of log line back to Python values def convert_history_line(values): + # NOTE: history_line column is missing here, so indices are off by 1! :-P values[0] = float(values[0]) # history_time values[4] = int(values[4]) # event_id values[5] = int(values[5]) # event_count @@ -200,16 +201,27 @@ def convert_history_line(values): values[16] = int(values[16]) # event_facility values[18] = int(values[18]) # event_state values[21] = unsplit(values[21]) # event_match_groups - if len(values) >= 23: - values[22] = unsplit(values[22]) # event_contact_groups - else: + num_values = len(values) + if num_values <= 22: # event_contact_groups values.append(None) - - if len(values) >= 28: - values[27] = values[27] == "1" # event_host_in_downtime - - if len(values) >= 29: - values[28] = unsplit(values[28]) # event_match_groups_syslog_application + else: + values[22] = unsplit(values[22]) + if num_values <= 23: # event_ipaddress + values.append(history_columns[24][1]) + if num_values <= 24: # event_orig_host + values.append(history_columns[25][1]) + if num_values <= 25: # event_contact_groups_precedence + values.append(history_columns[26][1]) + if num_values <= 26: # event_core_host + values.append(history_columns[27][1]) + if num_values <= 27: # event_host_in_downtime + values.append(history_columns[28][1]) + else: + values[27] = values[27] == "1" + if num_values <= 28: # event_match_groups_syslog_application + values.append(history_columns[29][1]) + else: + values[28] = unsplit(values[28]) filter_operators = { @@ -3447,10 +3459,10 @@ class StatusTableEvents(StatusTable): ("event_state", 0), ("event_phase", ""), ("event_owner", ""), - ("event_match_groups", ""), - ("event_contact_groups", ""), - ("event_ipaddress", ""), # introduced in 1.2.7 - ("event_orig_host", ""), + ("event_match_groups", ""), # last column up to 1.2.4 + ("event_contact_groups", ""), # introduced in 1.2.5i2 + ("event_ipaddress", ""), # introduced in 1.2.7i1 + ("event_orig_host", ""), # introduced in 1.4.0b1 ("event_contact_groups_precedence", "host"), # introduced in 1.4.0b1 ("event_core_host", ""), # introduced in 1.5.0i1 ("event_host_in_downtime", False), # introduced in 1.5.0i1

6 years, 4 months

5670 FIX Handle history files from older EC versions, which have fewer columns.

by Sven Panne

Module: check_mk Branch: master Commit: 2e668363a60e11a84d351ddd2107e784598a3050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e668363a60e11… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 14 15:06:26 2018 +0100 5670 FIX Handle history files from older EC versions, which have fewer columns. History files written by older versions of the EC might contain fewer columns than a newer EC handles. This fix fills these missing columns with their default values, avoiding log messages like unknown precedence '' in table eventconsolehistory in cmc.log later. Change-Id: Id398754912cbde145e3f070030d227bd5bdc37f5 --- .werks/5670 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5670 b/.werks/5670 new file mode 100644 index 0000000..c139ed24 --- /dev/null +++ b/.werks/5670 @@ -0,0 +1,16 @@ +Title: Handle history files from older EC versions, which have fewer columns. +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1518616944 +Class: fix + +History files written by older versions of the EC might contain fewer +columns than a newer EC handles. This fix fills these missing columns with +their default values, avoiding log messages like + + unknown precedence '' in table eventconsolehistory + +in cmc.log later.

6 years, 4 months

5730 Graph export can now use custom consolidation function

by Lars Michelsen

Module: check_mk Branch: master Commit: ea71f18ae47a57d5f475bd3ef3b3db36ec5a31ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea71f18ae47a57… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 14 12:03:47 2018 +0100 5730 Graph export can now use custom consolidation function In addition to werk #8643 it is now possible to provide the optional key <tt>consolidation_function</tt> to control which consolidation function should be used when calculating aggregated numbers. Possible values are: <ul> <li><tt>"consolidation_function": "max"</tt> - The default</li> <li><tt>"consolidation_function": "min"</tt></li> <li><tt>"consolidation_function": "average"</tt></li> </ul> Change-Id: I0d44dbb0abfff1df7f729a776fda1ee457638c2a --- .werks/5730 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.werks/5730 b/.werks/5730 new file mode 100644 index 0000000..38c7242 --- /dev/null +++ b/.werks/5730 @@ -0,0 +1,20 @@ +Title: Graph export can now use custom consolidation function +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518605998 +Class: feature + +In addition to werk #8643 it is now possible to provide the optional key +<tt>consolidation_function</tt> to control which consolidation function +should be used when calculating aggregated numbers. + +Possible values are: + +<ul> + <li><tt>"consolidation_function": "max"</tt> - The default</li> + <li><tt>"consolidation_function": "min"</tt></li> + <li><tt>"consolidation_function": "average"</tt></li> +</ul>

6 years, 4 months

5272 Make Real-Timer-Helper Pool configurable

by Andreas Umbreit

Module: check_mk Branch: master Commit: 1769f68503646c7f206f449018d635260d5f1208 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1769f68503646c… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Jan 23 11:17:58 2018 +0100 5272 Make Real-Timer-Helper Pool configurable The number of Maximum concurrent Real-Time checks is now configurable. You can change the setting on the GUI at Global Settings - Monitoring Core. Default value is set to 1, which preserves the previous behavior. Change-Id: Ie19c006f62e9484967f67a685dd73936a466e5dd --- .werks/5272 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5272 b/.werks/5272 new file mode 100644 index 0000000..849f917 --- /dev/null +++ b/.werks/5272 @@ -0,0 +1,13 @@ +Title: Make Real-Timer-Helper Pool configurable +Level: 1 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518601423 +Class: feature + +The number of Maximum concurrent Real-Time checks is now configurable. + +You can change the setting on the GUI at Global Settings - Monitoring Core. +Default value is set to 1, which preserves the previous behavior.

6 years, 4 months

Make RegExp movable.

by Sven Panne

Module: check_mk Branch: master Commit: 775abd15d9913a2a70aca04572428cd3bd89c166 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=775abd15d9913a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 14 11:36:37 2018 +0100 Make RegExp movable. This is easy to do and opens up more STL usage. Note that RegExp is still *not* copyable. The (perhaps) underlying RE2 object is not copyable either, and for a good reason: The object might be very costly to copy, and we want to avoid accidental copies. Change-Id: Ie87a58753437a443c80450465feb8fd61699b8c3 --- livestatus/src/RegExp.cc | 4 ++++ livestatus/src/RegExp.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/livestatus/src/RegExp.cc b/livestatus/src/RegExp.cc index bac70a7..96d5f3e 100644 --- a/livestatus/src/RegExp.cc +++ b/livestatus/src/RegExp.cc @@ -95,6 +95,10 @@ RegExp::RegExp(const std::string &str, Case c) RegExp::~RegExp() = default; +RegExp::RegExp(RegExp &&rhs) noexcept = default; + +RegExp &RegExp::operator=(RegExp &&rhs) noexcept = default; + std::string RegExp::replace(const std::string &str, const std::string &replacement) const { return _impl->replace(str, replacement); diff --git a/livestatus/src/RegExp.h b/livestatus/src/RegExp.h index 216e642..3e6b77e 100644 --- a/livestatus/src/RegExp.h +++ b/livestatus/src/RegExp.h @@ -40,8 +40,8 @@ public: ~RegExp(); RegExp(const RegExp &rhs) = delete; RegExp &operator=(const RegExp &rhs) = delete; - RegExp(RegExp &&rhs) = delete; - RegExp &operator=(RegExp &&rhs) = delete; + RegExp(RegExp &&rhs) noexcept; + RegExp &operator=(RegExp &&rhs) noexcept; std::string replace(const std::string &str, const std::string &replacement) const;

6 years, 4 months

Removed dead code.

by Sven Panne

Module: check_mk Branch: master Commit: ca61afd09ec16cd60d62766f36c9ba2beba9185f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca61afd09ec16c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 14 09:18:31 2018 +0100 Removed dead code. We already have the right version, no need for some copy Kung Fu... Change-Id: I77db89d289900123b23714b51cad2fec28396cca --- omd/packages/monitoring-plugins/Makefile | 1 - .../monitoring-plugins/check_icmp-master.c | 1410 -------------------- .../check_icmp-master.c.LIESMICH | 3 - 3 files changed, 1414 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca61afd09e…

6 years, 4 months

Windows: fix test for unpacking binary plugins

by Jukka Aro

Module: check_mk Branch: master Commit: ee5ae68e83faae0b88f17b1fe2f27b7255fd2178 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee5ae68e83faae… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 14 09:52:14 2018 +0100 Windows: fix test for unpacking binary plugins --- agents/windows/it/test_agent_start_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/it/test_agent_start_parameters.py b/agents/windows/it/test_agent_start_parameters.py index 89a6d5c..837c6fa 100644 --- a/agents/windows/it/test_agent_start_parameters.py +++ b/agents/windows/it/test_agent_start_parameters.py @@ -247,7 +247,7 @@ def verify_plugin_output(): cmd = [os.path.join(Globals.testfiles[1], Globals.binaryplugin)] exit_code, stdout, stderr = run_subprocess(cmd) assert exit_code == 0, "'%s' failed" % Globals.binaryplugin - assert "Hello, World!\r\n" == stdout + assert "<<<monty_python>>>\r\nMonty Python's Flying Circus\r\n" == stdout assert len(stderr) == 0, "Expected empty stderr, got '%s'" % stderr

6 years, 4 months

Windows agent: use RAII for plugin groups

by Jukka Aro

Module: check_mk Branch: master Commit: e0aa8726e1d6df2d1e15fe83c912d0652a15bebc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0aa8726e1d6df… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Feb 14 09:11:12 2018 +0100 Windows agent: use RAII for plugin groups Manage filesystem resources with std::experimental::filesystem (C++17). --- agents/windows/sections/SectionPluginGroup.cc | 108 ++++++++++++-------------- agents/windows/sections/SectionPluginGroup.h | 19 +++-- 2 files changed, 61 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e0aa8726e1…

6 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018