From b64cc51d03be85af85b77669da0eedb63bdffc8a Mon Sep 17 00:00:00 2001 From: Amardeepsingh Siglani Date: Tue, 20 Aug 2024 11:23:52 -0700 Subject: [PATCH] fixed cross cluster API; cypress workflow Signed-off-by: Amardeepsingh Siglani --- .github/workflows/cypress-workflow.yml | 2 +- server/services/CrossClusterService.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 1bd8083e8..442c41fb2 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -34,7 +34,7 @@ jobs: - name: Run Opensearch with plugin run: | cd alerting - ./gradlew run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} & + ./gradlew :alerting:run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} & timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9200)" != "200" ]]; do sleep 5; done' - name: Checkout OpenSearch Dashboards uses: actions/checkout@v2 diff --git a/server/services/CrossClusterService.js b/server/services/CrossClusterService.js index 948421a75..f1216af08 100644 --- a/server/services/CrossClusterService.js +++ b/server/services/CrossClusterService.js @@ -8,6 +8,7 @@ export default class CrossClusterService extends MDSEnabledClientService { getRemoteIndexes = async (context, req, res) => { try { const client = this.getClientBasedOnDataSource(context, req); + delete req.query['dataSourceId']; const response = await client('alerting.getRemoteIndexes', req.query); return res.ok({