Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

Use more IWYU mappings from IWYU repo. Various local tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: acf80c6cf38fa53598889312c58d2ec462a85fc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf80c6cf38fa5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 6 10:20:04 2017 +0100 Use more IWYU mappings from IWYU repo. Various local tweaks. Change-Id: If2c5d93e34f91614e9ce28065ded9b398f0bafb0 --- tests/iwyu-mappings/check_mk.imp | 27 +++- tests/iwyu-mappings/gcc.libc.imp | 205 ++++++++++++++++++++++++++++ tests/iwyu-mappings/gcc.stl.headers.imp | 228 ++++++++++++++++++++++++++++++++ tests/iwyu-mappings/gcc.symbols.imp | 154 +++++++++++++++++++++ tests/iwyu-mappings/stl.c.headers.imp | 42 ++++++ 5 files changed, 649 insertions(+), 7 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=acf80c6cf3…

6 years, 9 months

5525 FIX check_mk_agent.aix: Fix spoolfile handling

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5709c66881475ee4dbf8e4fb714ea8eba6591ddc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5709c66881475e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 6 17:13:30 2017 +0100 5525 FIX check_mk_agent.aix: Fix spoolfile handling Change-Id: Ieb9e4420a8fdad69c3ad907a52ba439e1b0ec324 --- .werks/5525 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5525 b/.werks/5525 new file mode 100644 index 0000000..cad5cb8 --- /dev/null +++ b/.werks/5525 @@ -0,0 +1,10 @@ +Title: check_mk_agent.aix: Fix spoolfile handling +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512576783 +Class: fix + +

6 years, 9 months

check_mk_agent.aix: Fix spoolfile handling

by Konstantin Büttner

Module: check_mk Branch: master Commit: e30bec497b4275c705ff4c87daa2e376ae8824fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30bec497b4275… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Oct 10 15:33:27 2017 +0200 check_mk_agent.aix: Fix spoolfile handling Change-Id: I7ccdbe58c105709d9887237053090576b8b01aaf --- agents/check_mk_agent.aix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 532b08f..42396d7 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -379,7 +379,7 @@ fi # Agent output snippets created by cronjobs, etc. if [ -d "$SPOOLDIR" ] then - pushd "$SPOOLDIR" > /dev/null + cd "$SPOOLDIR" > /dev/null now=$(date +%s) for file in * @@ -409,5 +409,5 @@ then # Output the file cat "$file" done - popd > /dev/null + cd - > /dev/null fi

6 years, 9 months

5452 FIX Highly improved performance of rendering large tables of HW/ SW inventory trees

by Simon Betz

Module: check_mk Branch: master Commit: 81415ac849f22732f6c4c9df19f0a673af753f9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81415ac849f227… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 6 14:23:27 2017 +0100 5452 FIX Highly improved performance of rendering large tables of HW/SW inventory trees This may also concern other pages or views. Change-Id: Iefad8e06d8c763e805e946a5e6ba76c030bb98ca --- .werks/5452 | 10 ++++++++++ web/htdocs/htmllib.py | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/5452 b/.werks/5452 new file mode 100644 index 0000000..8ebcba7 --- /dev/null +++ b/.werks/5452 @@ -0,0 +1,10 @@ +Title: Highly improved performance of rendering large tables of HW/SW inventory trees +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512566453 +Class: fix + +This may also concern other pages or views. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 65bcfdb..c11a0b9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -437,7 +437,7 @@ class OutputFunnel(object): raise MKGeneralException(_('Type Error: html.write accepts str and unicode input objects only!')) if self.is_plugged(): - self.plug_text[self.plug_level] += text + self.plug_text[self.plug_level].append(text) else: # encode when really writing out the data. Not when writing plugged, # because the plugged code will be handled somehow by our code. We @@ -465,7 +465,7 @@ class OutputFunnel(object): # Put in a plug which stops the text stream and redirects it to a sink. def plug(self): - self.plug_text.append('') + self.plug_text.append([]) self.plug_level += 1 @@ -478,8 +478,8 @@ class OutputFunnel(object): if not self.is_plugged(): return None - text = self.plug_text[self.plug_level] - self.plug_text[self.plug_level] = "" + text = "".join(self.plug_text[self.plug_level]) + self.plug_text[self.plug_level] = [] self.plug_level -= 1 self.write(text) self.plug_level += 1 @@ -490,8 +490,8 @@ class OutputFunnel(object): if not self.is_plugged(): return '' - text = self.plug_text[self.plug_level] - self.plug_text[self.plug_level] = '' + text = "".join(self.plug_text[self.plug_level]) + self.plug_text[self.plug_level] = [] return text

6 years, 9 months

ddn_s2a_statsdelay: Treat read/ write wait as 0 if no reads or writes occur within the check period

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8dd7419919a3e1610354fbdb633c7c9f903dc4fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dd7419919a3e1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 6 09:21:32 2017 +0100 ddn_s2a_statsdelay: Treat read/write wait as 0 if no reads or writes occur within the check period Change-Id: Icfc44566e678242bab43a46047a6e020ce7f654f --- checks/ddn_s2a_statsdelay | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/checks/ddn_s2a_statsdelay b/checks/ddn_s2a_statsdelay index 32c26ad..c0e220e 100644 --- a/checks/ddn_s2a_statsdelay +++ b/checks/ddn_s2a_statsdelay @@ -140,19 +140,23 @@ def check_ddn_s2a_statsdelay(item, params, parsed): read_min = histogram_min(time_intervals, reads_since_last_check) read_max = histogram_max(time_intervals, reads_since_last_check) read_avg = histogram_avg(time_intervals, reads_since_last_check) + else: + read_min, read_max, read_avg = 0, 0, 0 - yield check_levels("Average read wait: %.2f s", read_avg, params.get("read_avg"), "disk_average_read_wait") - yield check_levels("Min. read wait: %.2f s", read_min, params.get("read_min"), "disk_min_read_wait") - yield check_levels("Max. read wait: %.2f s", read_max, params.get("read_max"), "disk_max_read_wait") + yield check_levels("Average read wait: %.2f s", read_avg, params.get("read_avg"), "disk_average_read_wait") + yield check_levels("Min. read wait: %.2f s", read_min, params.get("read_min"), "disk_min_read_wait") + yield check_levels("Max. read wait: %.2f s", read_max, params.get("read_max"), "disk_max_read_wait") if not is_zero(writes_since_last_check): write_min = histogram_min(time_intervals, writes_since_last_check) write_max = histogram_max(time_intervals, writes_since_last_check) write_avg = histogram_avg(time_intervals, writes_since_last_check) + else: + read_min, read_max, read_avg = 0, 0, 0 - yield check_levels("Average write wait: %.2f s", write_avg, params.get("write_avg"), "disk_average_write_wait") - yield check_levels("Min. write wait: %.2f s", write_min, params.get("write_min"), "disk_min_write_wait") - yield check_levels("Max. write wait: %.2f s", write_max, params.get("write_max"), "disk_max_write_wait") + yield check_levels("Average write wait: %.2f s", write_avg, params.get("write_avg"), "disk_average_write_wait") + yield check_levels("Min. write wait: %.2f s", write_min, params.get("write_min"), "disk_min_write_wait") + yield check_levels("Max. write wait: %.2f s", write_max, params.get("write_max"), "disk_max_write_wait") check_info['ddn_s2a_statsdelay'] = {

6 years, 9 months

Fix last commit m(

by Konstantin Büttner

Module: check_mk Branch: master Commit: 44d31e2ce1e058c45dd5052a012d7c42c89dc220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44d31e2ce1e058… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 6 09:26:41 2017 +0100 Fix last commit m( Change-Id: Ic81f75e4d30682fdf746587535ec060feebc2865 --- checks/ddn_s2a_statsdelay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ddn_s2a_statsdelay b/checks/ddn_s2a_statsdelay index c0e220e..a3d347e 100644 --- a/checks/ddn_s2a_statsdelay +++ b/checks/ddn_s2a_statsdelay @@ -152,7 +152,7 @@ def check_ddn_s2a_statsdelay(item, params, parsed): write_max = histogram_max(time_intervals, writes_since_last_check) write_avg = histogram_avg(time_intervals, writes_since_last_check) else: - read_min, read_max, read_avg = 0, 0, 0 + write_min, write_max, write_avg = 0, 0, 0 yield check_levels("Average write wait: %.2f s", write_avg, params.get("write_avg"), "disk_average_write_wait") yield check_levels("Min. write wait: %.2f s", write_min, params.get("write_min"), "disk_min_write_wait")

6 years, 9 months

Fixed editing glitch.

by Sven Panne

Module: check_mk Branch: master Commit: da4bb05a23236ec543cc588e45cc2bb5aa02f9cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da4bb05a23236e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 6 09:13:16 2017 +0100 Fixed editing glitch. Change-Id: I4d7ce4e3a8e566d0d3eb41e816530e349c586e55 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0be7d0b..08f8f05 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ optimize-images: echo "Optimizing $$F..." ; \ pngcrush -q -rem alla -brute $$F $$F.opt ; \ mv $$F.opt $$F; \ - done ; + done ; \ else \ echo "Missing pngcrush, not optimizing images! (run \"make setup\" to fix this)" ; \ fi @@ -541,5 +541,5 @@ endif # top-level Makefile's dependencies must be updated. It does not # need to depend on %MAKEFILE% because GNU make will always make sure # %MAKEFILE% is updated before considering the am--refresh target. -am--refresh: +am--refresh: @:

6 years, 9 months

Remove werk

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6c602246f3e40affa7b69b8d452f23dd4f9b0231 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c602246f3e40a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 6 09:15:23 2017 +0100 Remove werk Change-Id: Id6cc65e0d1900ce9921180494109c5bf88f7fffd --- .werks/5524 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.werks/5524 b/.werks/5524 deleted file mode 100644 index 9698b65..0000000 --- a/.werks/5524 +++ /dev/null @@ -1,11 +0,0 @@ -Title: Check API: Fix set_item_state/get_rate/get_counter logic when called from check functions -Level: 2 -Component: checks -Compatible: compat -Edition: cre -Version: 1.5.0i2 -Date: 1512494383 -Class: fix - -In the 1.5.0 branch, the logic encoding the current item in the key for saved data between checks -was broken for checks with item and parse function. This did not affect the 1.4.0 branch.

6 years, 9 months

5524 FIX Check API: Fix set_item_state/get_rate/ get_counter logic when called from check functions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 47eeadd6a6cd9d1bb7005774b069dc89dfc7a427 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47eeadd6a6cd9d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 5 18:22:30 2017 +0100 5524 FIX Check API: Fix set_item_state/get_rate/get_counter logic when called from check functions In the 1.5.0 branch, the logic encoding the current item in the key for saved data between checks was broken for checks with item and parse function. This did not affect the 1.4.0 branch. Change-Id: I689f8272b6f4e9e17861f845adb75f9a09bfabe0 --- .werks/5524 | 11 +++++++++++ cmk_base/checking.py | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5524 b/.werks/5524 new file mode 100644 index 0000000..9698b65 --- /dev/null +++ b/.werks/5524 @@ -0,0 +1,11 @@ +Title: Check API: Fix set_item_state/get_rate/get_counter logic when called from check functions +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512494383 +Class: fix + +In the 1.5.0 branch, the logic encoding the current item in the key for saved data between checks +was broken for checks with item and parse function. This did not affect the 1.4.0 branch. diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 81a7861..0b64e34 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -308,6 +308,12 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i x = e.exc_info() raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace + # We need to set this again, because get_section_content has the side effect of setting this with + # item None if there is a parse function. This would break the entire set_item/get_rate logic + # for checks with items that rely on this being handled by the API. + # TODO: Write a regression test for this. + item_state.set_item_state_prefix(check_plugin_name, item) + # TODO: Move this to a helper function if section_content is None: # No data for this check type return False

6 years, 9 months

Revert "5560 FIX Fixed "Events of Monitored Host" showing events of unrelated hosts"

by Lars Michelsen

Module: check_mk Branch: master Commit: b594f323dd3083f9358233a853ec4d2a980762db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b594f323dd3083… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 5 15:11:43 2017 +0100 Revert "5560 FIX Fixed "Events of Monitored Host" showing events of unrelated hosts" This reverts commit 2f4bb3cc45ca397ab25320f5ba7811e02e6e854a. --- .werks/5560 | 11 ----------- web/plugins/views/mkeventd.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.werks/5560 b/.werks/5560 deleted file mode 100644 index 846e6da..0000000 --- a/.werks/5560 +++ /dev/null @@ -1,11 +0,0 @@ -Title: Fixed "Events of Monitored Host" showing events of unrelated hosts -Level: 1 -Component: multisite -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i2 -Date: 1512050096 - - diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 5b8fef3..d639416 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -887,7 +887,7 @@ if mkeventd_enabled: ], 'hide_filters': [ 'siteopt', - 'event_host', + 'host', ], 'sorters': [ ('event_last', False)

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017