21 Aug
2023
21 Aug
'23
6:14 a.m.
Branch: refs/heads/2.1.0
Home: https://github.com/Checkmk/checkmk
Commit: 6ccb65708dd2a3a7af2beffc7718974f27355634
https://github.com/Checkmk/checkmk/commit/6ccb65708dd2a3a7af2beffc7718974f2…
Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com>
Date: 2023-08-21 (Mon, 21 Aug 2023)
Changed paths:
M .werks/15559
M agents/plugins/mk_oracle
Log Message:
-----------
Revert "15559 FIX mk_oracle: Always use TNS_ALIAS when present"
This reverts commit 6d2577270ef3b0fecc8b7af9abd0afa1f47a5337.
Change-Id: Ic85f64ef7cd62aeb6daf756252f361a889c6016c
Commit: 9a754e2ae2f3945e5519417d5c91e97124f9fefa
https://github.com/Checkmk/checkmk/commit/9a754e2ae2f3945e5519417d5c91e9712…
Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com>
Date: 2023-08-21 (Mon, 21 Aug 2023)
Changed paths:
A tests/unit-shell/agents/plugins/test_mk_oracle.sh
Log Message:
-----------
add unittests for mk_oracle ora_db_connect
The function ora_db_connect has 100% coverage!
If you want to check the coverage yourself:
# stolen from ./tests/unit-shell/runner.sh
_REPO="$(git rev-parse --show-toplevel)"
export UNIT_SH_SHUNIT2="${_REPO}/tests/unit-shell/shunit2"
export UNIT_SH_AGENTS_DIR="${_REPO}/agents"
export UNIT_SH_PLUGINS_DIR="$UNIT_SH_AGENTS_DIR/plugins"
# stolen end
rm -r coverage
kcov --include-pattern=agents/plugins/mk_oracle $(pwd)/coverage
tests/unit-shell/agents/plugins/test_mk_oracle.sh
This cherry-pick from master adds the test_mk_oracle.sh file from
master. Four tests failed, which were removed:
test_mk_oracle_only_sids1
test_mk_oracle_skip_sids1
test_mk_oracle_exclude_all1
test_mk_oracle_only_vs_skip
Change-Id: Ia50c199d06a8c4aab5ab5f1e73852ce129426587
Commit: 92b7fb6d01219363a3db4a17343c918c394facbd
https://github.com/Checkmk/checkmk/commit/92b7fb6d01219363a3db4a17343c918c3…
Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com>
Date: 2023-08-21 (Mon, 21 Aug 2023)
Changed paths:
A .werks/15289
M agents/plugins/mk_oracle
M tests/unit-shell/agents/plugins/test_mk_oracle.sh
Log Message:
-----------
15289: mk_oracle: Revert werk 15559, use tnsping when available
Change-Id: I183434869183413a42e67f5aa5887f0417eda7a7
Compare: https://github.com/Checkmk/checkmk/compare/3e8c54eee548...92b7fb6d0121