revert query enhancement changes for cloudwatch

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Sep 19, 2024 · 5eb065a · 5eb065a
1 parent c831903
commit 5eb065a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 155 deletions.
diff --git a/src/plugins/query_enhancements/common/constants.ts b/src/plugins/query_enhancements/common/constants.ts
@@ -10,15 +10,14 @@ export const BASE_API = '/api/enhancements';
 
 export const DATASET = {
   S3: 'S3',
-  CLOUD_WATCH: 'CLOUD_WATCH',
-} as const;
+};
 
 export const SEARCH_STRATEGY = {
   PPL: 'ppl',
   PPL_RAW: 'pplraw',
   SQL: 'sql',
   SQL_ASYNC: 'sqlasync',
-} as const;
+};
 
 export const API = {
   SEARCH: `${BASE_API}/search`,
@@ -34,7 +33,7 @@ export const API = {
     ASYNC_JOBS: `${BASE_API}/datasource/jobs`,
     CONNECTIONS: `${BASE_API}/datasource/connections`,
   },
-} as const;
+};
 
 export const URI = {
   PPL: '/_plugins/_ppl',
@@ -43,16 +42,16 @@ export const URI = {
   ML: '/_plugins/_ml',
   OBSERVABILITY: '/_plugins/_observability',
   DATA_CONNECTIONS: '/_plugins/_query/_datasources',
-} as const;
+};
 
 export const OPENSEARCH_API = {
   PANELS: `${URI.OBSERVABILITY}/object`,
   DATA_CONNECTIONS: URI.DATA_CONNECTIONS,
-} as const;
+};
 
 export const UI_SETTINGS = {
   QUERY_ENHANCEMENTS_ENABLED: 'query:enhancements:enabled',
   STATE_STORE_IN_SESSION_STORAGE: 'state:storeInSessionStorage',
-} as const;
+};
 
-export const ERROR_DETAILS = { GUARDRAILS_TRIGGERED: 'guardrails triggered' } as const;
+export const ERROR_DETAILS = { GUARDRAILS_TRIGGERED: 'guardrails triggered' };
diff --git a/src/plugins/query_enhancements/public/assets/cloud_watch_mark.svg b/src/plugins/query_enhancements/public/assets/cloud_watch_mark.svg
diff --git a/src/plugins/query_enhancements/public/datasets/cloud_watch_type.ts b/src/plugins/query_enhancements/public/datasets/cloud_watch_type.ts
diff --git a/src/plugins/query_enhancements/public/plugin.tsx b/src/plugins/query_enhancements/public/plugin.tsx
@@ -19,7 +19,6 @@ import { s3TypeConfig } from './datasets';
 import { createEditor, DefaultInput, SingleLineInput } from '../../data/public';
 import { QueryLanguageReference } from './query_editor/query_language_reference';
 import { DataStorage } from '../../data/common';
-import { cloudWatchTypeConfig } from './datasets/cloud_watch_type';
 
 export class QueryEnhancementsPlugin
   implements
@@ -111,7 +110,6 @@ export class QueryEnhancementsPlugin
     });
 
     queryString.getDatasetService().registerType(s3TypeConfig);
-    queryString.getDatasetService().registerType(cloudWatchTypeConfig);
 
     return {};
   }

diff --git a/src/plugins/query_enhancements/public/search/sql_search_interceptor.ts b/src/plugins/query_enhancements/public/search/sql_search_interceptor.ts
@@ -55,10 +55,7 @@ export class SQLSearchInterceptor extends SearchInterceptor {
   public search(request: IOpenSearchDashboardsSearchRequest, options: ISearchOptions) {
     const dataset = this.queryService.queryString.getQuery().dataset;
     const datasetType = dataset?.type;
-    let strategy =
-      datasetType && [DATASET.S3, DATASET.CLOUD_WATCH].includes(datasetType)
-        ? SEARCH_STRATEGY.SQL_ASYNC
-        : SEARCH_STRATEGY.SQL;
+    let strategy = datasetType === DATASET.S3 ? SEARCH_STRATEGY.SQL_ASYNC : SEARCH_STRATEGY.SQL;
 
     if (datasetType) {
       const datasetTypeConfig = this.queryService.queryString