Module: check_mk
Branch: master
Commit: 8567214d534fee321224cce245ebe0718ac375f4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8567214d534feeā¦
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Aug 23 15:54:29 2016 +0200
Revert "#2912 FIX mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with
"_[NUMBER]""
This reverts commit 530369c4e70c3b31a8496a0c01cd1d989f5ef026.
---
.werks/2912 | 14 --------------
agents/plugins/mk_oracle | 2 +-
agents/plugins/mk_oracle.aix | 2 +-
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/.werks/2912 b/.werks/2912
deleted file mode 100644
index 9469c3a..0000000
--- a/.werks/2912
+++ /dev/null
@@ -1,14 +0,0 @@
-Title: mk_oracle mk_oracle.aix: Fixed handling of DBs which names end with
"_[NUMBER]"
-Level: 1
-Component: checks
-Compatible: compat
-Version: 1.2.7i4
-Date: 1453369163
-Class: fix
-
-The agent plugin did not compute the ORACLE_SID_SHORT correctly in case of databases
-named like this:
-
-DB Instance Name = TESTDBDB
-Instance RAC Knoten 1: TESTDB_1DB
-Instance RAC Knoten 2: TESTDB_2
diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle
index 67e62b2..8c4d6a9 100755
--- a/agents/plugins/mk_oracle
+++ b/agents/plugins/mk_oracle
@@ -755,7 +755,7 @@ function set_oraenv () {
ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut
-d":" -f2)
if [ -z $ORACLE_HOME ] ; then
# cut last number from SID for Oracle RAC to find entry in oratab
- ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//")
+ ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//")
ORACLE_HOME=$(cat ${ORATAB} | grep
"^"${ORACLE_SID_SHORT}":" | cut -d":" -f2)
fi
fi
diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix
index 839133d..1259aff 100755
--- a/agents/plugins/mk_oracle.aix
+++ b/agents/plugins/mk_oracle.aix
@@ -697,7 +697,7 @@ function set_oraenv () {
ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID}":" | cut
-d":" -f2)
if [ -z $ORACLE_HOME ] ; then
# cut last number from SID for Oracle RAC to find entry in oratab
- ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/_[0-9]$//")
+ ORACLE_SID_SHORT=$(echo $ORACLE_SID | sed "s/[0-9]$//")
ORACLE_HOME=$(cat ${ORATAB} | grep "^"${ORACLE_SID_SHORT}":"
| cut -d":" -f2)
fi