Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5210 FIX LDAP: Fixed equal default value for custom variable sync plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fa8ec98c1e3dbdff253cd22ba0b3f2b05be3d8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fa8ec98c1e3db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 12:11:46 2017 +0200 5210 FIX LDAP: Fixed equal default value for custom variable sync plugins The LDAP sync plugins that are dynamically created for each configured custom user attribute all had the same default value for the LDAP field to use during syncing. Change-Id: Ia1213721b94d1746d81d68880e711318170e2be7 --- .werks/5210 | 13 +++++++++++++ web/plugins/userdb/ldap.py | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/5210 b/.werks/5210 new file mode 100644 index 0000000..a31b9d2 --- /dev/null +++ b/.werks/5210 @@ -0,0 +1,13 @@ +Title: LDAP: Fixed equal default value for custom variable sync plugins +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506420627 + +The LDAP sync plugins that are dynamically created for each configured +custom user attribute all had the same default value for the LDAP field +to use during syncing. diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 919dc5e..ea8cee3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -1303,11 +1303,17 @@ def register_user_attribute_sync_plugins(): if attr_name not in ldap_builtin_attribute_plugin_names: del ldap_attribute_plugins[attr_name] + def default_attr_value(attr): + return lambda: ldap_attr_of_connection(g_editing_connection_id, attr) + + def needed_attributes(attr): + return lambda connection, params: [ params.get('attr', connection.ldap_attr(attr)).lower() ] + for attr, val in get_user_attributes(): ldap_attribute_plugins[attr] = { 'title': val['valuespec'].title(), 'help': val['valuespec'].help(), - 'needed_attributes': lambda connection, params: [ params.get('attr', connection.ldap_attr(attr)).lower() ], + 'needed_attributes': needed_attributes(attr), 'sync_func': lambda connection, plugin, params, user_id, ldap_user, user: \ ldap_sync_simple(user_id, ldap_user, user, plugin, params.get('attr', connection.ldap_attr(plugin)).lower()), @@ -1316,7 +1322,7 @@ def register_user_attribute_sync_plugins(): ('attr', TextAscii( title = _("LDAP attribute to sync"), help = _("The LDAP attribute whose contents shall be synced into this custom attribute."), - default_value = lambda: ldap_attr_of_connection(g_editing_connection_id, attr), + default_value = default_attr_value(attr), )), ], }

6 years, 9 months

Hack to fix tests with long version paths

by Lars Michelsen

Module: check_mk Branch: master Commit: 67a546bcaf690b2356087322ccbeaede9c44c8a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67a546bcaf690b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 11:38:10 2017 +0200 Hack to fix tests with long version paths Change-Id: I4f453134a42b3d8151bd19c4953b50b25e10d3f6 --- tests/testlib/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6298c5d..6a3c99d 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -407,8 +407,14 @@ class Site(object): execute("sudo sed -i \"s|%s|%s|g\" %s/bin/omd" % (src_version, new_version_name, self.version.version_path())) - execute("sudo chrpath -r %s/lib %s/bin/python" % - (self.root, self.version.version_path())) + # we should use self.version.version_path() in the RPATH, but that is limited to + # 32 bytes and our versions exceed this limit. We need to use some hack to make + # this possible + if not os.path.exists("/omd/v"): + execute("sudo /bin/ln -s /omd/versions /omd/v") + + execute("sudo chrpath -r /omd/v/%s/lib %s/bin/python" % + (self.version.version_directory(), self.version.version_path())) self._add_version_path_to_index_py()

6 years, 9 months

hitachi_hnas_volume: Refactoring to prepare check for virtual volumes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b07344ccdf1298545b5a52019d81e2f01ca3dae6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b07344ccdf1298… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Sep 22 12:24:23 2017 +0200 hitachi_hnas_volume: Refactoring to prepare check for virtual volumes Change-Id: Ib8cba955742cabbdc67522c17b201685e03ef677 --- checks/hitachi_hnas.include | 22 +++++++++++ checks/hitachi_hnas_volume | 90 ++++++++++++++++++++++----------------------- 2 files changed, 67 insertions(+), 45 deletions(-) diff --git a/checks/hitachi_hnas.include b/checks/hitachi_hnas.include index 5d180f6..89f9277 100644 --- a/checks/hitachi_hnas.include +++ b/checks/hitachi_hnas.include @@ -25,6 +25,28 @@ # Boston, MA 02110-1301 USA. +def parse_hnas_physical_volumes(volume_data): + status_map = { + '1': 'unformatted', + '2': 'mounted', + '3': 'formatted', + '4': 'needsChecking', + } + + parsed_volumes = {} + + for volume_id, label, status_id, size, avail, evs in volume_data: + if volume_id == '': + continue + volume = '%s %s' % (volume_id, label) + status = status_map.get(status_id, 'unidentified') + size_mb = int(size) / 1048576.0 if size else None + avail_mb = int(avail) / 1048576.0 if avail else None + parsed_volumes[volume] = (status, size_mb, avail_mb, evs) + + return parsed_volumes + + def hitachin_hnas_scan_function(oid): system_oid = oid(".1.3.6.1.2.1.1.2.0") diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume index 824fdd7..d5072a4 100644 --- a/checks/hitachi_hnas_volume +++ b/checks/hitachi_hnas_volume @@ -24,66 +24,66 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -check_includes["hitachi_hnas_volume"] = [ "df.include" ] -def inventory_hitachi_hnas_volume(info): - mplist = [] - for id, label, volume_status, total, free, evs in info: - mplist.append(id + " " + label) - return df_inventory(mplist) +def parse_hitachi_hnas_volume(info): + parsed = { + 'volumes': parse_hnas_physical_volumes(info), + } -def check_hitachi_hnas_volume(item, params, info): - # use checks from df.include - fslist = [] - for volid, label, volume_status, total, free, evs in info: - if volid == '': - continue - if volid + " " + label == item: - if total and free: - size_mb = int(total) / 1048576.0 - avail_mb = int(free) / 1048576.0 - fslist.append((item, size_mb, avail_mb, 0)) - status, message, perfdata = df_check_filesystem_list(item, params, fslist) - else: - status = 0 - message = "no filesystem size information" - perfdata = [] + return parsed - # evaluate volumeStatus - statusmap = (("", 3), - ("unformatted", 1), - ("mounted", 0), - ("formatted", 1), - ("needsChecking", 2), - ) - error_string = ( "", " (!)", " (!!)", "" ) - volume_status = int(volume_status) +def inventory_hitachi_hnas_volume(parsed): + return df_inventory( + volume for volume in parsed['volumes'] + ) - if volume_status == 0 or volume_status >= len(statusmap): - message += ", Volume reports unidentified status %s" % volume_status - status = max(status, 3) - else: - message += ", Status %s%s" % (statusmap[volume_status][0], error_string[statusmap[volume_status][1]]) - status = max(status, statusmap[volume_status][1]) - # report evs - message += ", assigned to EVS %s" % evs - return status, message, perfdata +def check_hitachi_hnas_volume(item, params, parsed): + volume_data = parsed['volumes'].get(item) + if not volume_data: + yield 3, "Volume %s not found" % item + return + status, size_mb, avail_mb, evs = volume_data - return 3, "Volume %s not found" % item + if size_mb and avail_mb: + fslist = [(item, size_mb, avail_mb, 0)] + yield df_check_filesystem_list(item, params, fslist) + else: + yield 0, "no filesystem size information", [] + + state_map = { + 'mounted': 0, + 'unformatted': 1, + 'formatted': 1, + 'needsChecking': 2, + } + + if status == 'unidentified': + yield 3, 'Volume reports unidentified status' + else: + yield state_map[status], 'Status: %s' % status + + yield 0, 'assigned to EVS %s' % evs check_info["hitachi_hnas_volume"] = { + "parse_function" : parse_hitachi_hnas_volume, "check_function" : check_hitachi_hnas_volume, "inventory_function" : inventory_hitachi_hnas_volume, "service_description" : "Volume %s", "has_perfdata" : True, - "snmp_info" : (".1.3.6.1.4.1.11096.6.1.1.1.3.5.2.1", [1, 3, 4, 5, 6, 7]), - # volumeSysDriveIndex, volumeLabel, volumeStatus, volumeCapacity, - # volumeFreeCapacity, volumeEnterpriseVirtualServer + "snmp_info" : ( # BLUEARC-SERVER-MIB + ".1.3.6.1.4.1.11096.6.1.1.1.3.5.2.1", [ # volumeEntry + 1, # volumeSysDriveIndex + 3, # volumeLabel + 4, # volumeStatus + 5, # volumeCapacity + 6, # volumeFreeCapacity + 7, # volumeEnterpriseVirtualServer + ]), "snmp_scan_function" : hitachin_hnas_scan_function, "group" : "filesystem", "default_levels_variable": "filesystem_default_levels", - "includes" : [ "hitachi_hnas.include" ], + "includes" : ["df.include", "hitachi_hnas.include"], }

6 years, 9 months

5097 cpu_util.include: Alert on high utilization over an extended time period on total CPU and alert on too high CPU utilization on single cores

by Simon Betz

Module: check_mk Branch: master Commit: 5c23142ddaf71bc10615ece3e0098fcd4faa9993 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c23142ddaf71b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 14 14:50:25 2017 +0200 5097 cpu_util.include: Alert on high utilization over an extended time period on total CPU and alert on too high CPU utilization on single cores Change-Id: Icaacdb7f595498123d008d98270f22cee21e882d --- .werks/5097 | 10 +++ checks/bintec_cpu | 1 - checks/cpu_util.include | 116 ++++++++++++++++++---------- web/plugins/wato/check_parameters.py | 146 +++++++++++++++++------------------ 4 files changed, 156 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c23142dda…

6 years, 9 months

Fixed download of debian keyring (for build chroot)

by Lars Michelsen

Module: check_mk Branch: master Commit: 853f05f21347ed1adfb8b9e5e1b83814e3586dd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=853f05f21347ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 10:09:47 2017 +0200 Fixed download of debian keyring (for build chroot) Change-Id: I31976fee36b92c0e5ba73d1197317f2d82d7a8e8 --- agents/windows/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 42efbad..383c5c2 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -221,4 +221,4 @@ setup: nsis \ lcab \ debootstrap \ - ubuntu-archive-keyring + debian-archive-keyring

6 years, 9 months

5312 FIX citrix_sessions: Fixed crash if not all session values 'total', ' active' or 'inactive' are available

by Simon Betz

Module: check_mk Branch: master Commit: cf12abab6fcf75fe62e489d1bca0b1d550412f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf12abab6fcf75… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 26 10:13:11 2017 +0200 5312 FIX citrix_sessions: Fixed crash if not all session values 'total', 'active' or 'inactive' are available Change-Id: I81e2d1cd6a11837c1b3baeeb5c3030c9355953c1 --- .werks/5312 | 11 +++++++++++ checks/citrix_sessions | 52 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/.werks/5312 b/.werks/5312 new file mode 100644 index 0000000..2c27525 --- /dev/null +++ b/.werks/5312 @@ -0,0 +1,11 @@ +Title: citrix_sessions: Fixed crash if not all session values 'total', 'active' or 'inactive' are available +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506413396 + + diff --git a/checks/citrix_sessions b/checks/citrix_sessions index f3c29a7..bad10ce 100644 --- a/checks/citrix_sessions +++ b/checks/citrix_sessions @@ -24,43 +24,53 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + #<<<citrix_sessions>>> #sessions 1 #active_sessions 1 #inactive_sessions 0 + citrix_sessions_default_levels = { - "total" : ( 60, 65 ), - "active" : ( 60, 65 ), - "inactive" : ( 10, 15 ), + "total" : (60, 65), + "active" : (60, 65), + "inactive" : (10, 15), } + + def inventory_citrix_sessions(info): return [ ( None, "citrix_sessions_default_levels" )] + def check_citrix_sessions(_no_item, params, info): + session = {} + for line in info: + if len(line) > 1: + session.setdefault(line[0], int(line[1])) - if map(len, info) == [1, 1, 1]: - return 3, "Could not collect session information. Please check the agent configuration." + if not session: + yield 3, "Could not collect session information. Please check the agent configuration." + return - session = {} - session['total'], session['active'], session['inactive'] = \ - map(int, (info[0][1], info[1][1], info[2][1])) - state = 0 - messages = [] - perf = [] - for what in [ 'total', 'active', 'inactive' ]: + for key, what in [ + ('sessions', 'total'), + ('active_sessions', 'active'), + ('inactive_sessions', 'inactive') + ]: + if session.get(key) is None: + continue + state = 0 + value = session[key] + infotext = "%s: %s" % (what.title(), value) warn, crit = params.get(what, (None, None)) - perf.append(( what, session[what], warn, crit )) - if crit != None and session[what] > crit: - messages.append("%s: %s(!!)" % ( what, session[what] )) + if crit != None and value > crit: state = 2 - elif warn != None and session[what] > warn: - messages.append("%s: %s(!)" % ( what, session[what] )) - state = max(state, 1) - else: - messages.append("%s: %s" % ( what, session[what] )) + elif warn != None and value > warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s)" % (warn, crit) + yield state, infotext, [(what, value, warn, crit)] - return state, ", ".join(messages), perf check_info["citrix_sessions"] = { "group" : "citrix_sessions",

6 years, 9 months

Added missing file

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a2a882820305083175066f4ddad0e8876a08456 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a2a8828203050… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 09:32:58 2017 +0200 Added missing file Change-Id: I9c699b312a8227ae98e2587c97f426593e61cb1e --- omd/packages/python/Makefile | 5 +++++ .../{Python-2.7.13.tgz => Python-2.7.14.tgz} | Bin 17076672 -> 17176758 bytes 2 files changed, 5 insertions(+) diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index 46dafa6..cf0bcba 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -86,3 +86,8 @@ skel: clean: rm -rf $(DIR) bin build tmp.python27 + +upstream: + git rm Python-*.tgz + wget https://www.python.org/ftp/python/$(VERSION)/Python-$(VERSION).tgz + git add Python-$(VERSION).tgz diff --git a/omd/packages/python/Python-2.7.13.tgz b/omd/packages/python/Python-2.7.14.tgz similarity index 66% rename from omd/packages/python/Python-2.7.13.tgz rename to omd/packages/python/Python-2.7.14.tgz index 23f8b4f..78f0e90 100644 Binary files a/omd/packages/python/Python-2.7.13.tgz and b/omd/packages/python/Python-2.7.14.tgz differ

6 years, 9 months

Create locale directory in local hierarchy by default

by Lars Michelsen

Module: check_mk Branch: master Commit: ca2f867975a00e79dd7004701264cca98302e088 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca2f867975a00e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 26 07:30:22 2017 +0200 Create locale directory in local hierarchy by default Change-Id: I4643a35a4bc071b08c3fe2190c0773c0fba2e2a4 --- omd/packages/check_mk/skel/local/share/check_mk/locale/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/check_mk/skel/local/share/check_mk/locale/.gitignore b/omd/packages/check_mk/skel/local/share/check_mk/locale/.gitignore new file mode 100644 index 0000000..e69de29

6 years, 9 months

Fix small mishaps in Windows eventlog formatting

by Jukka Aro

Module: check_mk Branch: master Commit: 36a05ac145c2506d1cc0613f347775f51179d692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36a05ac145c250… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Tue Sep 26 08:57:47 2017 +0200 Fix small mishaps in Windows eventlog formatting * Ensure correct behaviour when trimming null characters at the end of Vista-formatted event messages by checking that message is non-empty. Also do this only for eventlogs with vista_api enabled (others should never have trailing null characters). * Fix small bug with replacing spaces with underscore in event source (replacement was done but not used in actual formatted entry). * Use prefix L for wchar_t characters. Change-Id: I6e66c9a6ff53789eead45305cf664997065a636c --- agents/windows/EventLogVista.cc | 10 +++++++++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1565696 -> 1564160 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22788184 -> 22765638 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1565696 -> 1564160 bytes agents/windows/check_mk_agent.exe | Bin 1548800 -> 1547264 bytes agents/windows/check_mk_agent.msi | Bin 3388416 -> 3385344 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19628575 -> 19613197 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1548800 -> 1547264 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 681479 -> 681081 bytes agents/windows/install_agent.exe | Bin 676294 -> 675979 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes agents/windows/sections/SectionEventlog.cc | 13 +++---------- 15 files changed, 13 insertions(+), 12 deletions(-) diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 2a84699..571b978 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -225,8 +225,16 @@ public: result = eventData(); } + // EvtFormatMessage delivers the formatted message with trailing null + // character within the required buffer size! Later, this would cause + // the socket output to be cut at the 1st null character, so we need to + // trim trailing null away here. + while (!result.empty() && result.back() == L'\0') { + result.pop_back(); + } + std::replace_if(result.begin(), result.end(), - [](wchar_t ch) { return ch == '\n' || ch == '\r'; }, + [](wchar_t ch) { return ch == L'\n' || ch == L'\r'; }, ' '); return result; } diff --git a/agents/windows/build_version b/agents/windows/build_version index 004f50e..fa913ef 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2932 +2934 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 89f0811..5d74085 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 d276630..4b3a495 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 cfacf5d..f5a18d0 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 49ac323..2761d06 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 033e7ce..f28e25d 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 2bb1a6d..77e684a 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 2431dfe..63a2b6b 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 5b4e532..eb5a5a7 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 f194649..6a9dae3 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 8223242..f99a168 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 c83e8aa..920c5a2 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 21327e4..c31890c 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 49b2ec7..e3735eb 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -148,17 +148,10 @@ void SectionEventlog::process_eventlog_entry(std::ostream &out, // source is the application that produced the event std::string source_name = to_utf8(event.source()); std::replace(source_name.begin(), source_name.end(), ' ', '_'); - auto message = event.message(); - // Nice surprise: EvtFormatMessage (used by Vista API) delivers wstring - // messages with trailing null character within the allocated wstring size! - // Later, this causes the socket output to be cut at the 1st null character, - // so we need to trim trailing null(s) away here. - while (message.back() == L'\0') { - message.resize(message.size() - 1); - } + out << type_char << " " << timestamp << " " << event.eventQualifiers() - << "." << event.eventId() << " " << Utf8(event.source()) << " " - << Utf8(message) << "\n"; + << "." << event.eventId() << " " << source_name << " " + << Utf8(event.message()) << "\n"; } void SectionEventlog::outputEventlog(std::ostream &out, const char *logname,

6 years, 9 months

Reserved 20 Werk IDS

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 47f2a01dc9616199d7ed6f645fb3a1437f424c57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47f2a01dc96161… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Sep 26 08:51:59 2017 +0200 Reserved 20 Werk IDS Change-Id: I5321b460edd99869a656c4a844271170beba3fe3 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e3aa502..57e22db 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5338 +5358

6 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017