Module: check_mk
Branch: master
Commit: 7c63f56b08bc2a3f8447540a799681e2516cb929
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c63f56b08bc2a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue May 19 17:33:29 2015 +0200
#2277 mk_oracle.ps1: changed location of config file
The config file <i>mk_oracle_cfg.ps1</i> is now located in the agents
subdirectory <i>config</i>. You need to manually move the configuration from
the agents base dir into the <i>config<i> dir.
---
.werks/2277 | 12 ++++++++++++
ChangeLog | 2 ++
agents/windows/plugins/mk_oracle.ps1 | 8 +++++++-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.werks/2277 b/.werks/2277
new file mode 100644
index 0000000..4ebe0a0
--- /dev/null
+++ b/.werks/2277
@@ -0,0 +1,12 @@
+Title: mk_oracle.ps1: changed location of config file
+Level: 1
+Component: checks
+Compatible: incomp
+Version: 1.2.7i1
+Date: 1432049452
+Class: feature
+
+The config file <i>mk_oracle_cfg.ps1</i> is now located in the agents
+subdirectory <i>config</i>. You need to manually move the configuration from
+the agents base dir into the <i>config<i> dir.
+
diff --git a/ChangeLog b/ChangeLog
index 33f487c..0457fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -182,6 +182,8 @@
* 2275 windows agent: new subfolders, improved folder cleanup during uninstall...
NOTE: Please refer to the migration notes!
* 2276 mk_inventory.ps1: now uses directory ./state for its statefiles
+ * 2277 mk_oracle.ps1: changed location of config file...
+ NOTE: Please refer to the migration notes!
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1
index 52e4750..29bc33b 100644
--- a/agents/windows/plugins/mk_oracle.ps1
+++ b/agents/windows/plugins/mk_oracle.ps1
@@ -127,8 +127,14 @@ Param(
}
}
+# filename for timestamp
+$MK_CONFDIR = $env:MK_CONFDIR
+
+# Fallback if the (old) agent does not provide the MK_CONFDIR
+if (!$MK_CONFDIR) {
+ $MK_CONFDIR= "c:\Program Files (x86)\check_mk\config"
+}
-$MK_CONFDIR="C:\Program Files (x86)\check_mk"
# Source the optional configuration file for this agent plugin
$CONFIG_FILE="${MK_CONFDIR}\mk_oracle_cfg.ps1"
if (test-path -path "${CONFIG_FILE}" ) {