[checkmk-commits] #2860 FIX mssql.vbs: Now really used the configuration file from the agent config directory

Module: check_mk Branch: master Commit: 2f1c78142afac5e7651b580d5e6d93bd08c9e272 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f1c78142afac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 11:09:03 2015 +0100 #2860 FIX mssql.vbs: Now really used the configuration file from the agent config directory --- .werks/2860 | 10 ++++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2860 b/.werks/2860 new file mode 100644 index 0000000..468f263 --- /dev/null +++ b/.werks/2860 @@ -0,0 +1,10 @@ +Title: mssql.vbs: Now really used the configuration file from the agent config directory +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449137317 + + diff --git a/ChangeLog b/ChangeLog index b357cf7..04b6aae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks * 2859 FIX: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available)... + * 2860 FIX: mssql.vbs: Now really used the configuration file from the agent config directory Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 856d06a..a387255 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -41,7 +41,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject") Set SHO = CreateObject("WScript.Shell") hostname = SHO.ExpandEnvironmentStrings("%COMPUTERNAME%") -cfg_dir = "C:\check_mk_agent" 'SHO.ExpandEnvironmentStrings("%MK_CONFDIR%") +cfg_dir = SHO.ExpandEnvironmentStrings("%MK_CONFDIR%") output = "" Sub addOutput(text)