Update pattern for multiple mview suffixes (#1693)

* Update pattern for multiple mview suffixes Signed-off-by: Simeon Widdis <[email protected]> * Update field filter to new format Signed-off-by: Simeon Widdis <[email protected]> * Update all mviews for new pattern Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]>
opensearch-project · Apr 15, 2024 · 72283be · 72283be
1 parent 5b2d4a2
commit 72283be
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/public/components/datasources/components/manage/data_connection.tsx b/public/components/datasources/components/manage/data_connection.tsx
@@ -91,7 +91,7 @@ export const DataConnection = (props: { dataSource: string }) => {
 
   useEffect(() => {
     const searchDataSourcePattern = new RegExp(
-      `flint_${_.escapeRegExp(datasourceDetails.name)}_default_.*_mview`
+      `flint_${_.escapeRegExp(datasourceDetails.name)}_default_.*`
     );
     const findIntegrations = async () => {
       // TODO: we just get all results and filter, ideally we send a filtering query to the API

diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
@@ -514,7 +514,7 @@ const addIntegration = async ({
       integration,
       setCalloutLikeToast,
       config.displayName,
-      `flint_${config.connectionDataSource}_default_${config.connectionTableName}_mview`,
+      `flint_${config.connectionDataSource}_default_${config.connectionTableName}__*`,
       config.enabledWorkflows,
       setIsInstalling ? true : false
     );

diff --git a/server/adaptors/integrations/__data__/repository/apache/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/apache/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
     to_timestamp(trim(BOTH '[]' FROM concat(time_local_1, ' ', time_local_2)), 'dd/MMM/yyyy:HH:mm:ss Z') AS `@timestamp`,
     split_part (request, ' ', 1) as `http.request.method`,

diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
     type as `aws.elb.elb_type`,
     time as `@timestamp`,

diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
   owner_id AS `aws.s3.bucket_owner`,
   bucket_name AS `aws.s3.bucket`,

diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
     CAST(FROM_UNIXTIME(`timestamp`/ 1000) AS TIMESTAMP) AS `@timestamp`,
     formatVersion AS `aws.waf.formatVersion`,

diff --git a/server/adaptors/integrations/__data__/repository/haproxy/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/haproxy/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
     regexp_extract(
         record,

diff --git a/server/adaptors/integrations/__data__/repository/nginx/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/nginx/assets/create_mv-1.0.0.sql
@@ -1,4 +1,4 @@
-CREATE MATERIALIZED VIEW {table_name}_mview AS
+CREATE MATERIALIZED VIEW {table_name}__mview AS
 SELECT
     to_timestamp(trim(BOTH '[]' FROM concat(time_local_1, ' ', time_local_2)), 'dd/MMM/yyyy:HH:mm:ss Z') AS `@timestamp`,
     split_part (request, ' ', 1) as `http.request.method`,