From 000c71bfd221d38e0d83e524b8a0cf1387de4af2 Mon Sep 17 00:00:00 2001 From: Jialiang Liang Date: Thu, 18 Apr 2024 10:22:49 -0700 Subject: [PATCH] [Integrations] Add default refresh interval for all the integrations and correct the version on `main` (#1717) * Add default refresh interval for all the integrations Signed-off-by: Ryan Liang * Change the version back to 3.0 Signed-off-by: Ryan Liang --------- Signed-off-by: Ryan Liang --- opensearch_dashboards.json | 4 ++-- package.json | 2 +- .../__data__/repository/apache/assets/create_mv-1.0.0.sql | 3 ++- .../repository/aws_cloudfront/assets/create_mv-1.0.0.sql | 1 + .../aws_cloudtrail/assets/create_mv_cloud-trail-1.0.0.sql | 1 + .../__data__/repository/aws_elb/assets/create_mv-1.0.0.sql | 1 + .../__data__/repository/aws_s3/assets/create_mv-1.0.0.sql | 1 + .../__data__/repository/aws_waf/assets/create_mv-1.0.0.sql | 1 + .../__data__/repository/haproxy/assets/create_mv-1.0.0.sql | 1 + .../__data__/repository/nginx/assets/create_mv-1.0.0.sql | 1 + 10 files changed, 12 insertions(+), 4 deletions(-) diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index f8ec4081e..285a26cd5 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "observabilityDashboards", - "version": "2.13.0.0", - "opensearchDashboardsVersion": "2.13.0", + "version": "3.0.0.0", + "opensearchDashboardsVersion": "3.0.0", "server": true, "ui": true, "requiredPlugins": [ diff --git a/package.json b/package.json index c1adf3696..9b8e340ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "observability-dashboards", - "version": "2.13.0.0", + "version": "3.0.0.0", "main": "index.ts", "license": "Apache-2.0", "scripts": { 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 index 3a7c04817..c738b1465 100644 --- 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 @@ -9,7 +9,8 @@ SELECT 'apache.access' AS `event.domain` FROM {table_name} WITH ( - auto_refresh = 'true', + auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql index 82f1c26e1..70c0ad2b9 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql +++ b/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql @@ -36,6 +36,7 @@ FROM {table_name} WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/assets/create_mv_cloud-trail-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/assets/create_mv_cloud-trail-1.0.0.sql index d165de5f8..1f8715840 100644 --- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/assets/create_mv_cloud-trail-1.0.0.sql +++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/assets/create_mv_cloud-trail-1.0.0.sql @@ -48,6 +48,7 @@ FROM LATERAL VIEW explode(Records) myTable AS rec WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' 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 index 5d96c77c0..c1e888731 100644 --- 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 @@ -53,6 +53,7 @@ FROM {table_name} WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' 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 index 52e9441fe..2823c2105 100644 --- 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 @@ -29,6 +29,7 @@ FROM {table_name} WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' 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 index 9a2560dfc..48e6ec163 100644 --- 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 @@ -22,6 +22,7 @@ FROM {table_name} WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' 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 index 0bc493490..ee1957ee9 100644 --- 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 @@ -144,6 +144,7 @@ SELECT FROM {table_name} WITH ( auto_refresh = true, + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}' 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 index 25e4d153a..d1646df20 100644 --- 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 @@ -10,6 +10,7 @@ SELECT FROM {table_name} WITH ( auto_refresh = 'true', + refresh_interval = '15 Minute', checkpoint_location = '{s3_checkpoint_location}', watermark_delay = '1 Minute', extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'