Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

Made event console column handling more robust, simplifying things on the way.

by Sven Panne

Module: check_mk Branch: master Commit: 87e1b641d680c85f7e26f02280ba90e32be0f649 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e1b641d680c8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 31 08:05:47 2018 +0100 Made event console column handling more robust, simplifying things on the way. Change-Id: I343facfb2abe583a4e6e81ada333a1c85c75c81d --- livestatus/src/TableEventConsole.cc | 19 +++--- livestatus/src/TableEventConsole.h | 121 ++++++++++++++---------------------- 2 files changed, 57 insertions(+), 83 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=87e1b641d6…

6 years, 8 months

5668 FIX Fixed potential segfault when talking to the event console

by Sven Panne

Module: check_mk Branch: master Commit: 4e34ece9f3a3f2532ba38fb1a15cbb43e4e22c09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e34ece9f3a3f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 31 11:31:47 2018 +0100 5668 FIX Fixed potential segfault when talking to the event console When users with restricted permissions tried to retrieve the event console events or their history, a segfault could happen in the Livestatus NEB/Micro Core. This has been fixed. Change-Id: I16cccdf75316399a78a533f360a8241ecb433441 --- .werks/5668 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5668 b/.werks/5668 new file mode 100644 index 0000000..4c1c455 --- /dev/null +++ b/.werks/5668 @@ -0,0 +1,12 @@ +Title: Fixed potential segfault when talking to the event console +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1517394549 +Class: fix + +When users with restricted permissions tried to retrieve the event console +events or their history, a segfault could happen in the Livestatus NEB/Micro +Core. This has been fixed.

6 years, 8 months

Update text for werk 5270

by Andreas Umbreit

Module: check_mk Branch: master Commit: d5961c044c31425551be32023f1822ce51f36ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5961c044c3142… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Wed Jan 31 10:42:04 2018 +0100 Update text for werk 5270 Change-Id: I394ba970d25edf43630821c470a3f53eafd74b05 --- .werks/5270 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/5270 b/.werks/5270 index 92f52ec..32d4f14 100644 --- a/.werks/5270 +++ b/.werks/5270 @@ -1,4 +1,4 @@ -Title: Improved Agent Updater Check behaviour +Title: Improved Agent Updater Check behaviour for Linux Hosts Level: 1 Component: agents Compatible: compat @@ -7,6 +7,8 @@ Version: 1.5.0i3 Date: 1516085347 Class: feature +This werk only applies to the Linux Agent. + Formerly, the Agent Updater Check did not update immediately after a manual action on the host. This could lead to some confusion. Notably, you had to wait for the next update cycle to have a successful Agent registration displayed within the Check. @@ -20,4 +22,4 @@ In order to mitigate this situation, the Agent Updater now: The latter action is not performed in --debug option mode. -Information about the cachefile updates will be displayed in -vv mode \ No newline at end of file +Information about the cachefile updates will be displayed in -vv mode

6 years, 8 months

removed ugly encoding issues

by Marcel Arentz

Module: check_mk Branch: master Commit: b76cf6e73c70d4891f48f1be56c124ca27542975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b76cf6e73c70d4… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jan 29 18:36:49 2018 +0100 removed ugly encoding issues Change-Id: I2eed61c73a1c36d60fae66bee710ab913b4f45ec --- agents/windows/plugins/win_printers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/win_printers.ps1 b/agents/windows/plugins/win_printers.ps1 index 3213c62..4f86c01 100644 --- a/agents/windows/plugins/win_printers.ps1 +++ b/agents/windows/plugins/win_printers.ps1 @@ -251,4 +251,4 @@ function Join-Object } } -Join-Object -Left $Data_Set1 -Right $Data_Set2 -Where {$args[0].Name -eq $args[1].Name} LeftProperties "Name","CurrentJobs" RightProperties "printerstatus","detectederrorstate" -Type OnlyIfInBoth | format-table -HideTableHeaders +Join-Object -Left $Data_Set1 -Right $Data_Set2 -Where {$args[0].Name -eq $args[1].Name} -LeftProperties "Name","CurrentJobs" -RightProperties "printerstatus","detectederrorstate" -Type OnlyIfInBoth | format-table -HideTableHeaders

6 years, 8 months

5438 diskstat: Discovers a sort of diskless partitions which can be found on XEN virtual setups

by Simon Betz

Module: check_mk Branch: master Commit: ebf272809bdcdfee664decd2ca1198e6f228d237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebf272809bdcdf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 26 11:09:21 2017 +0200 5438 diskstat: Discovers a sort of diskless partitions which can be found on XEN virtual setups Change-Id: I193379fb8d42b46e0bf127f9f601b6e23dad75d2 --- .werks/5438 | 10 ++++++++++ agents/check_mk_agent.linux | 2 +- checks/diskstat | 18 +++++++++++++++++- checks/diskstat.include | 35 ++++++++++++++++++++--------------- web/plugins/wato/check_parameters.py | 1 + 5 files changed, 49 insertions(+), 17 deletions(-) diff --git a/.werks/5438 b/.werks/5438 new file mode 100644 index 0000000..e716562 --- /dev/null +++ b/.werks/5438 @@ -0,0 +1,10 @@ +Title: diskstat: Discovers a sort of diskless partitions which can be found on XEN virtual setups +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509008915 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f857fc1..0a94bdc 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -440,7 +440,7 @@ fi # Performancecounter Platten echo '<<<diskstat>>>' date +%s -egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats +egrep ' (x?[shv]d[a-z]*[0-9]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats if type dmsetup >/dev/null ; then echo '[dmsetup_info]' dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name diff --git a/checks/diskstat b/checks/diskstat index 175398a..b2edbe7 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -100,17 +100,32 @@ # # Returns a pair of the timestamp and that dictionary # parsed = timestamp, disks + + +diskstat_diskless_pattern = re.compile("x?[shv]d[a-z]*[0-9]+") + + def parse_diskstat(info): timestamp_str, proc_diskstat, name_info = diskstat_extract_name_info(info) timestamp = int(timestamp_str) - disks = {} + # Here we discover real partitions and exclude them: + # Sort of partitions with disks - typical in XEN virtual setups. + # Eg. there are xvda1, xvda2, but no xvda... + device_names = [line[3] for line in proc_diskstat] + real_partitions = {device_name for device_name in device_names + if diskstat_diskless_pattern.match(device_name) + and re.sub('[0-9]+$', '', device_name)} + disks = {} for node_name, major, minor, device, \ read_ios, read_merges, read_sectors, read_ticks, \ write_ios, write_merges, write_sectors, write_ticks, \ ios_in_prog, total_ticks, rq_ticks in proc_diskstat: + if device in real_partitions: + continue + if (node_name, int(major), int(minor)) in name_info: device = name_info[(node_name, int(major), int(minor))] @@ -259,6 +274,7 @@ def diskstat_extract_name_info(info): for line in info: if node == None: node = line[0] + if line[1] == '[dmsetup_info]': phase = 'dmsetup_info' elif line[1] == '[vx_dsk]': diff --git a/checks/diskstat.include b/checks/diskstat.include index b5d7469..619b13d 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -43,9 +43,9 @@ diskstat_inventory = [] # ( [ 'summary', 'physical', 'lvm', 'vxvm' ], ALL_HOSTS ), # ] -def inventory_diskstat_generic(info): +def inventory_diskstat_generic(parsed): # Skip over on empty data - if not info: + if not parsed: return # New style: use rule based configuration, defaulting to summary mode @@ -70,23 +70,28 @@ def inventory_diskstat_generic(info): if "legacy" in modes: inventory += [ ( "read", None ), ( "write", None ) ] - if "physical" in modes: - inventory += [ (line[1], "diskstat_default_levels") - for line in info - if not ' ' in line[1] ] + for line in parsed: + name = line[1] + if "physical" in modes and \ + not ' ' in name and \ + not diskstat_diskless_pattern.match(name): + inventory.append((name, "diskstat_default_levels")) - if "lvm" in modes: - inventory += [ (line[1], "diskstat_default_levels") - for line in info - if line[1].startswith("LVM ") ] + if "lvm" in modes and \ + name.startswith("LVM "): + inventory.append((name, "diskstat_default_levels")) - if "vxvm" in modes: - inventory += [ (line[1], "diskstat_default_levels") - for line in info - if line[1].startswith("VxVM ") ] + if "vxvm" in modes and \ + name.startswith("VxVM "): + inventory.append((name, "diskstat_default_levels")) - return inventory + if "diskless" in modes and \ + diskstat_diskless_pattern.match(name): + # Sort of partitions with disks - typical in XEN virtual setups. + # Eg. there are xvda1, xvda2, but no xvda... + inventory.append((name, "diskstat_default_levels")) + return inventory def check_diskstat_line(this_time, item, params, line, mode='sectors'): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index df192cf..c346835 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -11752,6 +11752,7 @@ register_rule( ( "physical", _("Create a separate check for each physical disk") ), ( "lvm", _("Create a separate check for each LVM volume (Linux)") ), ( "vxvm", _("Creata a separate check for each VxVM volume (Linux)") ), + ( "diskless", _("Creata a separate check for each partition (XEN)") ), ], default_value = [ 'summary' ], ),

6 years, 8 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: fc4e578cc62f5c7b8dc690c01dd844bf425342b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc4e578cc62f5c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 30 15:11:37 2018 +0100 Minor cleanup Change-Id: Ieb0035f22030894a1f4bb324746fc700cba55c7c --- lib/structured_data.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/structured_data.py b/lib/structured_data.py index 2d69202..451ef20 100644 --- a/lib/structured_data.py +++ b/lib/structured_data.py @@ -333,7 +333,7 @@ class NodeAttribute(object): raise NotImplementedError() - def _get_delta_tree(self, mode): + def get_delta_tree(self, mode): raise NotImplementedError() @@ -411,7 +411,7 @@ class Container(NodeAttribute): new_entries = my_child.count_entries() if new_entries: new += new_entries - delta.add_child(edge, my_child._get_delta_tree(mode="new"), abs_path) + delta.add_child(edge, my_child.get_delta_tree(mode="new"), abs_path) for edge, abs_path, my_child, old_child in \ self._get_comparable_children(old, edges=intersect_edges): @@ -431,15 +431,15 @@ class Container(NodeAttribute): removed_entries = old_child.count_entries() if removed_entries: removed += removed_entries - delta.add_child(edge, old_child._get_delta_tree(mode="removed"), abs_path) + delta.add_child(edge, old_child.get_delta_tree(mode="removed"), abs_path) return new, changed, removed, delta - def _get_delta_tree(self, mode): + def get_delta_tree(self, mode): delta = Container() for edge, abs_path, child in self.get_children(): - delta.add_child(edge, child._get_delta_tree(mode), abs_path) + delta.add_child(edge, child.get_delta_tree(mode), abs_path) return delta @@ -810,7 +810,7 @@ class Numeration(Leaf): return converted - def _get_delta_tree(self, mode): + def get_delta_tree(self, mode): delta = Numeration() data = [] for entry in self._numeration: @@ -919,12 +919,14 @@ class Attributes(Leaf): return len(new), len(changed), len(removed), delta - def _get_delta_tree(self, mode): + def get_delta_tree(self, mode): delta = Attributes() if mode == "new": data = {k: (None,v) for k,v in self._attributes.iteritems()} elif mode == "removed": data = {k: (v,None) for k,v in self._attributes.iteritems()} + else: + data = {} delta.set_child_data(data) return delta @@ -1000,10 +1002,6 @@ class Node(object): del self._children[child_type] - def get_node_attribute(self, type_): - return self._children.get(type_) - - def get_node_container(self, default=None): return self._children.get(type(Container()), default)

6 years, 8 months

5663 FIX Fixed adding graphs to graph collections

by Lars Michelsen

Module: check_mk Branch: master Commit: 716ed478948957c8642b0bafc66fcf02dd4f6a1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=716ed478948957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 30 13:31:34 2018 +0100 5663 FIX Fixed adding graphs to graph collections Graphs could not be added to graph collections in all 1.5 releases anymore. This made the graph collections not appear in the sidebar, since empty collections are not shown there. Change-Id: Icd4393b72e6fcb700eb3ff8cb7a64c9966d86496 --- .werks/5663 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5663 b/.werks/5663 new file mode 100644 index 0000000..85d9190 --- /dev/null +++ b/.werks/5663 @@ -0,0 +1,12 @@ +Title: Fixed adding graphs to graph collections +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1517315360 +Class: fix + +Graphs could not be added to graph collections in all 1.5 releases anymore. +This made the graph collections not appear in the sidebar, since empty collections +are not shown there.

6 years, 8 months

Testing time.clock in structured_data tests

by Simon Betz

Module: check_mk Branch: master Commit: 077f6127d8e154c3c362f2f0a5250c8cc817f59d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077f6127d8e154… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 30 12:39:35 2018 +0100 Testing time.clock in structured_data tests Change-Id: I0c18dddf512987bf6e1f325a7b24e211a48fc695 --- tests/cmk/structured_data/test_structured_data.py | 43 +++++++++++++++-------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/tests/cmk/structured_data/test_structured_data.py b/tests/cmk/structured_data/test_structured_data.py index 5e34dfe..f5208f0 100644 --- a/tests/cmk/structured_data/test_structured_data.py +++ b/tests/cmk/structured_data/test_structured_data.py @@ -1,3 +1,4 @@ +import time import pprint import pytest from testlib import repo_path, cmk_path, cmc_path, cme_path, CMKWebSession @@ -557,28 +558,40 @@ def test_structured_data_StructuredDataTree_cpu_tracking_load_from(trees, stats, # ---loading tree--------------------------------------------------------- - cpu_tracking.start("busy") + #TODO testing + start = time.clock() tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #tree_old = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_old_name)) + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_loading_tree - cpu_tracking.start("busy") + #TODO testing + start = time.clock() tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #tree_new_fixed = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_fixed_name)) + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_loading_tree - cpu_tracking.start("busy") + #TODO testing + start = time.clock() tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) - cpu_tracking.end() - phase_times = cpu_tracking.get_times() - total_times = phase_times["TOTAL"] - run_time = total_times[4] + run_time = time.clock() - start + #cpu_tracking.start("busy") + #tree_new_variable = StructuredDataTree().load_from("%s/%s" % (TEST_DIR, tree_new_variable_name)) + #cpu_tracking.end() + #phase_times = cpu_tracking.get_times() + #total_times = phase_times["TOTAL"] + #run_time = total_times[4] assert run_time < time_loading_tree # ---count entries--------------------------------------------------------

6 years, 8 months

Fix Windows integration test wmi_cpuload

by Jukka Aro

Module: check_mk Branch: master Commit: e7fdb90d91e34f549e25ff3a8082179959367c23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7fdb90d91e34f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 30 11:57:23 2018 +0100 Fix Windows integration test wmi_cpuload Relax regex by allowing optional minus '-' in front of one of the counter values. --- agents/windows/it/test_section_wmi_cpuload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/it/test_section_wmi_cpuload.py b/agents/windows/it/test_section_wmi_cpuload.py index 6a1f55c..4703d3f 100644 --- a/agents/windows/it/test_section_wmi_cpuload.py +++ b/agents/windows/it/test_section_wmi_cpuload.py @@ -32,7 +32,7 @@ def expected_output(): r'ProcessorQueueLength,SystemCallsPersec,SystemUpTime,Threads,' r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS'), (r'\d+,,\d+,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,,\d+,' - r'\-?\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+'), + r'\-?\d+,\d+,\d+,\-?\d+,\d+,\d+,\d+,\d+,\d+'), re.escape(r'[computer_system]'), (r'AdminPasswordStatus,AutomaticManagedPagefile,' r'AutomaticResetBootOption,AutomaticResetCapability,BootOptionOnLimit,'

6 years, 8 months

Windows: verify uninstall_plugins.bat in tests

by Jukka Aro

Module: check_mk Branch: master Commit: 80dbaeb8e553b2a746763a85acfdd7f0da3acfbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80dbaeb8e553b2… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jan 30 11:08:08 2018 +0100 Windows: verify uninstall_plugins.bat in tests Check the content of uninstall_plugins.bat in the integration test for the agent start parameter 'unpack'. Also remove redundant parameter 'testconfig' from remotetest. --- agents/windows/it/remote.py | 7 ++--- agents/windows/it/test_agent_start_parameters.py | 33 ++++++++++++++++++++-- agents/windows/it/test_section_check_mk.py | 4 +-- agents/windows/it/test_section_df.py | 2 +- agents/windows/it/test_section_dotnet_clrmemory.py | 2 +- agents/windows/it/test_section_eventlog.py | 4 +-- agents/windows/it/test_section_fileinfo.py | 2 +- agents/windows/it/test_section_logfiles.py | 4 +-- agents/windows/it/test_section_mem.py | 2 +- agents/windows/it/test_section_mrpe.py | 2 +- .../windows/it/test_section_openhardwaremonitor.py | 2 +- agents/windows/it/test_section_plugin_group.py | 2 +- agents/windows/it/test_section_ps.py | 3 +- agents/windows/it/test_section_services.py | 2 +- agents/windows/it/test_section_spool.py | 2 +- agents/windows/it/test_section_systemtime.py | 2 +- agents/windows/it/test_section_uptime.py | 2 +- agents/windows/it/test_section_winperf.py | 2 +- agents/windows/it/test_section_wmi_cpuload.py | 2 +- agents/windows/it/test_section_wmi_webservices.py | 2 +- 20 files changed, 55 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80dbaeb8e5…

6 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018