Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

6239 FIX WATO host diagnostic page: SNMPv3+Credentials hosts no longer report an exception.

by Andreas

Module: check_mk Branch: master Commit: 1c2b98880814f8cdefc699c46a87ad82a12184cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c2b98880814f8… Author: Andreas <ab(a)mathias-kettner.de> Date: Wed Jun 27 15:51:40 2018 +0200 6239 FIX WATO host diagnostic page: SNMPv3+Credentials hosts no longer report an exception. The diagnose page for hosts with SNMPv3+credentials always showed the following error </tt>API Error:sequence item 14: expected string, NoneType found</tt>. This has been fixed. Change-Id: Ie67eb324b46b8af8542b3f9b680ba28fe0bd0928 --- .werks/6239 | 13 +++++++++++++ web/htdocs/wato.py | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/6239 b/.werks/6239 new file mode 100644 index 0000000..4078004 --- /dev/null +++ b/.werks/6239 @@ -0,0 +1,13 @@ +Title: WATO host diagnostic page: SNMPv3+Credentials hosts no longer report an exception. +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530107291 + +The diagnose page for hosts with SNMPv3+credentials always showed the following error </tt>API Error:sequence item 14: expected string, NoneType found</tt>. +This has been fixed. + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 432d202..11b03ac 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2870,12 +2870,14 @@ class ModeAjaxDiagHost(WatoWebApiMode): }.get(request.get("snmpv3_use")) args[7] = snmpv3_use if snmpv3_use != "noAuthNoPriv": - snmpv3_auth_proto = { "0": "md5", "1": "sha" }.get(request.get("snmpv3_auth_proto")) + snmpv3_auth_proto = { DropdownChoice.option_id("md5"): "md5", + DropdownChoice.option_id("sha"): "sha" }.get(request.get("snmpv3_auth_proto")) args[8] = snmpv3_auth_proto args[9] = request.get("snmpv3_security_name") args[10] = request.get("snmpv3_security_password") if snmpv3_use == "authPriv": - snmpv3_privacy_proto = { "0": "DES", "1": "AES" }.get(request.get("snmpv3_privacy_proto")) + snmpv3_privacy_proto = { DropdownChoice.option_id("DES"): "DES", + DropdownChoice.option_id("AES"): "AES" }.get(request.get("snmpv3_privacy_proto")) args[11] = snmpv3_privacy_proto args[12] = request.get("snmpv3_privacy_password") else:

6 years, 5 months

6224 FIX Prevent multiple mkeventd's from being started in some situations

by Konstantin Büttner

Module: check_mk Branch: master Commit: c4fb0ca6804178c7064e11163d5cc564f1668788 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4fb0ca6804178… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jun 27 15:46:52 2018 +0200 6224 FIX Prevent multiple mkeventd's from being started in some situations In rare circumstances, a non-responsive mkeventd process would stick around after an OMD restart, and the new one would not be aware of the other one's existance due to duplicated cleanup of the PID file in the Event Console's init script and the process itself respectively. We remove the cleanup in the init script, as it is more coarse. Change-Id: I7f50835dbcb4b52f0ebf3b1fd0e81d886fa1b1fb --- .werks/6224 | 16 ++++++++++++++++ omd/packages/check_mk/skel/etc/init.d/mkeventd | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/6224 b/.werks/6224 new file mode 100644 index 0000000..927f217 --- /dev/null +++ b/.werks/6224 @@ -0,0 +1,16 @@ +Title: Prevent multiple mkeventd's from being started in some situations +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530107013 + +In rare circumstances, a non-responsive mkeventd process would stick +around after an OMD restart, and the new one would not be aware of +the other one's existance due to duplicated cleanup of the PID file +in the Event Console's init script and the process itself respectively. + +We remove the cleanup in the init script, as it is more coarse. diff --git a/omd/packages/check_mk/skel/etc/init.d/mkeventd b/omd/packages/check_mk/skel/etc/init.d/mkeventd index e84279c..6395e27 100755 --- a/omd/packages/check_mk/skel/etc/init.d/mkeventd +++ b/omd/packages/check_mk/skel/etc/init.d/mkeventd @@ -74,9 +74,6 @@ case "$1" in exit 1 fi done - else - # Remove the stale pidfile to have a clean state after this - rm $PIDFILE fi echo 'OK' fi

6 years, 5 months

6145 FIX Fixed "UnboundLocalError (local variable 'section_content' referenced before assignment)" (Updates werk 6186)

by Simon Betz

Module: check_mk Branch: master Commit: 2c05f679737a979eb562591dc9a50f4d3a9cc1c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c05f679737a97… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 27 15:14:56 2018 +0200 6145 FIX Fixed "UnboundLocalError (local variable 'section_content' referenced before assignment)" (Updates werk 6186) Change-Id: I6d16b139ea548bce82b0c2e737c073b5cdfb3cb5 --- .werks/6145 | 11 +++++++++++ cmk_base/checking.py | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6145 b/.werks/6145 new file mode 100644 index 0000000..fa21445 --- /dev/null +++ b/.werks/6145 @@ -0,0 +1,11 @@ +Title: Fixed "UnboundLocalError (local variable 'section_content' referenced before assignment)" (Updates werk 6186) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530105159 + + diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 7762f9c..ba40093 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -235,6 +235,7 @@ def execute_check(multi_host_sections, hostname, ipaddress, check_plugin_name, i item_state.set_item_state_prefix(check_plugin_name, item) dont_submit = False + section_content = None try: # TODO: There is duplicate code with discovery._execute_discovery(). Find a common place! try:

6 years, 5 months

6238 FIX check_http: fixed proxy authentification problem when using NTLM

by Andreas

Module: check_mk Branch: master Commit: a0e2e5a2dd6fcca39bf5d87b9130aa68184881fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0e2e5a2dd6fcc… Author: Andreas <ab(a)mathias-kettner.de> Date: Wed Jun 27 13:33:55 2018 +0200 6238 FIX check_http: fixed proxy authentification problem when using NTLM Change-Id: Ibb7a2fefd3b1f866b8f7bae82cf8db7f00931a5a --- .werks/6238 | 10 +++++++++ .../patches/0005-check_http_proxy_usage.diff | 24 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.werks/6238 b/.werks/6238 new file mode 100644 index 0000000..e2f245e --- /dev/null +++ b/.werks/6238 @@ -0,0 +1,10 @@ +Title: check_http: fixed proxy authentification problem when using NTLM +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530099194 +Class: fix + + diff --git a/omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.diff b/omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.diff new file mode 100644 index 0000000..c1e767c --- /dev/null +++ b/omd/packages/monitoring-plugins/patches/0005-check_http_proxy_usage.diff @@ -0,0 +1,24 @@ +--- monitoring-plugins-2.2.orig/plugins/check_http.c 2018-06-27 13:02:11.455755974 +0200 ++++ monitoring-plugins-2.2/plugins/check_http.c 2018-06-27 13:05:02.778640041 +0200 +@@ -919,6 +919,21 @@ + + if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT); + asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent); ++ if (strlen(proxy_auth)) { ++ base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth); ++ xasprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth); ++ } ++ /* optionally send any other header tag */ ++ if (http_opt_headers_count) { ++ for (i = 0; i < http_opt_headers_count ; i++) { ++ if (force_host_header != http_opt_headers[i]) { ++ xasprintf (&buf, "%s%s\r\n", buf, http_opt_headers[i]); ++ } ++ } ++ /* This cannot be free'd here because a redirection will then try to access this and segfault */ ++ /* Covered in a testcase in tests/check_http.t */ ++ /* free(http_opt_headers); */ ++ } + asprintf (&buf, "%sProxy-Connection: keep-alive\r\n", buf); + asprintf (&buf, "%sHost: %s\r\n", buf, host_name); + /* we finished our request, send empty line with CRLF */

6 years, 5 months

mssql_datafiles and mssql_transactionlogs got common parse function

by Simon Betz

Module: check_mk Branch: master Commit: 41fdb574dc52cb1cb52191094f4c0406062e0d06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41fdb574dc52cb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 11:49:13 2018 +0200 mssql_datafiles and mssql_transactionlogs got common parse function Change-Id: I24e4ca4d81301a5ce445d35047e475a8a61d18f4 --- checks/mssql.include | 108 +++++++++++++++++++++++++++---------------- checks/mssql_datafiles | 3 +- checks/mssql_transactionlogs | 3 +- 3 files changed, 71 insertions(+), 43 deletions(-) diff --git a/checks/mssql.include b/checks/mssql.include index 5d9e7ea..5fd5b78 100644 --- a/checks/mssql.include +++ b/checks/mssql.include @@ -25,10 +25,16 @@ # Boston, MA 02110-1301 USA. -mssql_transactionlogs_discovery = [] - - -def format_item_mssql_datafiles(inst, database, file_name): +# .--helper--------------------------------------------------------------. +# | _ _ | +# | | |__ ___| |_ __ ___ _ __ | +# | | '_ \ / _ \ | '_ \ / _ \ '__| | +# | | | | | __/ | |_) | __/ | | +# | |_| |_|\___|_| .__/ \___|_| | +# | |_| | +# '----------------------------------------------------------------------' + +def _format_item_mssql_datafiles(inst, database, file_name): if inst is None: return "%s.%s" % (database, file_name) elif file_name is None: @@ -37,24 +43,7 @@ def format_item_mssql_datafiles(inst, database, file_name): return "%s.%s.%s" % (inst, database, file_name) -def inventory_mssql_datafiles(mode, info): - settings = host_extra_conf(host_name(), mssql_transactionlogs_discovery) - summarize = settings and settings[0].get("summarize_%s" % mode, False) - - for line in info: - if len(line) == 8: - inst, database, file_name = line[0:3] - else: - inst = None - database, file_name = line[0:2] - - if summarize: - yield format_item_mssql_datafiles(inst, database, None), {} - else: - yield format_item_mssql_datafiles(inst, database, file_name), {} - - -def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, unlimited): +def _mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, unlimited): def calculate_levels(levels, reference_value): if isinstance(levels[0], float): if reference_value != -1: @@ -116,37 +105,74 @@ def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, u if unlimited and rel_levels: yield 0, "no maximum size", [] +#. -def check_mssql_datafiles(item, params, info): - max_size_sum = allocated_size_sum = used_size_sum = 0 - unlimited_sum = False - found = False - for row in info: - if len(row) == 8: - inst, database, file_name, _physical_name, max_size, allocated_size, used_size, unlimited = row +mssql_transactionlogs_discovery = [] + + +def parse_mssql_datafiles(info): + parsed = {} + for line in info: + if len(line) == 8: + inst, database, file_name, _physical_name, max_size, allocated_size, used_size, unlimited = line unlimited = unlimited == '1' else: - database, file_name, _physical_name, max_size, allocated_size, used_size = row + database, file_name, _physical_name, max_size, allocated_size, used_size = line inst = None unlimited = False - if format_item_mssql_datafiles(inst, database, file_name) == item or \ - format_item_mssql_datafiles(inst, database, None) == item: - found = True + mssql_instance = parsed.setdefault((inst, database, file_name), {"unlimited": unlimited}) + for key, value_str in [ + ("max_size", max_size), + ("allocated_size", allocated_size), + ("used_size", used_size), + ]: + try: + value = float(value_str) * 1024 * 1024 + except ValueError: + value = None + mssql_instance[key] = value + return parsed + + +def inventory_mssql_datafiles(mode, parsed): + settings = host_extra_conf(host_name(), mssql_transactionlogs_discovery) + summarize = settings and settings[0].get("summarize_%s" % mode, False) + for inst, database, file_name in parsed.iterkeys(): + if summarize: + yield _format_item_mssql_datafiles(inst, database, None), {} + else: + yield _format_item_mssql_datafiles(inst, database, file_name), {} + - max_size, allocated_size, used_size = map(lambda x: float(x) * 1024 * 1024, - (max_size, allocated_size, used_size)) - max_size_sum += max_size - allocated_size_sum += allocated_size - used_size_sum += used_size - unlimited_sum = unlimited_sum or unlimited +def check_mssql_datafiles(item, params, parsed): + max_size_sum = 0 + allocated_size_sum = 0 + used_size_sum = 0 + unlimited_sum = False + + found = False + for (inst, database, file_name), values in parsed.iteritems(): + if _format_item_mssql_datafiles(inst, database, file_name) == item or \ + _format_item_mssql_datafiles(inst, database, None) == item: + found = True + max_size = values["max_size"] + allocated_size = values["allocated_size"] + used_size = values["used_size"] + if max_size: + max_size_sum += max_size + if allocated_size: + allocated_size_sum += allocated_size + if used_size: + used_size_sum += used_size + unlimited_sum = unlimited_sum or values["unlimited"] if not found: # Assume general connection problem to the database, which is reported # by the "X Instance" service and skip this check. raise MKCounterWrapped("Failed to connect to database") - return mssql_datafiles_process_sizes(params, used_size_sum, allocated_size_sum, - max_size_sum, unlimited_sum) + return _mssql_datafiles_process_sizes(params, used_size_sum, allocated_size_sum, + max_size_sum, unlimited_sum) diff --git a/checks/mssql_datafiles b/checks/mssql_datafiles index 3abd87c..e122868 100644 --- a/checks/mssql_datafiles +++ b/checks/mssql_datafiles @@ -35,8 +35,9 @@ factory_settings['mssql_datafiles_default_levels'] = { check_info['mssql_datafiles'] = { + 'parse_function' : parse_mssql_datafiles, + 'inventory_function' : lambda parsed: inventory_mssql_datafiles("datafiles", parsed), 'check_function' : check_mssql_datafiles, - 'inventory_function' : lambda info: inventory_mssql_datafiles("datafiles", info), 'service_description' : 'MSSQL Datafile %s', 'group' : "mssql_datafiles", 'has_perfdata' : True, diff --git a/checks/mssql_transactionlogs b/checks/mssql_transactionlogs index 3dfcebd..eae0f87 100644 --- a/checks/mssql_transactionlogs +++ b/checks/mssql_transactionlogs @@ -35,8 +35,9 @@ factory_settings['mssql_transactionlogs_default_levels'] = { check_info['mssql_transactionlogs'] = { + 'parse_function' : parse_mssql_datafiles, + 'inventory_function' : lambda parsed: inventory_mssql_datafiles("transactionlogs", parsed), 'check_function' : check_mssql_datafiles, - 'inventory_function' : lambda info: inventory_mssql_datafiles("transactionlogs", info), 'service_description' : 'MSSQL Transactionlog %s', 'group' : "mssql_transactionlogs", 'has_perfdata' : True,

6 years, 5 months

Fix OpenHardwareMonitorCLI.exe binary executable

by Jukka Aro

Module: check_mk Branch: master Commit: bb128324ee138e9d3a5d08cea4b7eee809620821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb128324ee138e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Jun 27 10:19:45 2018 +0200 Fix OpenHardwareMonitorCLI.exe binary executable Change-Id: Iff99ac8c29a1fedda75e6837cb4a50823d682e8b --- .../Bin/Release/OpenHardwareMonitorCLI.exe | Bin 11264 -> 11264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe index db1eaaa..efffc2c 100755 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe differ

6 years, 5 months

6191 FIX Configure additional Windows eventlogs with keyword 'logfile'

by Jukka Aro

Module: check_mk Branch: master Commit: 4e2a753d420bf1ebb921c078eb38eb90bc4b6ce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e2a753d420bf1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jun 26 16:06:32 2018 +0200 6191 FIX Configure additional Windows eventlogs with keyword 'logfile' Werk #3106 (Check_MK 1.4.0i1) introduced the possibility of configuring additional eventlogs with the keyword 'logname'. However, this was not supported by the Agent Bakery that only knew the keyword 'logfile'. Now, additional, non-standard eventlogs that are not found in Windows registry, can be configured for monitoring with the ordinary keyword 'logfile', e.g. "logfile Microsoft-Windows-GroupPolicy/Operational = warn" so that they can also be configured normally through the Agent Bakery. Note that non-standard eventlogs also require the option vista_api to be set to 'yes.' Using the keyword 'logname' is strongly discouraged and that keyword should be considered deprecated. It will remain functional only for compatibility with old, manually configured check_mk.ini files. Change-Id: I158a212746468041ce34f719cc0b4d5598b23eae --- .werks/6191 | 26 ++++++++++++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 12 ++++++------ agents/windows/sections/SectionEventlog.cc | 17 ++++++++--------- agents/windows/sections/SectionEventlog.h | 9 +++------ 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/.werks/6191 b/.werks/6191 new file mode 100644 index 0000000..a5c82d4 --- /dev/null +++ b/.werks/6191 @@ -0,0 +1,26 @@ +Title: Configure additional Windows eventlogs with keyword 'logfile' +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530020759 +Class: fix + +Werk #3106 (Check_MK 1.4.0i1) introduced the possibility of configuring +additional eventlogs with the keyword 'logname'. However, this was not +supported by the Agent Bakery that only knew the keyword 'logfile'. + +Now, additional, non-standard eventlogs that are not found in Windows +registry, can be configured for monitoring with the ordinary keyword +'logfile', e.g. +"logfile Microsoft-Windows-GroupPolicy/Operational = warn" +so that they can also be configured normally through the Agent Bakery. +Note that non-standard eventlogs also require the option vista_api to +be set to 'yes.' + +Using the keyword 'logname' is strongly discouraged and that keyword +should be considered deprecated. It will remain functional only for +compatibility with old, manually configured check_mk.ini files. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 49f2b70..f5192e7 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3256 +3258 diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index ae7addc..8bf57b7 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -115,8 +115,8 @@ # activate modern eventlog api introduced in vista # pro: supports new logs introduced with vista # contra: only on vista (server 2008) and newer, less well tested, maybe slower - # Note: setting this does not change the default set of monitored logs, - # see logname for that + # Note: setting this does not change the default set of monitored logs that + # are found in Windows registry. # vista_api = yes # Testing: output *all* messages from the eventlogs @@ -133,12 +133,12 @@ # send messages of type warn or crit # logfile * = off - # Activate a specific log. Unlike logfile this can be used to activate - # monitoring of a new-style logfile (see vista_api) but it doesn't - # support wildcards (yet). + # Activate a specific log. Requires vista_api = yes. This can be used to + # activate the monitoring of a log not found in Windows registry. Note: + # wildcards only work with standard logs that are found in Windows registry. # To find the correct name for a log, right-click on the log in # event-viewer -> Properties and use the name from "Full Name" - # logname Microsoft-Windows-GroupPolicy/Operational = warn + # logfile Microsoft-Windows-GroupPolicy/Operational = warn [mrpe] # Run classical monitoring plugins. The word before the command diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 2e8335d..23c5360 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -218,7 +218,7 @@ eventlog::config from_string<eventlog::config>(const WinApiInterface &, } } - return eventlog::config("", level, hide_context, false); + return eventlog::config("", level, hide_context); } namespace eventlog { @@ -257,7 +257,6 @@ void Configurable::feed(const std::string &var, const std::string &value) { } entry.name = join(std::next(tokens.cbegin()), tokens.cend(), " "); - entry.vista_api = (tokens[0] == "logname"); add(entry); } @@ -371,13 +370,11 @@ FindResult SectionEventlog::findLog(const HKeyHandle &hKey, DWORD index) const { buffer.data()}; } -void SectionEventlog::registerVistaStyleLogs(eventlog::States &states) { - // enable the vista-style logs if that api is enabled +void SectionEventlog::registerAdditionalEventlogs(eventlog::States &states) { + // if vista API enabled, register additional configured logs not in registry if (*_vista_api) { for (const auto &eventlog : *_config) { - if (eventlog.vista_api) { - registerEventlog(eventlog.name, *_sendall, states); - } + registerEventlog(eventlog.name, *_sendall, states); } } } @@ -386,6 +383,7 @@ void SectionEventlog::registerVistaStyleLogs(eventlog::States &states) { event logs are available. */ bool SectionEventlog::find_eventlogs(std::ostream &out, eventlog::States &states) { + // 1) Find and register ordinary event logs found in registry. const std::string regpath{"SYSTEM\\CurrentControlSet\\Services\\Eventlog"}; HKEY key = nullptr; bool success = true; @@ -406,8 +404,9 @@ bool SectionEventlog::find_eventlogs(std::ostream &out, out << "ERROR: Cannot open registry key " << regpath << " for enumeration: error code " << lastError << "\n"; } - - registerVistaStyleLogs(states); + // 2) Register additional, configured logs that are not in registry. + // Note: only supported with vista API enabled. + registerAdditionalEventlogs(states); return success; } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index cadbf3c..70a751e 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -39,17 +39,14 @@ std::ostream &operator<<(std::ostream &os, const Level &l); // Configuration entries from [logwatch] for individual logfiles struct config { - config(const std::string &name, Level level, bool hide_context, - bool vista_api) + config(const std::string &name, Level level, bool hide_context) : name(name) , level(level) - , hide_context(hide_context) - , vista_api(vista_api) {} + , hide_context(hide_context) {} std::string name; Level level; bool hide_context; - bool vista_api; }; std::ostream &operator<<(std::ostream &out, const config &val); @@ -108,7 +105,7 @@ private: uint64_t previouslyReadId, eventlog::Level level, bool hideContext); FindResult findLog(const HKeyHandle &hKey, DWORD index) const; - void registerVistaStyleLogs(eventlog::States &states); + void registerAdditionalEventlogs(eventlog::States &states); bool find_eventlogs(std::ostream &out, eventlog::States &states); void saveEventlogOffsets(const std::string &statefile, const eventlog::States &states);

6 years, 5 months

6223 fileinfo: Read config from fileinfo.d dropin directory on Linux

by Konstantin Büttner

Module: check_mk Branch: master Commit: f44a32597231c0388eae49901277e8629155a1e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f44a32597231c0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jun 26 14:47:31 2018 +0200 6223 fileinfo: Read config from fileinfo.d dropin directory on Linux If a fileinfo.cfg file is present, the Linux agent will now also read patterns from files in $MK_CONFDIR/fileinfo.d Change-Id: Ie600a9916378441c80a76d257602bcd6e332257a --- .werks/6223 | 11 +++++++++++ agents/check_mk_agent.linux | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6223 b/.werks/6223 new file mode 100644 index 0000000..07b05d7 --- /dev/null +++ b/.werks/6223 @@ -0,0 +1,11 @@ +Title: fileinfo: Read config from fileinfo.d dropin directory on Linux +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530019246 +Class: feature + +If a fileinfo.cfg file is present, the Linux agent will now also +read patterns from files in $MK_CONFDIR/fileinfo.d diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ebb61cd..13f7389 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -874,14 +874,14 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then OLD_IFS=$IFS IFS=' ' - while read -r pattern; do + (cat $MK_CONFDIR/fileinfo.cfg $MK_CONFDIR/fileinfo.d/* 2>/dev/null) | while read -r pattern; do case $pattern in /*) pattern=$(replace_datevariable "$pattern") for file in $pattern; do stat -c "%n|%s|%Y" "$file" 2> /dev/null || echo "$file|missing|$(date +%s)" done ;; esac - done < "$MK_CONFDIR/fileinfo.cfg" + done IFS=$OLD_IFS fi

6 years, 5 months

Fixed typo in mssql.vbs

by Marcel Schulte

Module: check_mk Branch: master Commit: 7abb7fac025464986f8dfdc2d0a218ad43c77b7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7abb7fac025464… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Jun 26 14:59:33 2018 +0200 Fixed typo in mssql.vbs Change-Id: I075790390aa0e07b855595b0c96a7aa8cd13c736 --- agents/windows/plugins/mssql.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 3c159f6..c4f2c5a 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -98,7 +98,7 @@ sections.add "blocked_sessions", "<<<mssql_blocked_sessions:sep(124)>>>" sections.add "backup", "<<<mssql_backup:sep(124)>>>" sections.add "transactionlogs", "<<<mssql_transactionlogs:sep(124)>>>" sections.add "datafiles", "<<<mssql_datafiles:sep(124)>>>" -sections.add "clusters", "<<<mssql_cluster:sep(124)>>" +sections.add "clusters", "<<<mssql_cluster:sep(124)>>>" ' Has been deprecated with 1.4.0i1. Keep this for nicer transition for some versions. sections.add "versions", "<<<mssql_versions:sep(124)>>>"

6 years, 5 months

Fix OpenHardwareMonitorCLI.exe binary executable

by Jukka Aro

Module: check_mk Branch: master Commit: 200df30287ea6ef3ac6122e9c00b0f3ab497a95c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=200df30287ea6e… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Jun 26 11:32:37 2018 +0200 Fix OpenHardwareMonitorCLI.exe binary executable Change-Id: I62ed90b924a905e92fca6a22a98c99574523d937 --- .../Bin/Release/OpenHardwareMonitorCLI.exe | Bin 11264 -> 11264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe index 2a4676f..db1eaaa 100755 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe differ

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018