Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

hiding password in datasource program rule

by Marcel Arentz

Module: check_mk Branch: master Commit: 06a9ab838b755764dd2f7538912f5754ca922de3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a9ab838b7557… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 8 12:56:53 2017 +0100 hiding password in datasource program rule Change-Id: Id784a711231f6c785a2c77208ad36965c16eac92 --- web/plugins/wato/datasource_programs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index ec15ca9..7d9e7d8 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -1023,7 +1023,7 @@ register_rule("datasource_programs", allow_empty = False, )), ("password", - TextAscii(title = _("Password"), + Password(title = _("Password"), allow_empty = False, )), ("values",

7 years, 6 months

Improved error messages.

by Sven Panne

Module: check_mk Branch: master Commit: e4d658d569ca327c808c4378bf8749434d7bbf23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4d658d569ca32… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 8 11:44:02 2017 +0100 Improved error messages. Change-Id: I2664ffe261d50545e11741e8ff84504b0c4707c4 --- livestatus/src/LogCache.cc | 2 +- livestatus/src/LogwatchListColumn.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index f583513..2d7d7ef 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -101,7 +101,7 @@ void LogCache::updateLogfileIndex() { scanLogfile(entry.path(), false); } } catch (const fs::filesystem_error &e) { - Warning(_logger) << "error while iterating directory: " << e.what(); + Warning(_logger) << "updating log file index: " << e.what(); } } diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index bed3bba..7055f30 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -64,6 +64,6 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, } } } catch (const fs::filesystem_error &e) { - Warning(logger()) << "error while iterating directory: " << e.what(); + Warning(logger()) << name() << ": " << e.what(); } }

7 years, 6 months

It is not an error if the logwatch directory doesn't exist.

by Sven Panne

Module: check_mk Branch: master Commit: c84792061e7b94517585f1a77db3812c3970b1d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c84792061e7b94… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 8 11:40:22 2017 +0100 It is not an error if the logwatch directory doesn't exist. Change-Id: I00e9f564ae68c010f818812c11747f90f6e1fd59 --- livestatus/src/LogwatchListColumn.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 9e84564..bed3bba 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -38,6 +38,9 @@ using std::string; void LogwatchListColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { ListRenderer l(r); + if (_logwatch_path.empty()) { + return; + } #ifdef CMC auto hst = rowData<Host>(row); @@ -53,15 +56,14 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, string host_name = hst->name; #endif - if (!_logwatch_path.empty()) { - try { - for (const auto &entry : fs::directory_iterator( - _logwatch_path + pnp_cleanup(host_name))) { + auto dir = _logwatch_path + pnp_cleanup(host_name); + try { + if (fs::exists(dir)) { + for (const auto &entry : fs::directory_iterator(dir)) { l.output(entry.path().filename().string()); } - } catch (const fs::filesystem_error &e) { - Warning(logger()) << "error while iterating directory: " - << e.what(); } + } catch (const fs::filesystem_error &e) { + Warning(logger()) << "error while iterating directory: " << e.what(); } }

7 years, 6 months

Ensure that a list is always rendered, well, as a list. :-)

by Sven Panne

Module: check_mk Branch: master Commit: 29a9f8d0c71aee9159609b4ae7723cde8abc5a85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29a9f8d0c71aee… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 8 11:36:40 2017 +0100 Ensure that a list is always rendered, well, as a list. :-) Change-Id: I3be63fe0d9f916906a9e84cd50782ed3c8bf23d3 --- livestatus/src/AttributeListColumn.cc | 2 +- livestatus/src/LogwatchListColumn.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/AttributeListColumn.cc b/livestatus/src/AttributeListColumn.cc index 3481631..f778ced 100644 --- a/livestatus/src/AttributeListColumn.cc +++ b/livestatus/src/AttributeListColumn.cc @@ -69,8 +69,8 @@ int32_t AttributeListColumn::getValue(void *row, contact * /*unused*/) { void AttributeListColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { - modified_atttibutes values(getValue(row, nullptr)); ListRenderer l(r); + modified_atttibutes values(getValue(row, nullptr)); for (const auto &entry : known_attributes) { if (values[entry.second]) { l.output(entry.first); diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index bf3c7d1..9e84564 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -37,6 +37,8 @@ using std::string; void LogwatchListColumn::output(void *row, RowRenderer &r, contact * /* auth_user */) { + ListRenderer l(r); + #ifdef CMC auto hst = rowData<Host>(row); if (hst == nullptr) { @@ -51,7 +53,6 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, string host_name = hst->name; #endif - ListRenderer l(r); if (!_logwatch_path.empty()) { try { for (const auto &entry : fs::directory_iterator(

7 years, 6 months

std::filesystems::directory_iterator returns full paths, not filenames.

by Sven Panne

Module: check_mk Branch: master Commit: 3315406fd42a87876da982a42f45f9a8ea61a44d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3315406fd42a87… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 8 09:37:37 2017 +0100 std::filesystems::directory_iterator returns full paths, not filenames. Change-Id: I5fc31f3562e7a5b4bf0ead423b7e1c637521a264 --- livestatus/src/LogCache.cc | 2 +- livestatus/src/LogwatchListColumn.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index a59b6fb..f583513 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -98,7 +98,7 @@ void LogCache::updateLogfileIndex() { fs::path dirpath = log_archive_path; try { for (const auto &entry : fs::directory_iterator(dirpath)) { - scanLogfile(dirpath / entry.path(), false); + scanLogfile(entry.path(), false); } } catch (const fs::filesystem_error &e) { Warning(_logger) << "error while iterating directory: " << e.what(); diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index fbf08b0..bf3c7d1 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -56,7 +56,7 @@ void LogwatchListColumn::output(void *row, RowRenderer &r, try { for (const auto &entry : fs::directory_iterator( _logwatch_path + pnp_cleanup(host_name))) { - l.output(entry.path().string()); + l.output(entry.path().filename().string()); } } catch (const fs::filesystem_error &e) { Warning(logger()) << "error while iterating directory: "

7 years, 6 months

4455 FIX windows agent: now longer crashes when no performancecounter for process monitoring could be found

by Andreas Boesl

Module: check_mk Branch: master Commit: 355299cfc8cac8b0b72d3b023d244a32385f31bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355299cfc8cac8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 8 09:57:51 2017 +0100 4455 FIX windows agent: now longer crashes when no performancecounter for process monitoring could be found The agent now simply skips the ps section. Change-Id: I46b2206de78344166be12d7f0576ff1cb5c7db28 --- .werks/4455 | 12 ++++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1338880 -> 1339392 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15800314 -> 15810554 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1338880 -> 1339392 bytes agents/windows/check_mk_agent.exe | Bin 1316352 -> 1316864 bytes agents/windows/check_mk_agent.msi | Bin 2925056 -> 2926080 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13661730 -> 13671970 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1316352 -> 1316864 bytes agents/windows/install_agent-64.exe | Bin 591476 -> 591554 bytes agents/windows/install_agent.exe | Bin 588705 -> 589009 bytes agents/windows/sections/SectionPS.cc | 10 +++++++++- 12 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/4455 b/.werks/4455 new file mode 100644 index 0000000..ff44d05 --- /dev/null +++ b/.werks/4455 @@ -0,0 +1,12 @@ +Title: windows agent: now longer crashes when no performancecounter for process monitoring could be found +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488963413 +Class: fix + +The agent now simply skips the ps section. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index d2c2523..fe8591e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2635 +2639 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 40ef911..60b8d9a 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 3c081e0..490e6a4 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 f6a3ff0..216c63c 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.exe b/agents/windows/check_mk_agent.exe index 13b93e0..8c07b34 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 121aa24..3df16d9 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 eaf04c2..9d28b6c 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 2d7483c..9156883 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/install_agent-64.exe b/agents/windows/install_agent-64.exe index 6f6e762..4eb40cc 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 633a805..3be3ba2 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 8d84e31..d4cfc00 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -246,7 +246,15 @@ bool SectionPS::outputWMI(std::ostream &out) { bool SectionPS::outputNative(std::ostream &out) { PROCESSENTRY32 pe32; - process_entry_t process_perfdata = getProcessPerfdata(); + process_entry_t process_perfdata; + try { + process_perfdata = getProcessPerfdata(); + } catch (const std::runtime_error &e) { + // the most likely cause is that the wmi query fails, i.e. because the + // service is currently offline. + crash_log("Exception: Error while querying process perfdata: %s", e.what()); + return false; + } WinHandle hProcessSnap(CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)); if (hProcessSnap == INVALID_HANDLE_VALUE) {

7 years, 6 months

mkbench: Fixed timing issue in cmc helper startup detection

by Lars Michelsen

Module: check_mk Branch: master Commit: 28c2567f883184ab35e721ce0c91857ace2b2d4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28c2567f883184… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 14:04:28 2017 +0100 mkbench: Fixed timing issue in cmc helper startup detection Change-Id: Ief89a5a9a9c3255b97caca26112e0d0bed1c4968 --- bin/mkbench | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/mkbench b/bin/mkbench index e6d3cdf..23c6fc2 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -2946,12 +2946,18 @@ class TestAgentBasedStandardHosts(TestCase): if num_not_ready == None: self._test.info(" Waiting for helper initialization") else: - self._test.info(" Waiting for helper initialization (%d not ready)" % num_not_ready) + self._test.info(" Waiting for helper initialization (%d not ready)" % + num_not_ready) + + try: + matched_pids = subprocess.check_output([ + "pgrep", "-u", site_id(), "-f", "python.*check_mk.py --keepalive$"]).split("\n") + except subprocess.CalledProcessError, e: + self._test.error(" Found no helper yet (%s)" % e.returncode) + continue num_not_ready = 0 - for p in subprocess.check_output([ - "pgrep", "-u", site_id(), "-f", "python.*check_mk.py --keepalive$" - ]).split("\n"): + for p in matched_pids: if p and not os.path.exists("/proc/%s/fd/3" % p): num_not_ready += 1 time.sleep(1)

7 years, 6 months

mkbench: Ensure RRDs are created in current standard RRD format

by Lars Michelsen

Module: check_mk Branch: master Commit: f0e7b0caa5fc412c6fc71698b603086ce0c0e7d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0e7b0caa5fc41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 15:53:46 2017 +0100 mkbench: Ensure RRDs are created in current standard RRD format Change-Id: I6324a1dee9f7e54c97e5cfa3ea6195e82940a509 --- bin/mkbench | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/bin/mkbench b/bin/mkbench index 23c6fc2..1d1ff10 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -2712,6 +2712,35 @@ class TestAgentBasedStandardHosts(TestCase): "] + agent_ports\n" ) + # Ensure RRDs are created with Check_MK default config + f.write( + "cmc_host_rrd_config = [\n" + " ({'rras': [\n" + " (50.0, 1, 2880), (50.0, 5, 2880),\n" + " (50.0, 30, 4320), (50.0, 360, 5840)\n" + " ],\n" + " 'step': 60,\n" + " 'cfs': ['MIN', 'MAX', 'AVERAGE'],\n" + " 'format': 'cmc_single'\n" + " },\n" + " [], ALL_HOSTS, {\n" + " 'description': u'Default RRD configuration, using new single RRD format'\n" + " }),\n" + "] + cmc_host_rrd_config\n" + "\n" + "\n" + "cmc_service_rrd_config = [\n" + " ( {'rras': [\n" + " (50.0, 1, 2880), (50.0, 5, 2880),\n" + " (50.0, 30, 4320), (50.0, 360, 5840)\n" + " ],\n" + " 'step': 60,\n" + " 'cfs': ['MIN', 'MAX', 'AVERAGE'],\n" + " 'format': 'cmc_single'\n" + " },\n" + " [], ALL_HOSTS, ALL_SERVICES ),\n" + "] + cmc_service_rrd_config\n" + ) def _create_hosts(self): @@ -2895,8 +2924,13 @@ class TestAgentBasedStandardHosts(TestCase): time.sleep(2) - num_rrds = None - while num_rrds is None or num_rrds < 23: + num_rrds, wait_sec = None, 10 + while num_rrds is None or num_rrds < 30: + if wait_sec == 0: + raise MKGeneralException("Did not create RRDs for '%s' " + "after 10 seconds" % host_name) + wait_sec -= 1 + if self._runner.shall_stop(): break num_rrds = len(glob.glob("%s/var/check_mk/rrd/%s/*.rrd" % (omd_root(), host_name)))

7 years, 6 months

mkbench: Produce dynamic data for counter based checks now

by Lars Michelsen

Module: check_mk Branch: master Commit: 99b1ba66fbaa312b7588418a603383b8db4f2400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99b1ba66fbaa31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 7 14:03:44 2017 +0100 mkbench: Produce dynamic data for counter based checks now Change-Id: Ib2cb9123b3e76a620ac42206a3230752d51f3621 --- bin/mkbench | 425 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 197 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99b1ba66fb…

7 years, 6 months

updated werk 4486

by Simon Betz

Module: check_mk Branch: master Commit: fcfb26e1caae9b3b05448bd4b1c7d95a453a231a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcfb26e1caae9b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 8 08:56:54 2017 +0100 updated werk 4486 Change-Id: Idd0761dc8428318d60b7169bed5b4e377026c681 --- checks/avaya_88xx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/avaya_88xx b/checks/avaya_88xx index a932e97..339a22e 100644 --- a/checks/avaya_88xx +++ b/checks/avaya_88xx @@ -59,7 +59,7 @@ factory_settings["avaya_88xx_default_levels"] = { def inventory_avaya_88xx(parsed): sensors = parsed["temp"] for idx, temp in enumerate(sensors): -# if temp: + if temp: yield str(idx), {} def check_avaya_88xx(item, params, parsed):

7 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017