From 39d3ed9e005e08fadde33797827c3d7bfb712e8a Mon Sep 17 00:00:00 2001 From: Andre Kurait Date: Fri, 13 Dec 2024 10:57:56 -0600 Subject: [PATCH] Update console lib osi Signed-off-by: Andre Kurait --- .../docker/elasticsearchTestConsole/runTestBenchmarks.sh | 1 - .../lib/console_link/console_link/models/cluster.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TrafficCapture/dockerSolution/src/main/docker/elasticsearchTestConsole/runTestBenchmarks.sh b/TrafficCapture/dockerSolution/src/main/docker/elasticsearchTestConsole/runTestBenchmarks.sh index c429adb11..cb75ad911 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/elasticsearchTestConsole/runTestBenchmarks.sh +++ b/TrafficCapture/dockerSolution/src/main/docker/elasticsearchTestConsole/runTestBenchmarks.sh @@ -86,7 +86,6 @@ set -o xtrace # Newer OSB Workload revisions fail with single node cluster that is persistently in yellow state # See https://github.com/opensearch-project/opensearch-migrations/pull/1202 workload_revision="440ce4b1fc8832b6b7673bdcec948cce3ee87e7e" -pipenv run opensearch-benchmark info --workload-revision=$workload_revision --workload=geonames echo "Running opensearch-benchmark workloads against ${endpoint}" echo "Running opensearch-benchmark w/ 'geonames' workload..." && diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/cluster.py b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/cluster.py index 01dec1824..8b222f0cc 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/cluster.py +++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/cluster.py @@ -190,9 +190,10 @@ def execute_benchmark_workload(self, workload: str, raise NotImplementedError(f"Auth type {self.auth_type} is not currently support for executing " f"benchmark workloads") # Note -- we should censor the password when logging this command - logger.info(f"Running opensearch-benchmark with '{workload}' workload") + workload_revision="440ce4b1fc8832b6b7673bdcec948cce3ee87e7e" + logger.info(f"Running opensearch-benchmark with '{workload}' workload and revision '{workload_revision}'") command = (f"opensearch-benchmark execute-test --distribution-version=1.0.0 --target-host={self.endpoint} " - f"--workload={workload} --pipeline=benchmark-only --test-mode --kill-running-processes " + f"--workload={workload} --workload-revision={workload_revision} --pipeline=benchmark-only --test-mode --kill-running-processes " f"--workload-params={workload_params} --client-options={client_options}") # While a little wordier, this apprach prevents us from censoring the password if it appears in other contexts, # e.g. username:admin,password:admin.