Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4874 FIX cisco_power: Improved discovery of power supplies

by Simon Betz

Module: check_mk Branch: master Commit: 1a70ae121f139ea02a729b682f55d73834265534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a70ae121f139e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 26 13:29:12 2017 +0200 4874 FIX cisco_power: Improved discovery of power supplies Before not all power supplies were discovered or had an incorrect description, eg. status code was included. This has been fixed now but you have to re-discover on the affected hosts. Change-Id: I274a81171d4c195ebd03b10c75aec68603d70c68 --- .werks/4874 | 14 ++++++++++++++ checks/cisco_sensor_item.include | 16 +++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.werks/4874 b/.werks/4874 new file mode 100644 index 0000000..617c9de --- /dev/null +++ b/.werks/4874 @@ -0,0 +1,14 @@ +Title: cisco_power: Improved discovery of power supplies +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498476261 + +Before not all power supplies were discovered or had +an incorrect description, eg. status code was included. +This has been fixed now but you have to re-discover on the +affected hosts. diff --git a/checks/cisco_sensor_item.include b/checks/cisco_sensor_item.include index d4ea595..93f5d9c 100644 --- a/checks/cisco_sensor_item.include +++ b/checks/cisco_sensor_item.include @@ -34,18 +34,20 @@ def cisco_sensor_item(trial_string, fall_back): # -> Depends on the device model try: # Try to handle all cases found in mkzeug/walks - splited = [ x.strip() for x in trial_string.split(',')] - if len(splited) == 1: + splitted = [ x.strip() for x in trial_string.split(',')] + if len(splitted) == 1: item = trial_string # If the last part contains # or Power, take the complete string - elif '#' in splited[-1] or 'Power' in splited[-1]: - item = " ".join(splited) + elif '#' in splitted[-1] or 'Power' in splitted[-1]: + item = " ".join(splitted) # If second last part start with Status, remove that part - elif splited[-2].startswith("Status") or splited[-2].startswith("PS1"): - item = " ".join(splited[:-2]) + elif splitted[-2].startswith("PS"): + item = " ".join(splitted[:-2] + splitted[-2].split(" ")[:-1]) + elif splitted[-2].startswith("Status"): + item = " ".join(splitted[:-2]) # Take anything, but without last part else: - item = " ".join(splited[:-1]) + item = " ".join(splitted[:-1]) # Maye there a multiple Items, but always the same string. # Try to prevent that by adding the fall_back number to the end if not item[-1].isdigit():

7 years, 3 months

4873 FIX printer_supply: Fixed IndexError in case of missing colour information

by Simon Betz

Module: check_mk Branch: master Commit: 14b34a948c850f82442f5f6a6543d67250089fa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14b34a948c850f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 26 12:00:15 2017 +0200 4873 FIX printer_supply: Fixed IndexError in case of missing colour information Some devices such as HP Laser Jet 1200 do not provide colour information which caused above error during discovery. Change-Id: Ie8497ec673881252e644fba700e63b57be9b9984 --- .werks/4873 | 12 ++++++++++++ checks/printer_supply | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4873 b/.werks/4873 new file mode 100644 index 0000000..ffa0ea9 --- /dev/null +++ b/.werks/4873 @@ -0,0 +1,12 @@ +Title: printer_supply: Fixed IndexError in case of missing colour information +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498470954 + +Some devices such as HP Laser Jet 1200 do not provide colour +information which caused above error during discovery. diff --git a/checks/printer_supply b/checks/printer_supply index 6aaf181..611a3cb 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -76,9 +76,12 @@ def printer_supply_fix_infos(info): if line[4]: colors += [ line[4] ] color = line[4] - elif line[4] == '': + elif line[4] == '' and colors: color = colors[index - len(colors)] - line_0 = '%s %s' % (color.title(), line_0) + else: + color = None + if color: + line_0 = '%s %s' % (color.title(), line_0) if " S/N:" in line_0: line_0 = line_0[:line_0.find(" S/N:")]

7 years, 3 months

4823 FIX netapp_api_cpu: Fixed crash if data for node is missing

by Marcel Arentz

Module: check_mk Branch: master Commit: 24e9d3aa19221afd22b8b7bb308baae3f46ea30a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24e9d3aa19221a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jun 26 11:59:00 2017 +0200 4823 FIX netapp_api_cpu: Fixed crash if data for node is missing The checkplugin does not crash anymore if the cpu data for a node is missing. Instead the state will now change to UNKNOWN. Change-Id: I1054e9a0d9e4ab04d82fd91fd871f8157fbdaf9c --- .werks/4823 | 11 +++++++++++ checks/netapp_api_cpu | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/4823 b/.werks/4823 new file mode 100644 index 0000000..f555ff2 --- /dev/null +++ b/.werks/4823 @@ -0,0 +1,11 @@ +Title: netapp_api_cpu: Fixed crash if data for node is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498471053 +Class: fix + +The checkplugin does not crash anymore if the cpu data for a node is +missing. Instead the state will now change to UNKNOWN. diff --git a/checks/netapp_api_cpu b/checks/netapp_api_cpu index a72f767..e689d8f 100644 --- a/checks/netapp_api_cpu +++ b/checks/netapp_api_cpu @@ -69,6 +69,8 @@ def check_netapp_api_cpu_utilization(item, params, parsed, mode): mode_data = parsed.get(mode) if item: data = mode_data.get(item) + if data == None: + return 3, "No data available!" else: data = mode_data

7 years, 3 months

4872 FIX zfs_arc_cache: Fixed conversions of size, arc meta used, arc meta limit and arc meta max

by Simon Betz

Module: check_mk Branch: master Commit: a76a497c001a241cca0cffdd1e6a88810509c565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a76a497c001a24… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 26 10:09:47 2017 +0200 4872 FIX zfs_arc_cache: Fixed conversions of size, arc meta used, arc meta limit and arc meta max Change-Id: Ib55fd521c6fc238b180feb57cb4f905c476a3fa6 --- .werks/4872 | 11 ++++++++ checks/zfs_arc_cache | 79 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/.werks/4872 b/.werks/4872 new file mode 100644 index 0000000..eb90467 --- /dev/null +++ b/.werks/4872 @@ -0,0 +1,11 @@ +Title: zfs_arc_cache: Fixed conversions of size, arc meta used, arc meta limit and arc meta max +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498464325 + + diff --git a/checks/zfs_arc_cache b/checks/zfs_arc_cache index 004ffb4..2981a703 100644 --- a/checks/zfs_arc_cache +++ b/checks/zfs_arc_cache @@ -180,6 +180,66 @@ # size = 48851102592 # snaptime = 6646791,81811455 +#<<<zfs_arc_cache>>> +#hits = 97798158981 +#misses = 29159034052 +#demand_data_hits = 21894170403 +#demand_data_misses = 6555284601 +#demand_metadata_hits = 67915356653 +#demand_metadata_misses = 2138181167 +#prefetch_data_hits = 6162208911 +#prefetch_data_misses = 19200459846 +#prefetch_metadata_hits = 1826423014 +#prefetch_metadata_misses = 1265108438 +#mru_hits = 32456530155 +#mru_ghost_hits = 2084134895 +#mfu_hits = 57357428725 +#mfu_ghost_hits = 1416265946 +#deleted = 26434603017 +#recycle_miss = 2014989945 +#mutex_miss = 548212067 +#evict_skip = 1758367956525 +#evict_l2_cached = 0 +#evict_l2_eligible = 236579643061760 +#evict_l2_ineligible = 68829096635392 +#hash_elements = 235200 +#hash_elements_max = 441047 +#hash_collisions = 5893650106 +#hash_chains = 22800 +#hash_chain_max = 8 +#p = 242 MB +#c = 2048 MB +#c_min = 2010 MB +#c_max = 2048 MB +#size = 1658 MB +#hdr_size = 76639184 +#data_size = 998181888 +#other_size = 664157400 +#l2_hits = 0 +#l2_misses = 0 +#l2_feeds = 0 +#l2_rw_clash = 0 +#l2_read_bytes = 0 +#l2_write_bytes = 0 +#l2_writes_sent = 0 +#l2_writes_done = 0 +#l2_writes_error = 0 +#l2_writes_hdr_miss = 0 +#l2_evict_lock_retry = 0 +#l2_evict_reading = 0 +#l2_free_on_write = 0 +#l2_abort_lowmem = 0 +#l2_cksum_bad = 0 +#l2_io_error = 0 +#l2_size = 0 +#l2_hdr_size = 0 +#memory_throttle_count = 1014537 +#arc_no_grow = 0 +#arc_tempreserve = 0 MB +#arc_meta_used = 1196 MB +#arc_meta_limit = 512 MB +#arc_meta_max = 2132 MB + #. # parses agent output in a structure like @@ -193,9 +253,16 @@ def parse_zfs_arc_cache(info): parsed = {} for line in info: - if len(line) > 2 and line[1] == "=": - if line[2].isdigit(): - parsed[line[0]] = int(line[2]) + if not (len(line) <= 2 or line[1] == "=" or line[2].isdigit()): + continue + + factor = 1 + if len(line) == 4: + if line[3].lower() == "mb": + factor = 1024**2 + elif line[3].lower() == "kb": + factor = 1024 + parsed[line[0]] = int(line[2]) * factor return parsed @@ -244,8 +311,10 @@ def check_zfs_arc_cache(_no_item, _no_params, parsed): # in this case just do not report these values if "arc_meta_used" in parsed.keys() and "arc_meta_limit" in parsed.keys() and \ "arc_meta_max" in parsed.keys(): - yield 0, "Arc Meta %d MB used, Limit %d MB, Max %d MB" % \ - (parsed["arc_meta_used"], parsed["arc_meta_limit"], parsed["arc_meta_max"]), \ + yield 0, "Arc Meta %s used, Limit %s, Max %s" % \ + (get_bytes_human_readable(parsed["arc_meta_used"]), + get_bytes_human_readable(parsed["arc_meta_limit"]), + get_bytes_human_readable(parsed["arc_meta_max"])), \ [("arc_meta_used", parsed["arc_meta_used"], '', '', 0), ("arc_meta_limit", parsed["arc_meta_limit"], '', '', 0), ("arc_meta_max", parsed["arc_meta_max"], '', '', 0)]

7 years, 3 months

Fixed usage of render_a

by Simon Betz

Module: check_mk Branch: master Commit: 9604ebabe4180c4fbc8fe88c4a95c73ad78b9c5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9604ebabe4180c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 26 09:45:42 2017 +0200 Fixed usage of render_a Change-Id: Ie9dda48f7069a9758a09123d531d1ebf145cbfb0 --- web/htdocs/logwatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index e2feb0b..06ffe7b 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -130,7 +130,7 @@ def list_logs(site, host_name, logfile_names): table.row() file_display = form_file_to_ext(file_name) uri = html.makeuri([('site', site), ('host', host_name), ('file', file_display)]) - logfile_link = html.render_a(file_display, url=uri) + logfile_link = html.render_a(file_display, href=uri) try: log_chunks = parse_file(site, host_name, file_name)

7 years, 3 months

Removed debug output.

by Sven Panne

Module: check_mk Branch: master Commit: 7d0fa4569af4d65081b080d17450f1ada6105311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d0fa4569af4d6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 26 08:43:08 2017 +0200 Removed debug output. Change-Id: I5a0744d96fb06a2d0bff80d641093c8d4b2d7302 --- web/htdocs/wato.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6e07a6e..c86a15b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4118,7 +4118,6 @@ class ModeBulkDiscovery(WatoMode): selection = self._bulk_discovery_params["selection"] self._bulk_discovery_params["selection"] = [False] + list(selection[1:]) - html.write("%s" % self._bulk_discovery_params) msgs.append(_("Check_MK service discovery will automatically find and " "configure services to be checked on your hosts.")) html.open_p()

7 years, 3 months

Fixed formatting of the Windows agent source code.

by Sven Panne

Module: check_mk Branch: master Commit: 8fd8ad3ad05c43351bd4a034b7ad48b51c06f64b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fd8ad3ad05c43… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Jun 26 08:42:09 2017 +0200 Fixed formatting of the Windows agent source code. Change-Id: Iaf9c8e39652237c05bf1379e5805eae83f061f0f --- agents/windows/EventLogVista.cc | 12 +++++++----- agents/windows/ExternalCmd.cc | 23 +++++++++++------------ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339904 -> 1369600 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823277 -> 17208624 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339904 -> 1369600 bytes agents/windows/check_mk_agent.cc | 2 -- agents/windows/check_mk_agent.exe | Bin 1317888 -> 1351680 bytes agents/windows/check_mk_agent.msi | Bin 2927616 -> 2992128 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13681693 -> 15041453 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1317888 -> 1351680 bytes agents/windows/crash.exe | Bin 101624 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 591860 -> 603781 bytes agents/windows/install_agent.exe | Bin 589484 -> 603278 bytes agents/windows/nowin.exe | Bin 103760 -> 361000 bytes 15 files changed, 19 insertions(+), 20 deletions(-) diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 1d21879..a0ebde3 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -177,8 +177,9 @@ public: std::wstring result; result.resize(128); auto publisher_meta = std::make_unique<ManagedEventHandle>( - *_evt, _evt->openPublisherMetadata(nullptr, source().c_str(), - nullptr, 0, 0)); + *_evt, + _evt->openPublisherMetadata(nullptr, source().c_str(), nullptr, 0, + 0)); if (publisher_meta->get_handle() != nullptr) { for (;;) { DWORD required; @@ -320,9 +321,10 @@ uint64_t EventLogVista::seek(uint64_t record_id) { *_evt, evt().createBookmark(bookmarkXml.c_str())); _handle = std::make_unique<ManagedEventHandle>( - *_evt, evt().subscribe(nullptr, _signal->get_handle(), _path.c_str(), - L"*", bookmark->get_handle(), nullptr, nullptr, - EvtSubscribeStartAfterBookmark)); + *_evt, + evt().subscribe(nullptr, _signal->get_handle(), _path.c_str(), L"*", + bookmark->get_handle(), nullptr, nullptr, + EvtSubscribeStartAfterBookmark)); if (_handle->get_handle() == nullptr) { throw win_exception( diff --git a/agents/windows/ExternalCmd.cc b/agents/windows/ExternalCmd.cc index 3d12242..a882dab 100644 --- a/agents/windows/ExternalCmd.cc +++ b/agents/windows/ExternalCmd.cc @@ -31,14 +31,11 @@ extern bool with_stderr; extern HANDLE g_workers_job_object; - -bool ends_with(std::string const & value, std::string const & ending) -{ +bool ends_with(std::string const &value, std::string const &ending) { if (ending.size() > value.size()) return false; return std::equal(ending.rbegin(), ending.rend(), value.rbegin()); } - ExternalCmd::ExternalCmd(const char *cmdline) { SECURITY_DESCRIPTOR security_descriptor; SECURITY_ATTRIBUTES security_attributes; @@ -56,13 +53,14 @@ ExternalCmd::ExternalCmd(const char *cmdline) { // child process needs to be able to inherit the pipe handles security_attributes.bInheritHandle = true; - if (!CreatePipe(_stdout.ptr(), _script_stdout.ptr(), &security_attributes, 0)) { + if (!CreatePipe(_stdout.ptr(), _script_stdout.ptr(), &security_attributes, + 0)) { throw win_exception("failed to create pipe"); } - if (with_stderr) { - if (!CreatePipe(_stderr.ptr(), _script_stderr.ptr(), &security_attributes, 0)) { + if (!CreatePipe(_stderr.ptr(), _script_stderr.ptr(), + &security_attributes, 0)) { throw win_exception("failed to create pipe"); } } @@ -75,14 +73,16 @@ ExternalCmd::ExternalCmd(const char *cmdline) { si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; si.hStdOutput = (HANDLE)_script_stdout; - si.hStdError = with_stderr ? (HANDLE)_script_stdout : (HANDLE)_script_stderr; + si.hStdError = + with_stderr ? (HANDLE)_script_stdout : (HANDLE)_script_stderr; PROCESS_INFORMATION pi; ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); std::unique_ptr<char[], decltype(free) *> cmdline_buf(strdup(cmdline), free); - bool detach_process = ends_with(std::string(cmdline), std::string("cmk-update-agent.exe\"")); + bool detach_process = + ends_with(std::string(cmdline), std::string("cmk-update-agent.exe\"")); DWORD dwCreationFlags = CREATE_NEW_CONSOLE; if (detach_process) { @@ -102,8 +102,8 @@ ExternalCmd::ExternalCmd(const char *cmdline) { // Whenever the process ends all of its childs will terminate, too _job_object = CreateJobObject(nullptr, nullptr); if (!detach_process) { - AssignProcessToJobObject(_job_object, pi.hProcess); - AssignProcessToJobObject(g_workers_job_object, pi.hProcess); + AssignProcessToJobObject(_job_object, pi.hProcess); + AssignProcessToJobObject(g_workers_job_object, pi.hProcess); } } @@ -115,7 +115,6 @@ ExternalCmd::~ExternalCmd() { ::CloseHandle(_process); } - void ExternalCmd::terminateJob(DWORD exit_code) { ::TerminateJobObject(_job_object, exit_code); ::CloseHandle(_job_object); diff --git a/agents/windows/build_version b/agents/windows/build_version index c98e88a..3c6eb2a 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2713 +2715 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a1750d6..0860858 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index d0c42ee..e4a9ed5 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 32229f9..ddf6f3a 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5654756..bbce919 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -48,12 +48,10 @@ #include <locale.h> #include <shellapi.h> #include <stdarg.h> -#include <stdarg.h> #include <stdint.h> #include <stdio.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/types.h> #include <time.h> #include <tlhelp32.h> // list of processes #include <unistd.h> diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5b0c4de..fe6d16f 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index b4de316..25fd387 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 0b43306..19d5b5e 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e77dcc3..06ce1f3 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 7a9e64a..6fec41a 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 4210301..8a7134b 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 867cf5d..6f923a9 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 856afb5..8139799 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

7 years, 3 months

4695 FIX Make communication with event console more robust

by Sven Panne

Module: check_mk Branch: master Commit: 68ee4716145e871785e5aba177ce25fa49e8e30c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68ee4716145e87… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jun 23 13:42:57 2017 +0200 4695 FIX Make communication with event console more robust When the monitoring core connects to the event console very rapidly, a "No buffer space available" error could happen intermittently. This can be seen in the log, and the corresponding command fails, too, e.g. archiving an event. This has been fixed, the connection is simply retried when this rare but harmless error happens. Change-Id: Id382dfe9f4267bb7d660ac306a963a3e622a8041 --- .werks/4695 | 14 ++++++++++++++ livestatus/src/EventConsoleConnection.cc | 23 ++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.werks/4695 b/.werks/4695 new file mode 100644 index 0000000..793fecd --- /dev/null +++ b/.werks/4695 @@ -0,0 +1,14 @@ +Title: Make communication with event console more robust +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498217686 +Class: fix + +When the monitoring core connects to the event console very rapidly, a "No +buffer space available" error could happen intermittently. This can be seen +in the log, and the corresponding command fails, too, e.g. archiving an +event. This has been fixed, the connection is simply retried when this +rare but harmless error happens. diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index 61fbb61..474d31f 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -26,8 +26,12 @@ // IWYU pragma: no_include <boost/asio/basic_socket_streambuf.hpp> #include "EventConsoleConnection.h" #include <boost/asio/socket_base.hpp> +#include <boost/system/error_code.hpp> #include <boost/system/system_error.hpp> +#include <chrono> #include <ostream> +#include <ratio> +#include <thread> #include <utility> #include "Logger.h" @@ -43,7 +47,24 @@ EventConsoleConnection::~EventConsoleConnection() { void EventConsoleConnection::run() { boost::asio::local::stream_protocol::endpoint ep(_path); - boost::asio::local::stream_protocol::iostream stream(ep); + // Attention, tricky timing-dependent stuff ahead: When we connect very + // rapidly, a no_buffer_space (= ENOBUFS) error can happen. This is probably + // caused by some internal Boost Kung Fu, remapping EGAIN to ENOBUFS, and + // looks like a bug in Boost, but that's a bit unclear. So instead of + // relying on Boost to retry under these circumstances, we do it ourselves. + boost::asio::local::stream_protocol::iostream stream; + while (true) { + stream.connect(ep); + if (stream.error() != + boost::system::error_code(boost::system::errc::no_buffer_space, + boost::system::system_category())) { + break; + } + Debug(_logger) << "retrying to connect"; + stream.clear(); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } + check(stream, "connect"); Debug(_logger) << prefix("successfully connected");

7 years, 3 months

Updated werk 4782

by Simon Betz

Module: check_mk Branch: master Commit: fda61f8ba29dee8a64ba4b9d368e26cd77d602e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fda61f8ba29dee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 23 12:43:47 2017 +0200 Updated werk 4782 Change-Id: Iab2e291bc4a1f05231a59a2e337b3cb4c4dd0e7f --- web/htdocs/watolib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 1d1bc97..13d53a5 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1939,12 +1939,12 @@ class CREFolder(BaseFolder): def _get_parents_of_hosts(self, host_names): - # Note: Deletion of chosen hosts which are a parent + # Note: Deletion of chosen hosts which are parents # is possible if and only if all children are chosen, too. hosts_with_children = {} for child_key, child in Folder.root_folder().all_hosts_recursively().items(): for host_name in host_names: - if host_name in child.host_names(): + if host_name in child.parents(): hosts_with_children.setdefault(host_name, []) hosts_with_children[host_name].append(child_key)

7 years, 3 months

4782 Prevent deletion of parent host

by Simon Betz

Module: check_mk Branch: master Commit: cf2f3d124a72b6c7ba0b18cffddfebed081e56ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf2f3d124a72b6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 12 09:21:09 2017 +0200 4782 Prevent deletion of parent host Change-Id: I08dc31201d1f361344fd3fe3802c96aa7b191ccc --- .werks/4782 | 13 +++++++++++++ web/htdocs/wato.py | 1 - web/htdocs/watolib.py | 41 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/.werks/4782 b/.werks/4782 new file mode 100644 index 0000000..37ffaaf --- /dev/null +++ b/.werks/4782 @@ -0,0 +1,13 @@ +Title: Prevent deletion of parent host +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1497251963 +Class: feature + +If you want to delete hosts which have parents, an error is +raised and the deletion of these hosts won't be executed. +Either you have to resolve the parent-child relationships +or all related hosts are chosen. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 95d112e..6e07a6e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1336,7 +1336,6 @@ def mode_edit_host(phase, new, is_cluster): return action_edit_host(mode, hostname, is_cluster) - # Show outcome of host validation. Do not validate new hosts errors = None if new: diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4e0bdbef..1d1bc97 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1801,8 +1801,15 @@ class CREFolder(BaseFolder): self.need_permission("write") self.need_unlocked_subfolders() - # 2. Actual modification + # 2. check if hosts have parents subfolder = self.subfolder(name) + hosts_with_children = self._get_parents_of_hosts(subfolder.all_hosts_recursively().keys()) + if hosts_with_children: + raise MKUserError("delete_host", _("You cannot delete these hosts: %s") % \ + ", ".join([_("%s is parent of %s.") % (parent, ", ".join(children)) + for parent, children in sorted(hosts_with_children.items())])) + + # 3. Actual modification call_hook_folder_deleted(subfolder) add_change("delete-folder", _("Deleted folder %s") % subfolder.alias_path(), obj=self, @@ -1908,10 +1915,17 @@ class CREFolder(BaseFolder): self.need_unlocked_hosts() self.need_permission("write") - # 2. Delete host specific files (caches, tempfiles, ...) + # 2. check if hosts have parents + hosts_with_children = self._get_parents_of_hosts(host_names) + if hosts_with_children: + raise MKUserError("delete_host", _("You cannot delete these hosts: %s") % \ + ", ".join([_("%s is parent of %s.") % (parent, ", ".join(children)) + for parent, children in sorted(hosts_with_children.items())])) + + # 3. Delete host specific files (caches, tempfiles, ...) self._delete_host_files(host_names) - # 3. Actual modification + # 4. Actual modification for host_name in host_names: host = self.hosts()[host_name] del self._hosts[host_name] @@ -1924,6 +1938,23 @@ class CREFolder(BaseFolder): self.save_hosts() + def _get_parents_of_hosts(self, host_names): + # Note: Deletion of chosen hosts which are a parent + # is possible if and only if all children are chosen, too. + hosts_with_children = {} + for child_key, child in Folder.root_folder().all_hosts_recursively().items(): + for host_name in host_names: + if host_name in child.host_names(): + hosts_with_children.setdefault(host_name, []) + hosts_with_children[host_name].append(child_key) + + result = {} + for parent, children in hosts_with_children.items(): + if not set(children) < set(host_names): + result.setdefault(parent, children) + return result + + # Group the given host names by their site and delete their files def _delete_host_files(self, host_names): hosts_by_site = {} @@ -2209,9 +2240,9 @@ class SearchFolder(BaseFolder): def delete_hosts(self, host_names): auth_errors = [] - for folder, host_names in self._group_hostnames_by_folder(host_names): + for folder, these_host_names in self._group_hostnames_by_folder(host_names): try: - folder.delete_hosts(host_names) + folder.delete_hosts(these_host_names) except MKAuthException, e: auth_errors.append(_("<li>Cannot delete hosts in folder %s: %s</li>") % (folder.alias_path(), e)) self._invalidate_search()

7 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017