Module: check_mk Branch: master Commit: 67efb09a0acd60ce15262a93bc59c5299c8c81ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67efb09a0acd60… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jun 9 13:54:48 2017 +0200 4781 FIX mk_oracle, mk_oracle.aix: Added support for Oracle 12.2 Change-Id: Ib005dc43807390b562cfbcd58369a12dd94b8996 --- .werks/4781 | 11 +++++++++++ agents/plugins/mk_oracle | 18 +++++++++++------- agents/plugins/mk_oracle.aix | 16 ++++++++++------ 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.werks/4781 b/.werks/4781 new file mode 100644 index 0000000..ee35ebf --- /dev/null +++ b/.werks/4781 @@ -0,0 +1,11 @@ +Title: mk_oracle, mk_oracle.aix: Added support for Oracle 12.2 +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1497009246 + + diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 028b6bc..edcd2c0 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -801,33 +801,37 @@ function get_oraversion () { fi # remove possible existing variables - unset AT_LEAST_ORACLE_121 AT_LEAST_ORACLE_112 AT_LEAST_ORACLE_111 AT_LEAST_ORACLE_102 AT_LEAST_ORACLE_101 AT_LEAST_ORACLE_92 + unset AT_LEAST_ORACLE_122 AT_LEAST_ORACLE_121 AT_LEAST_ORACLE_112 AT_LEAST_ORACLE_111 AT_LEAST_ORACLE_102 AT_LEAST_ORACLE_101 AT_LEAST_ORACLE_92 - if [ "$ORACLE_VERSION" = '12.1' ] ; then + if [ "$ORACLE_VERSION" = '12.2' ] ; then + AT_LEAST_ORACLE_122=yes + fi + + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' ] ; then AT_LEAST_ORACLE_121=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' ] ; then + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' ] ; then AT_LEAST_ORACLE_112=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' ] ; then AT_LEAST_ORACLE_111=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' ] ; then AT_LEAST_ORACLE_102=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' \ -o "$ORACLE_VERSION" = '10.1' ] ; then AT_LEAST_ORACLE_101=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' \ -o "$ORACLE_VERSION" = '10.1' -o "$ORACLE_VERSION" = '9.2' ] ; then AT_LEAST_ORACLE_92=yes diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index 7ad2bff..27f5bb4 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -723,31 +723,35 @@ function get_oraversion () { # remove possible existing variables unset AT_LEAST_ORACLE_121 AT_LEAST_ORACLE_112 AT_LEAST_ORACLE_111 AT_LEAST_ORACLE_102 AT_LEAST_ORACLE_101 AT_LEAST_ORACLE_92 - if [ "$ORACLE_VERSION" = '12.1' ] ; then + if [ "$ORACLE_VERSION" = '12.2' ] ; then + AT_LEAST_ORACLE_122=yes + fi + + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' ] ; then AT_LEAST_ORACLE_121=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' ] ; then + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' ] ; then AT_LEAST_ORACLE_112=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' ] ; then AT_LEAST_ORACLE_111=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' ] ; then AT_LEAST_ORACLE_102=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' \ -o "$ORACLE_VERSION" = '10.1' ] ; then AT_LEAST_ORACLE_101=yes fi - if [ "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ + if [ "$ORACLE_VERSION" = '12.2' -o "$ORACLE_VERSION" = '12.1' -o "$ORACLE_VERSION" = '11.2' \ -o "$ORACLE_VERSION" = '11.1' -o "$ORACLE_VERSION" = '10.2' \ -o "$ORACLE_VERSION" = '10.1' -o "$ORACLE_VERSION" = '9.2' ] ; then AT_LEAST_ORACLE_92=yes