Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Custom attributes: Use store methods for loading the config (

by Lars Michelsen

introduced locking on actions) Message-ID: <5a1fc8b0.kwYHA2rIdPrpL0XQ%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 764f5999b9168933028a5f0715ee47a57fadaf4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=764f5999b91689… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 09:11:40 2017 +0100 Custom attributes: Use store methods for loading the config (introduced locking on actions) Change-Id: Ib6f1802d5e176771f2489c9903b535fa336b771c --- web/htdocs/wato.py | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1d15c23..e5af8de 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15259,29 +15259,17 @@ class CustomAttrMode(WatoMode): self._attrs = self._all_attrs.get(self._what, {}) - # TODO: Use lock! def _load(self, lock): - try: - filename = multisite_dir + "custom_attrs.mk" - if not os.path.exists(filename): - return {} - - vars = { - 'wato_user_attrs': [], - 'wato_host_attrs': [], - } - execfile(filename, vars, vars) - - attrs = {} - for self._what in [ "user", "host" ]: - attrs[self._what] = vars.get("wato_%s_attrs" % self._what, []) - return attrs + filename = os.path.join(multisite_dir, "custom_attrs.mk") + vars = store.load_mk_file(filename, { + 'wato_user_attrs': [], + 'wato_host_attrs': [], + }, lock=lock) - except Exception, e: - if config.debug: - raise - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) + attrs = {} + for self._what in [ "user", "host" ]: + attrs[self._what] = vars.get("wato_%s_attrs" % self._what, []) + return attrs def _save_attributes(self):

6 years, 7 months

Fixed issue in recent commit

by Lars Michelsen

Module: check_mk Branch: master Commit: e9cb69da47d46737a21b55ae66db7ad78d13713f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9cb69da47d467… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 09:57:45 2017 +0100 Fixed issue in recent commit Change-Id: Ic4f4eb9031083fc2cd328db1bbf14fa3d3e3a935 --- web/htdocs/wato.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2b2994a..2e47a16 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3905,7 +3905,7 @@ class ModeBulkImport(WatoMode): attributes.append(("tag_" + entry[0], _("Tag: %s") % entry[1])) # Add custom attributes - for entry in load_custom_attrs()['host']: + for entry in ModeCustomHostAttrs().get_attributes(): name = entry['name'] attributes.append((name, _("Custom variable: %s") % name)) @@ -15577,6 +15577,10 @@ class ModeCustomHostAttrs(ModeCustomAttrs): html.context_button(_("New attribute"), watolib.folder_preserving_link([("mode", "edit_host_attr")]), "new") + def get_attributes(self): + return self._attrs + + def declare_custom_host_attrs(): # First remove all previously registered custom host attributes

6 years, 7 months

table: Ignore header in oddeven handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c71e1fbf0d6e4a59f8a73335f4f4357f404514a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c71e1fbf0d6e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 30 09:52:55 2017 +0100 table: Ignore header in oddeven handling Change-Id: I467748569e488821b3d437905423a0b6481c3085 --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 0f34fae..d687d61 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -382,7 +382,7 @@ class Table(object): self._render_headers(actions_enabled, actions_visible) continue - oddeven_name = "even" if nr % 2 == 0 else "odd" + 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:

6 years, 7 months

ddn_s2a_stats: Fix rendering of levels in graph

by Konstantin Büttner

Module: check_mk Branch: master Commit: 26b50a62cfe3e02d51bf3000bdfdba453f5e15c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26b50a62cfe3e0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 16:53:53 2017 +0100 ddn_s2a_stats: Fix rendering of levels in graph Change-Id: I0ed1c473b61d6a56b4e51f123b7b275e7188999f --- web/plugins/metrics/check_mk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index eea78d3..e321a98 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -6804,6 +6804,12 @@ graph_info["disk_throughput"] = { ( "disk_read_throughput", "area" ), ( "disk_write_throughput", "-area" ), ], + "scalars" : [ + ("disk_read_throughput:warn", "Warning read"), + ("disk_read_throughput:crit", "Critical read"), + ("disk_write_throughput:warn,-1,*", "Warning write"), + ("disk_write_throughput:crit,-1,*", "Critical write"), + ], "legend_scale" : MB, }

6 years, 7 months

Windows agent: fix uninitialized memory errors

by Jukka Aro

Module: check_mk Branch: master Commit: 79086bb27c4a5e5713c5a73d49e3f4141ddd6419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79086bb27c4a5e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Nov 29 14:44:53 2017 +0100 Windows agent: fix uninitialized memory errors Fix a few uninitialized memory errors reported by Dr. Memory. Change-Id: I1deb0a9cde90674f2ff7644fd492383e9346f5a7 --- agents/windows/sections/SectionPS.cc | 2 +- agents/windows/sections/SectionPluginGroup.cc | 6 ------ agents/windows/sections/SectionPluginGroup.h | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 7c9b6ee..241cc51 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -231,7 +231,7 @@ bool SectionPS::outputWMI(std::ostream &out) { bool SectionPS::outputNative(std::ostream &out) { Debug(_logger) << "SectionPS::ouputNative"; - PROCESSENTRY32 pe32; + PROCESSENTRY32 pe32{0}; process_entry_t process_perfdata; try { diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 8cbfb03..1e527aa 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -212,15 +212,9 @@ script_container::script_container( , max_age(_max_age) , timeout(_timeout) , max_retries(_max_entries) - , buffer_time(0) - , buffer(nullptr) - , buffer_work(nullptr) , run_as_user(_user) , type(_type) , execution_mode(_execution_mode) - , status(SCRIPT_IDLE) - , last_problem(SCRIPT_NONE) - , should_terminate(0) , env(_env) , logger(_logger) , winapi(_winapi) {} diff --git a/agents/windows/sections/SectionPluginGroup.h b/agents/windows/sections/SectionPluginGroup.h index 74d5e4a..1ac28b6 100644 --- a/agents/windows/sections/SectionPluginGroup.h +++ b/agents/windows/sections/SectionPluginGroup.h @@ -64,19 +64,19 @@ struct script_container { const int max_age; const int timeout; const int max_retries; - int retry_count; - time_t buffer_time; - char *buffer; - char *buffer_work; + int retry_count{0}; + time_t buffer_time{0}; + char *buffer{nullptr}; + char *buffer_work{nullptr}; const std::string run_as_user; const script_type type; const script_execution_mode execution_mode; - script_status status; - script_status last_problem; - volatile bool should_terminate; - HANDLE worker_thread; - HANDLE job_object; - DWORD exit_code; + script_status status{SCRIPT_IDLE}; + script_status last_problem{SCRIPT_NONE}; + volatile bool should_terminate{0}; + HANDLE worker_thread{INVALID_HANDLE_VALUE}; + HANDLE job_object{INVALID_HANDLE_VALUE}; + DWORD exit_code{0}; const Environment &env; Logger *logger; const WinApiAdaptor &winapi; @@ -139,7 +139,7 @@ private: std::string _path; script_type _type; std::string _user; - HANDLE _collection_thread; + HANDLE _collection_thread{INVALID_HANDLE_VALUE}; std::atomic<bool> _data_collection_retriggered{false}; containers_t _containers; Configurable<script_execution_mode> _default_execution_mode;

6 years, 7 months

Analyze configuration: Improved error handling of site responses

by Lars Michelsen

Module: check_mk Branch: master Commit: f91af6cd3b1df0cc4e1aa877f1dd0f078f9809c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f91af6cd3b1df0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 12:40:17 2017 +0100 Analyze configuration: Improved error handling of site responses Change-Id: Ic8f99af6118345366a924dff10cb68cf9f4c1a37 --- web/htdocs/wato.py | 59 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e60a926..28d718b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16644,7 +16644,7 @@ class ModeAnalyzeConfig(WatoMode): results_by_site = {} # Results are fetched simultaneously from the remote sites - result_queue = multiprocessing.Queue() + result_queue = multiprocessing.JoinableQueue() processes = [] for site_id in watolib.ActivateChanges().activation_site_ids(): @@ -16653,28 +16653,30 @@ class ModeAnalyzeConfig(WatoMode): process.start() processes.append((site_id, process)) - # Wait for termination of all processes - for site_id, process in processes: - process.join() - - # Now collect the results from the queue - while True: + # Now collect the results from the queue until all processes are finished + while any([ p.is_alive() for site_id, p in processes ]): try: site_id, results_data = result_queue.get_nowait() - results_data = ast.literal_eval(results_data) + result_queue.task_done() + result = ast.literal_eval(results_data) - if isinstance(results_data, Exception): - raise results_data + if result["state"] == 1: + raise MKGeneralException(result["response"]) - elif isinstance(results_data, list): + elif result["state"] == 0: test_results = [] - for result_data in results_data: + for result_data in result["response"]: result = watolib.ACResult.from_repr(result_data) test_results.append(result) results_by_site[site_id] = test_results + + else: + raise NotImplementedError() + except Queue.Empty: - break + time.sleep(0.5) # wait some time to prevent CPU hogs + except Exception, e: log_exception() html.show_error("%s: %s" % (site_id, e)) @@ -16688,8 +16690,26 @@ class ModeAnalyzeConfig(WatoMode): return results_by_category + # Executes the tests on the site. This method is executed in a dedicated + # subprocess (One per site) def _perform_tests_for_site(self, site_id, result_queue): try: + # Would be better to clean all open fds that are not needed, but we don't + # know the FDs of the result_queue pipe. Can we find it out somehow? + # Cleanup ressources of the apache + #for x in range(3, 256): + # try: + # os.close(x) + # except OSError, e: + # if e.errno == 9: # Bad file descriptor + # pass + # else: + # raise + + # Reinitialize logging targets + import log + log.init_logging() + if config.site_is_local(site_id): results_data = watolib.check_analyze_config() @@ -16697,14 +16717,23 @@ class ModeAnalyzeConfig(WatoMode): results_data = watolib.do_remote_automation( config.site(site_id), "check-analyze-config", []) - result_queue.put((site_id, repr(results_data))) + result = { + "state" : 0, + "response" : results_data, + } except Exception, e: log_exception() - result_queue.put((site_id, repr(e))) + result = { + "state" : 1, + "response" : "Traceback:<br>%s" % + (traceback.format_exc().replace("\n", "<br>\n")), + } finally: + result_queue.put((site_id, repr(result))) result_queue.close() result_queue.join_thread() + result_queue.join() def _filter_test_results(self, results_by_category):

6 years, 7 months

Analyze configuration: Reworked dialog to be more compact (

by Lars Michelsen

especially with a lot of sites) Message-ID: <5a1ebfe2.8+14e2tZAtl6AiBI%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 515a3d1696d3d41d0106f41029bac03a8dbbc9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=515a3d1696d3d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 14:47:30 2017 +0100 Analyze configuration: Reworked dialog to be more compact (especially with a lot of sites) Change-Id: Id28421fc6a439d627089ac7bc3f63ecec9e5bea2 --- web/htdocs/images/button_toggle_details.png | Bin 0 -> 3829 bytes web/htdocs/js/checkmk.js | 9 -- web/htdocs/js/wato.js | 8 ++ web/htdocs/pages.css | 3 + web/htdocs/wato.css | 24 ++-- web/htdocs/wato.py | 188 +++++++++++++++++++--------- web/htdocs/watolib.py | 12 +- web/plugins/wato/ac_tests.py | 2 +- 8 files changed, 165 insertions(+), 81 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=515a3d1696…

6 years, 7 months

Fixed oddeven row classes

by Lars Michelsen

Module: check_mk Branch: master Commit: 42d704e73d29bce3ac06d826af6910fd65e1ae18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42d704e73d29bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 29 13:43:24 2017 +0100 Fixed oddeven row classes Change-Id: I20ebcb3036ef105c4d49028572946adc86678751 --- web/htdocs/table.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index c4139a0..0f34fae 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -382,7 +382,9 @@ class Table(object): self._render_headers(actions_enabled, actions_visible) continue - html.open_tr(class_=["data", "odd%d" % state, css if css else None], **attrs) + oddeven_name = "even" if nr % 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: html.open_td(class_=css_classes if css_classes else None, colspan=colspan if colspan else None) html.write(cell_content)

6 years, 7 months

test_df_discovery_with_parse: Generalize test parameters to allow testing against future second inventory option

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1a6b0126395d9bc78ee82433ee92d20cb1ab680d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a6b0126395d9b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 13:30:32 2017 +0100 test_df_discovery_with_parse: Generalize test parameters to allow testing against future second inventory option Change-Id: I6bd4fa0da066c50d041fcec503adba5e1162477f --- tests/checks/test_df_check.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index 5da3a8b..f2abdf6 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -216,17 +216,20 @@ info_df_btrfs = \ # | | # '----------------------------------------------------------------------' -(a)pytest.mark.parametrize("info,expected_result,include_volume_name", [ - ([], [], False), - (info_df_lnx, [(u'/', {})], False), # Linux - (info_df_lnx, [(u'/dev/sda4 /', {})], True), # Linux w/ volume name option - (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], False), # Windows - (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], True), # Windows w/ volume name option - (info_df_lnx_tmpfs, [], False), # Ignoring tmpfs - (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), # btrfs - (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), # btrfs w/ volume name option +(a)pytest.mark.parametrize("info,expected_result,inventory_df_rules", [ + ([], [], {}), + (info_df_lnx, [(u'/', {})], {}), # Linux + (info_df_lnx, [(u'/', {})], { "include_volume_name" : False }), # Linux w/ volume name unset + (info_df_lnx, [(u'/dev/sda4 /', {})], { "include_volume_name" : True}), # Linux w/ volume name option + (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], {}), # Windows + (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], + { "include_volume_name" : True }), # Windows w/ volume name option + (info_df_lnx_tmpfs, [], {}), # Ignoring tmpfs + (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], {}), # btrfs + (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], + { "include_volume_name" : True }), # btrfs w/ volume name option ]) -def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, include_volume_name): +def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_result, inventory_df_rules): # NOTE: This commented-out code is the result of trying to mock the the ruleset variable itself instead of the # host_extra_conf_merged function. It did not work. Maybe we can get it to work at a later stage. # import cmk_base.rulesets @@ -234,7 +237,7 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu # [({"include_volume_name": include_volume_name}, [], cmk_base.rulesets.ALL_HOSTS, {})]) check = check_manager.get_check("df") - monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __: {"include_volume_name": include_volume_name}) + monkeypatch.setitem(check.context, "host_extra_conf_merged", lambda _, __: inventory_df_rules) assert check.run_discovery(check.run_parse(info)) == expected_result

6 years, 7 months

df: Move deselecting of filesystems by type (such as tmpfs)

by Konstantin Büttner

from parse_function to inventory_function Message-ID: <5a1ea3c1.wVE+mKlDzBDr9m3s%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: af49400db96e583d26be9c990c1e9915c04d1a01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af49400db96e58… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 29 13:02:33 2017 +0100 df: Move deselecting of filesystems by type (such as tmpfs) from parse_function to inventory_function Change-Id: I810ad81697d623b709f7f1f738c7f31fd50ff350 --- checks/df | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/df b/checks/df index fca4bbb..d780799 100644 --- a/checks/df +++ b/checks/df @@ -127,8 +127,6 @@ def parse_df(info): else: mountpoint = " ".join(line[6:]).replace('\\', '/') # Windows \ is replaced with / - if fs_type in inventory_df_exclude_fs: - continue # ignore this filesystem type if line[2] == '-' or int(line[2]) == 0: continue # exclude filesystems without size @@ -205,9 +203,12 @@ def inventory_df(parsed): mountpoint = line[0] if mountpoint in inventory_df_exclude_mountpoints: continue # exclude this mount point (/tmp, /proc, whatever user wants) + if volume_info[mountpoint]["fs_type"] in inventory_df_exclude_fs: + continue # ignore this filesystem type mplist.append(mountpoint) + if include_volume_name: inventory = [] for entry in df_inventory(mplist):

6 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017