Module: check_mk Branch: master Commit: 440e4953f91a651d2fdbc38d4052b300b1a03448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=440e4953f91a65… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Oct 6 16:11:42 2015 +0200 #2655 Windows Agent can now read additional settings from an optional check_mk_local.ini file The settings from check_mk_local.ini (if it exists) will be merged with the settings from check_mk.ini in a reasonable way. What is reasonable depends a lot on the parameter. Settings that have only one value (i.e. port) will simply be overwritten by the "local" settings. Many settings that can appear repeatedly, i.e. performance counters, will be appended. Yet other settings, especially those with pattern where only the first match applies, the "local" settings will be prepended to the existing settings (thus have higher priority). If in doubt about how the files are being combined, you can run "check_mk_agent.exe showconfig" to display the effective settings after merging the two files. --- .werks/2655 | 18 + ChangeLog | 1 + agents/windows/.gitignore | 2 + agents/windows/Configuration.cc | 905 ++++++++++ agents/windows/Configuration.h | 220 +++ agents/windows/Environment.cc | 146 ++ agents/windows/Environment.h | 80 + agents/windows/Makefile | 45 +- agents/windows/SettingsCollector.cc | 55 + agents/windows/SettingsCollector.h | 238 +++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 307712 -> 633344 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 307712 -> 633344 bytes agents/windows/check_mk_agent.cc | 1986 ++++------------------ agents/windows/check_mk_agent.exe | Bin 190976 -> 545792 bytes agents/windows/check_mk_agent.msi | Bin 747520 -> 1433088 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 190976 -> 545792 bytes agents/windows/install_agent-64.exe | Bin 181093 -> 313788 bytes agents/windows/install_agent.exe | Bin 163075 -> 302107 bytes agents/windows/stringutil.cc | 213 +++ agents/windows/stringutil.h | 58 + agents/windows/types.h | 263 +++ 22 files changed, 2597 insertions(+), 1635 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=440e4953f9…