mk-oracle: measure time final

Provide correct results now.
Possibility to test all section to get more reliable results
revamp, clean.

CMK-33365

Change-Id: I357e822e0ec4c3d911a7c113dc7d3ef69d1e97e6

Author: s-kipnis

agents/wnx/run.ps1

@@ -28,10 +28,12 @@ $argDetach = $false
 $argWin = $false
 $argSkipSqlTest = $false
 
-$msbuild_exe = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" `
-    -latest `
-    -requires Microsoft.Component.MSBuild `
-    -find MSBuild\**\Bin\MSBuild.exe
+$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+if (Test-Path $vswhere) {
+    $msbuild_exe = & $vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
+} else {
+    $msbuild_exe = $null
+}
 
 $repo_root = (get-item $pwd).parent.parent.FullName
 $results_dir = "$repo_root\artefacts"
@@ -701,7 +703,12 @@ function Test-MsiSigning($file) {
 Invoke-CheckApp "choco" "choco -v"
 Invoke-CheckApp "perl" "perl -v"
 Invoke-CheckApp "make" "make -v"
-Invoke-CheckApp "msvc" "& ""$msbuild_exe"" --version"
+if ($msbuild_exe) {
+    Invoke-CheckApp "msvc" "& ""$msbuild_exe"" --version"
+} else {
+    Write-Host "[-] msvc :vswhere.exe not found or Visual Studio not installed" -Fore Red
+    Exit 55
+}
 Invoke-CheckApp "is_crlf" "python .\scripts\check_crlf.py"
 
 $argAttached = $false

packages/mk-oracle/run_compare_all.sh

@@ -2,6 +2,17 @@
 # Compare outputs of the old (mk_oracle) and new (mk-oracle) plugins.
 # Usage: ./run_compare_all.sh [--diff] [--keep] [--time-only]
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+echo "=== Building release binary ==="
+TARGET_DIR=$(cargo metadata --manifest-path "${SCRIPT_DIR}/Cargo.toml" --no-deps --format-version 1 2>/dev/null | python3 -c "import sys,json; print(json.load(sys.stdin)['target_directory'])")
+export RELEASE_BIN="${TARGET_DIR}/release/mk-oracle"
+if ! cargo build --release --manifest-path "${SCRIPT_DIR}/Cargo.toml" 2>&1; then
+    echo "ERROR: release build failed" >&2
+    exit 1
+fi
+strip "${RELEASE_BIN}"
+
 sections=(
     jobs
     asm_instance
@@ -28,7 +39,7 @@ failed_sections=()
 
 for section in "${sections[@]}"; do
     echo "Running section: $section"
-    if ! DB_SECTION="$section" ./run_comparison.sh "$@"; then
+    if ! DB_SECTION="$section" "${SCRIPT_DIR}/run_comparison.sh" "$@"; then
         failed_sections+=("$section")
     fi
 done

packages/mk-oracle/run_comparison.sh

@@ -39,12 +39,17 @@ if [[ " $* " == *" --time-only "* ]]; then
     TIME_ONLY=1
 fi
 
-echo "=== Building release binary ==="
-RELEASE_BIN="${SCRIPT_DIR}/target/release/mk-oracle"
-if ! cargo build --release --manifest-path "${SCRIPT_DIR}/Cargo.toml" 2>&1; then
-    echo "ERROR: release build failed" >&2
-    exit 1
+if [[ -z "${RELEASE_BIN}" ]]; then
+    echo "=== Building release binary ==="
+    TARGET_DIR=$(cargo metadata --manifest-path "${SCRIPT_DIR}/Cargo.toml" --no-deps --format-version 1 2>/dev/null | python3 -c "import sys,json; print(json.load(sys.stdin)['target_directory'])")
+    RELEASE_BIN="${TARGET_DIR}/release/mk-oracle"
+    if ! cargo build --release --manifest-path "${SCRIPT_DIR}/Cargo.toml" 2>&1; then
+        echo "ERROR: release build failed" >&2
+        exit 1
+    fi
+    strip "${RELEASE_BIN}"
 fi
+export RELEASE_BIN
 
 echo "=== Running old plugin (mk_oracle) ==="
 OLD_START=$(date +%s%N)
@@ -55,7 +60,7 @@ OLD_MS=$(((OLD_END - OLD_START) / 1000000))
 
 echo "=== Running new plugin (mk-oracle) ==="
 NEW_START=$(date +%s%N)
-"${SCRIPT_DIR}/run_unified.sh" --binary "${RELEASE_BIN}" | sed '/^[[:space:]]*$/d' >"$NEW_OUT" 2>/dev/null
+"${SCRIPT_DIR}/run_unified.sh" | sed '/^[[:space:]]*$/d' >"$NEW_OUT" 2>/dev/null
 NEW_RC=$?
 NEW_END=$(date +%s%N)
 NEW_MS=$(((NEW_END - NEW_START) / 1000000))

packages/mk-oracle/run_legacy.sh

@@ -23,6 +23,13 @@ export DB_PASSWORD="${CI_ORA_TEST_PASSWORD}"
 export DB_HOST="oracle-rocky-ci.lan.checkmk.net"
 export DB_SERVICE_NAME="dbtest23"
 export DB_SECTION="${DB_SECTION:-instance}"
+if [[ "${DB_SECTION}" == "all" ]]; then
+    export INDIVIDUAL_SECTIONS="#SYNC_SECTIONS"
+    export ALL_SECTIONS="SYNC_SECTIONS"
+else
+    export INDIVIDUAL_SECTIONS="SYNC_SECTIONS"
+    export ALL_SECTIONS="#SYNC_SECTIONS"
+fi
 envsubst <"${MK_CONFDIR}/mk_oracle.cfg.conf" >"${MK_CONFDIR}/mk_oracle.cfg"
 
 # sqlplus

packages/mk-oracle/run_unified.sh

@@ -1,23 +1,11 @@
 #!/bin/bash
 # Run mk-oracle as it has been built
 # config asnd log are located in the tests/regression
-# Usage: ./run_unified.sh [--binary <path>]
+# Usage: ./run_unified.sh
+# Set RELEASE_BIN env var to use a pre-built binary instead of cargo run.
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-BINARY=""
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --binary)
-            BINARY="$2"
-            shift 2
-            ;;
-        *)
-            shift
-            ;;
-    esac
-done
-
 # agent setup
 PKG_DIR="${SCRIPT_DIR}/tests/regression/mk-oracle"
 export MK_CONFDIR="${PKG_DIR}/etc/check_mk"
@@ -29,13 +17,22 @@ export DB_PASSWORD="${CI_ORA_TEST_PASSWORD}"
 export DB_HOST="oracle-rocky-ci.lan.checkmk.net"
 export DB_SERVICE_NAME="dbtest23"
 export DB_SECTION="${DB_SECTION:-instance}"
+if [[ "${DB_SECTION}" == "all" ]]; then
+    export INDIVIDUAL_SECTIONS="_unused"
+    export ALL_SECTIONS="sections"
+else
+    export INDIVIDUAL_SECTIONS="sections"
+    export ALL_SECTIONS="_unused"
+fi
 envsubst <"${MK_CONFDIR}/mk-oracle.yml.conf" >"${MK_CONFDIR}/mk-oracle.yml"
 
 # run
-if [[ -n "${BINARY}" ]]; then
+if [[ -n "${RELEASE_BIN}" ]]; then
     path_to_runtime="${SCRIPT_DIR}/runtimes/plugins/packages/mk-oracle"
     export LD_LIBRARY_PATH="${path_to_runtime}:${LD_LIBRARY_PATH}"
-    "${BINARY}" -c "${PKG_DIR}/etc/check_mk/mk-oracle.yml"
+    export TNS_ADMIN="${SCRIPT_DIR}/tests/files/tns"
+    export MK_LIBDIR="${SCRIPT_DIR}/runtimes/"
+    "${RELEASE_BIN}" -c "${PKG_DIR}/etc/check_mk/mk-oracle.yml"
 else
     ./cargo_run run -- -c "${PKG_DIR}/etc/check_mk/mk-oracle.yml"
 fi

packages/mk-oracle/tests/regression/mk-oracle/etc/check_mk/oracle.yml.conf

@@ -9,6 +9,19 @@ oracle:
       password: $DB_PASSWORD  
       type: standard
     cache_age: 600
-    sections: 
+    $INDIVIDUAL_SECTIONS: 
     - $DB_SECTION:
-        is_async: no
+        is_async: no
+    $ALL_SECTIONS: 
+    - instance:
+    - sessions:
+    - logswitches:
+    - undostat: 
+    - recovery_area:
+    - processes:
+    - recovery_status:
+    - longactivesessions:
+    - dataguard_stats:
+    - performance:
+    - locks:
+    - systemparameter:

packages/mk-oracle/tests/regression/mk_oracle/etc/check_mk/mk_oracle.cfg.conf

@@ -7,7 +7,8 @@ DBUSER='system:$DB_PASSWORD::::'
 ASMUSER='/::SYSASM:::'
 
 # Sections to run in foreground and wait for the result
-SYNC_SECTIONS='$DB_SECTION'
+$INDIVIDUAL_SECTIONS='$DB_SECTION'
+$ALL_SECTIONS="instance sessions logswitches undostat recovery_area processes recovery_status longactivesessions dataguard_stats performance locks systemparameter"
 
 # Sections to run in the background, at a slower interval cached
 ASYNC_SECTIONS=''