From 97f46ba65757293386b9d84a14fa8dd359d2758b Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:07:10 -0700
Subject: [PATCH] [Backport 2.11] Add integrations queries for Flint (#1195)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../setup_integration.test.tsx.snap           |  35 ++++-
 .../components/create_integration_helpers.ts  |  13 +-
 .../components/setup_integration.tsx          | 139 +++++++++++++-----
 .../aws_cloudtrail/aws_cloudtrail-1.0.0.json  |   2 +-
 .../aws_elb/assets/create_mv-1.0.0.sql        |  38 +++++
 .../aws_elb/assets/create_table-1.0.0.sql     |  36 +++++
 .../aws_elb/assets/refresh_mv-1.0.0.sql       |   1 +
 .../repository/aws_elb/aws_elb-1.0.0.json     |  19 ++-
 .../aws_vpc_flow/aws_vpc_flow-1.0.0.json      |   2 +-
 .../repository/nginx/nginx-1.0.0.json         |   2 +-
 10 files changed, 237 insertions(+), 50 deletions(-)
 create mode 100644 server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql
 create mode 100644 server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql
 create mode 100644 server/adaptors/integrations/__data__/repository/aws_elb/assets/refresh_mv-1.0.0.sql

diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index e8f7bee82d..3688bcb349 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -31,6 +31,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                         Object {
                           "connectionDataSource": "",
                           "connectionLocation": "",
+                          "connectionTableName": "sample",
                           "connectionType": "index",
                           "displayName": "sample Integration",
                         }
@@ -87,9 +88,15 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                           <EuiFormRow
                             describedByIds={Array []}
                             display="row"
+                            error={
+                              Array [
+                                "Must be at least 1 character.",
+                              ]
+                            }
                             fullWidth={false}
                             hasChildLabel={true}
                             hasEmptyLabelSpace={false}
+                            isInvalid={false}
                             label="Display Name"
                             labelType="label"
                           >
@@ -101,12 +108,15 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                 className="euiFormRow__labelWrapper"
                               >
                                 <EuiFormLabel
+                                  aria-invalid={false}
                                   className="euiFormRow__label"
                                   htmlFor="random_html_id"
                                   isFocused={false}
+                                  isInvalid={false}
                                   type="label"
                                 >
                                   <label
+                                    aria-invalid={false}
                                     className="euiFormLabel euiFormRow__label"
                                     htmlFor="random_html_id"
                                   >
@@ -119,6 +129,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               >
                                 <EuiFieldText
                                   id="random_html_id"
+                                  isInvalid={false}
                                   onBlur={[Function]}
                                   onChange={[Function]}
                                   onFocus={[Function]}
@@ -135,7 +146,9 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                       <div
                                         className="euiFormControlLayout__childrenWrapper"
                                       >
-                                        <EuiValidatableControl>
+                                        <EuiValidatableControl
+                                          isInvalid={false}
+                                        >
                                           <input
                                             className="euiFieldText"
                                             id="random_html_id"
@@ -354,12 +367,14 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   aria-describedby="random_html_id-help-0"
                                   async={false}
                                   compressed={false}
+                                  customOptionText="Select {searchValue} as your index"
                                   fullWidth={false}
                                   id="random_html_id"
                                   isClearable={true}
                                   isLoading={true}
                                   onBlur={[Function]}
                                   onChange={[Function]}
+                                  onCreateOption={[Function]}
                                   onFocus={[Function]}
                                   options={Array []}
                                   selectedOptions={
@@ -680,6 +695,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
               Object {
                 "connectionDataSource": "",
                 "connectionLocation": "",
+                "connectionTableName": "sample",
                 "connectionType": "index",
                 "displayName": "sample Integration",
               }
@@ -817,6 +833,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                             >
                               <EuiButtonEmpty
                                 color="text"
+                                disabled={false}
                                 iconType="cross"
                                 onClick={[Function]}
                               >
@@ -1068,9 +1085,15 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
+        error={
+          Array [
+            "Must be at least 1 character.",
+          ]
+        }
         fullWidth={false}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
+        isInvalid={false}
         label="Display Name"
         labelType="label"
       >
@@ -1082,12 +1105,15 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
             className="euiFormRow__labelWrapper"
           >
             <EuiFormLabel
+              aria-invalid={false}
               className="euiFormRow__label"
               htmlFor="random_html_id"
               isFocused={false}
+              isInvalid={false}
               type="label"
             >
               <label
+                aria-invalid={false}
                 className="euiFormLabel euiFormRow__label"
                 htmlFor="random_html_id"
               >
@@ -1100,6 +1126,7 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
           >
             <EuiFieldText
               id="random_html_id"
+              isInvalid={false}
               onBlur={[Function]}
               onChange={[Function]}
               onFocus={[Function]}
@@ -1116,7 +1143,9 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
                   <div
                     className="euiFormControlLayout__childrenWrapper"
                   >
-                    <EuiValidatableControl>
+                    <EuiValidatableControl
+                      isInvalid={false}
+                    >
                       <input
                         className="euiFieldText"
                         id="random_html_id"
@@ -1354,12 +1383,14 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
               aria-describedby="random_html_id-help-0"
               async={false}
               compressed={false}
+              customOptionText="Select {searchValue} as your index"
               fullWidth={false}
               id="random_html_id"
               isClearable={true}
               isLoading={true}
               onBlur={[Function]}
               onChange={[Function]}
+              onCreateOption={[Function]}
               onFocus={[Function]}
               options={Array []}
               selectedOptions={
diff --git a/public/components/integrations/components/create_integration_helpers.ts b/public/components/integrations/components/create_integration_helpers.ts
index 1bebd558fb..543f688286 100644
--- a/public/components/integrations/components/create_integration_helpers.ts
+++ b/public/components/integrations/components/create_integration_helpers.ts
@@ -296,7 +296,7 @@ export async function addIntegrationRequest(
   setToast: (title: string, color?: Color, text?: string | undefined) => void,
   name?: string,
   dataSource?: string
-) {
+): Promise<boolean> {
   const http = coreRefs.http!;
   if (addSample) {
     createDataSourceMappings(
@@ -309,7 +309,7 @@ export async function addIntegrationRequest(
     dataSource = `ss4o_${integration.type}-${integrationTemplateId}-sample-sample`;
   }
 
-  const response: boolean = await http
+  let response: boolean = await http
     .post(`${INTEGRATIONS_BASE}/store/${templateName}`, {
       body: JSON.stringify({ name, dataSource }),
     })
@@ -323,7 +323,7 @@ export async function addIntegrationRequest(
       return false;
     });
   if (!addSample || !response) {
-    return;
+    return response;
   }
   const data: { sampleData: unknown[] } = await http
     .get(`${INTEGRATIONS_BASE}/repository/${templateName}/data`)
@@ -337,7 +337,7 @@ export async function addIntegrationRequest(
     data.sampleData
       .map((record) => `{"create": { "_index": "${dataSource}" } }\n${JSON.stringify(record)}`)
       .join('\n') + '\n';
-  http
+  response = await http
     .post(CONSOLE_PROXY, {
       body: requestBody,
       query: {
@@ -345,8 +345,13 @@ export async function addIntegrationRequest(
         method: 'POST',
       },
     })
+    .then((_) => {
+      return true;
+    })
     .catch((err) => {
       console.error(err);
       setToast('Failed to load sample data', 'danger');
+      return false;
     });
+  return response;
 }
diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
index d9f89ae8f5..038c042ced 100644
--- a/public/components/integrations/components/setup_integration.tsx
+++ b/public/components/integrations/components/setup_integration.tsx
@@ -37,6 +37,7 @@ export interface IntegrationSetupInputs {
   connectionType: string;
   connectionDataSource: string;
   connectionLocation: string;
+  connectionTableName: string;
 }
 
 type SetupCallout = { show: true; title: string; color?: Color; text?: string } | { show: false };
@@ -60,9 +61,9 @@ const INTEGRATION_CONNECTION_DATA_SOURCE_TYPES: Map<
   [
     's3',
     {
-      title: 'Table',
-      lower: 'table',
-      help: 'Select a table to pull the data from.',
+      title: 'Catalog',
+      lower: 'catalog',
+      help: 'Select a catalog to pull the data from.',
     },
   ],
   [
@@ -126,8 +127,9 @@ const suggestDataSources = async (type: string): Promise<Array<{ label: string }
 
 const runQuery = async (
   query: string,
-  trackProgress: (step: number) => void
-): Promise<Result<object>> => {
+  datasource: string,
+  sessionId: string | null
+): Promise<Result<{ poll: object; sessionId: string }>> => {
   // Used for polling
   const sleep = (ms: number) => {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -135,31 +137,32 @@ const runQuery = async (
 
   try {
     const http = coreRefs.http!;
-    const queryId = (
-      await http.post(CONSOLE_PROXY, {
-        body: JSON.stringify({ query, lang: 'sql' }),
-        query: {
-          path: '_plugins/_async_query',
-          method: 'POST',
-        },
-      })
-    ).queryId;
+    const queryResponse: { queryId: string; sessionId: string } = await http.post(CONSOLE_PROXY, {
+      body: JSON.stringify({ query, datasource, lang: 'sql', sessionId }),
+      query: {
+        path: '_plugins/_async_query',
+        method: 'POST',
+      },
+    });
+    const [queryId, newSessionId] = [queryResponse.queryId, queryResponse.sessionId];
     while (true) {
-      const poll = await http.post(CONSOLE_PROXY, {
+      const poll: { status: string; error?: string } = await http.post(CONSOLE_PROXY, {
         body: '{}',
         query: {
           path: '_plugins/_async_query/' + queryId,
           method: 'GET',
         },
       });
-      if (poll.status === 'PENDING') {
-        trackProgress(1);
-      } else if (poll.status === 'RUNNING') {
-        trackProgress(2);
-      } else if (poll.status === 'SUCCESS') {
-        trackProgress(3);
-        return { ok: true, value: poll };
-      } else if (poll.status === 'FAILURE') {
+      if (poll.status.toLowerCase() === 'success') {
+        return {
+          ok: true,
+          value: {
+            poll,
+            sessionId: newSessionId,
+          },
+        };
+        // Fail status can inconsistently be "failed" or "failure"
+      } else if (poll.status.toLowerCase().startsWith('fail')) {
         return {
           ok: false,
           error: new Error(poll.error ?? 'No error information provided', { cause: poll }),
@@ -185,6 +188,7 @@ export function SetupIntegrationForm({
     [] as Array<{ label: string }>
   );
   const [isSuggestionsLoading, setIsSuggestionsLoading] = useState(true);
+  const [isBlurred, setIsBlurred] = useState(false);
   useEffect(() => {
     const updateDataSources = async () => {
       const data = await suggestDataSources(config.connectionType);
@@ -212,11 +216,16 @@ export function SetupIntegrationForm({
         <h3>Integration Details</h3>
       </EuiText>
       <EuiSpacer />
-      <EuiFormRow label="Display Name">
+      <EuiFormRow
+        label="Display Name"
+        error={['Must be at least 1 character.']}
+        isInvalid={config.displayName.length === 0}
+      >
         <EuiFieldText
           value={config.displayName}
           onChange={(event) => updateConfig({ displayName: event.target.value })}
           placeholder={`${integration.name} Integration`}
+          isInvalid={config.displayName.length === 0}
         />
       </EuiFormRow>
       <EuiSpacer />
@@ -254,16 +263,51 @@ export function SetupIntegrationForm({
           }}
           selectedOptions={[{ label: config.connectionDataSource }]}
           singleSelection={{ asPlainText: true }}
+          onCreateOption={(searchValue) => {
+            const normalizedSearchValue = searchValue.trim();
+            if (!normalizedSearchValue) {
+              return;
+            }
+            const newOption = { label: normalizedSearchValue };
+            setDataSourceSuggestions((ds) => ds.concat([newOption]));
+            updateConfig({ connectionDataSource: newOption.label });
+          }}
+          customOptionText={`Select {searchValue} as your ${connectionType.lower}`}
         />
       </EuiFormRow>
       {config.connectionType === 's3' ? (
-        <EuiFormRow label="S3 Bucket Location">
-          <EuiFieldText
-            value={config.connectionLocation}
-            onChange={(event) => updateConfig({ connectionLocation: event.target.value })}
-            placeholder="s3://"
-          />
-        </EuiFormRow>
+        <>
+          <EuiFormRow
+            label="Flint Table Name"
+            helpText="Select a table name to associate with your data."
+            error={['Must be at least 1 character.']}
+            isInvalid={config.connectionTableName.length === 0}
+          >
+            <EuiFieldText
+              placeholder={integration.name}
+              value={config.connectionTableName}
+              onChange={(evt) => {
+                updateConfig({ connectionTableName: evt.target.value });
+              }}
+              isInvalid={config.connectionTableName.length === 0}
+            />
+          </EuiFormRow>
+          <EuiFormRow
+            label="S3 Bucket Location"
+            isInvalid={isBlurred && !config.connectionLocation.startsWith('s3://')}
+            error={["Must be a URL starting with 's3://'."]}
+          >
+            <EuiFieldText
+              value={config.connectionLocation}
+              onChange={(event) => updateConfig({ connectionLocation: event.target.value })}
+              placeholder="s3://"
+              isInvalid={isBlurred && !config.connectionLocation.startsWith('s3://')}
+              onBlur={() => {
+                setIsBlurred(true);
+              }}
+            />
+          </EuiFormRow>
+        </>
       ) : null}
     </EuiForm>
   );
@@ -305,6 +349,7 @@ export function SetupBottomBar({
               hash = hash.substring(0, hash.lastIndexOf('/setup'));
               window.location.hash = hash;
             }}
+            disabled={loading}
           >
             Discard
           </EuiButtonEmpty>
@@ -315,12 +360,19 @@ export function SetupBottomBar({
             iconType="arrowRight"
             iconSide="right"
             isLoading={loading}
-            disabled={config.displayName.length < 1 || config.connectionDataSource.length < 1}
+            disabled={
+              config.displayName.length < 1 ||
+              config.connectionDataSource.length < 1 ||
+              (config.connectionType === 's3' &&
+                (config.connectionTableName.length < 1 ||
+                  !config.connectionLocation.startsWith('s3://')))
+            }
             onClick={async () => {
               setLoading(true);
+              let sessionId: string | null = null;
 
               if (config.connectionType === 'index') {
-                await addIntegrationRequest(
+                const res = await addIntegrationRequest(
                   false,
                   integration.name,
                   config.displayName,
@@ -329,6 +381,9 @@ export function SetupBottomBar({
                   config.displayName,
                   config.connectionDataSource
                 );
+                if (!res) {
+                  setLoading(false);
+                }
               } else if (config.connectionType === 's3') {
                 const http = coreRefs.http!;
 
@@ -340,11 +395,12 @@ export function SetupBottomBar({
                 for (const query of assets.data.queries!) {
                   let queryStr = (query.query as string).replaceAll(
                     '{table_name}',
-                    `${config.connectionDataSource}.default.${integration.name}`
+                    `${config.connectionDataSource}.default.${config.connectionTableName}`
                   );
                   queryStr = queryStr.replaceAll('{s3_bucket_location}', config.connectionLocation);
-                  queryStr = queryStr.replaceAll('{object_name}', integration.name);
-                  const result = await runQuery(queryStr, (_) => {});
+                  queryStr = queryStr.replaceAll('{object_name}', config.connectionTableName);
+                  queryStr = queryStr.replaceAll(/\s+/g, ' ');
+                  const result = await runQuery(queryStr, config.connectionDataSource, sessionId);
                   if (!result.ok) {
                     setLoading(false);
                     setCalloutLikeToast(
@@ -354,22 +410,25 @@ export function SetupBottomBar({
                     );
                     return;
                   }
+                  sessionId = result.value.sessionId ?? sessionId;
                 }
                 // Once everything is ready, add the integration to the new datasource as usual
                 // TODO determine actual values here after more about queries is known
-                await addIntegrationRequest(
+                const res = await addIntegrationRequest(
                   false,
                   integration.name,
                   config.displayName,
                   integration,
                   setCalloutLikeToast,
                   config.displayName,
-                  config.connectionDataSource
+                  `flint_${config.connectionDataSource}_default_${config.connectionTableName}_mview`
                 );
+                if (!res) {
+                  setLoading(false);
+                }
               } else {
                 console.error('Invalid data source type');
               }
-              setLoading(false);
             }}
           >
             Add Integration
@@ -398,6 +457,7 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {
     connectionType: 'index',
     connectionDataSource: '',
     connectionLocation: '',
+    connectionTableName: integration,
   } as IntegrationSetupInputs);
 
   const [template, setTemplate] = useState({
@@ -407,7 +467,6 @@ export function SetupIntegrationPage({ integration }: { integration: string }) {
   } as IntegrationTemplate);
 
   const [setupCallout, setSetupCallout] = useState({ show: false } as SetupCallout);
-
   const [showLoading, setShowLoading] = useState(false);
 
   useEffect(() => {
diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json
index 818b6e8a94..41dbc35e80 100644
--- a/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/aws_cloudtrail/aws_cloudtrail-1.0.0.json
@@ -5,7 +5,7 @@
   "description": "AWS CloudTrail log collector",
   "license": "Apache-2.0",
   "type": "logs-aws_cloudtrail",
-  "labels": ["Observability", "Logs", "AWS", "Flint S3", "Cloud"],
+  "labels": ["Observability", "Logs", "AWS", "Cloud"],
   "author": "OpenSearch",
   "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_cloudtrail/info",
   "statics": {
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
new file mode 100644
index 0000000000..8520ae8b73
--- /dev/null
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql
@@ -0,0 +1,38 @@
+CREATE MATERIALIZED VIEW
+  {table_name}_mview AS
+    SELECT
+        type as `aws.elb.elb_type`,
+        time as `@timestamp`,
+        elb as `aws.elb.elb_name`,
+        split_part(client_ip, ':', 1) as `aws.elb.client.ip`,
+        split_part(client_ip, ':', 2) as `aws.elb.client.port`,
+        split_part(target_ip, ':', 1) as `aws.elb.target.ip`,
+        split_part(target_ip, ':', 2) as `aws.elb.target.port`,
+        request_processing_time as `aws.elb.request_processing_time`,
+        target_processing_time as `aws.elb.target_processing_time`,
+        response_processing_time as `aws.elb.response_processing_time`,
+        elb_status_code as `aws.elb.elb_status_code`,
+        target_status_code as `aws.elb.target_status_code`,
+        received_bytes as `aws.elb.received_bytes`,
+        sent_bytes as `aws.elb.sent_bytes`,
+        split_part(request, ' ', 1) as `http.request.method`,
+        split_part(request, ' ', 2) as `url.full`,
+        split_part(request, ' ', 3) as `url.schema`,
+        user_agent as `http.user_agent.name`,
+        ssl_cipher as `aws.elb.ssl_cipher`,
+        ssl_protocol as `aws.elb.ssl_protocol`,
+        target_group_arn as `aws.elb.target_group_arn`,
+        trace_id as `traceId`,
+        domain_name as `url.domain`,
+        chosen_cert_arn as `aws.elb.chosen_cert_arn`,
+        matched_rule_priority as `aws.elb.matched_rule_priority`,
+        request_creation_time as `aws.elb.request_creation_time`,
+        actions_executed as `aws.elb.actions_executed`,
+        redirect_url as `aws.elb.redirect_url`,
+        lambda_error_reason as `aws.elb.lambda_error_reason`,
+        target_port_list as `aws.elb.target_port_list`,
+        target_status_code_list as `aws.elb.target_status_code_list`,
+        classification as `aws.elb.classification`,
+        classification_reason as `aws.elb.classification_reason`
+    FROM
+        {table_name};
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql
new file mode 100644
index 0000000000..3a5ed53f2d
--- /dev/null
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql
@@ -0,0 +1,36 @@
+CREATE EXTERNAL TABLE IF NOT EXISTS {table_name} (
+  type string,
+  time timestamp,
+  elb string,
+  client_ip string,
+  target_ip string,
+  request_processing_time double,
+  target_processing_time double,
+  response_processing_time double,
+  elb_status_code int,
+  target_status_code string,
+  received_bytes bigint,
+  sent_bytes bigint,
+  request string,
+  user_agent string,
+  ssl_cipher string,
+  ssl_protocol string,
+  target_group_arn string,
+  trace_id string,
+  domain_name string,
+  chosen_cert_arn string,
+  matched_rule_priority string,
+  request_creation_time timestamp,
+  actions_executed string,
+  redirect_url string,
+  lambda_error_reason string,
+  target_port_list string,
+  target_status_code_list string,
+  classification string,
+  classification_reason string
+)
+USING csv
+LOCATION '{s3_bucket_location}'
+OPTIONS (
+  sep=' '
+);
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/assets/refresh_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_elb/assets/refresh_mv-1.0.0.sql
new file mode 100644
index 0000000000..0f6ba98960
--- /dev/null
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/assets/refresh_mv-1.0.0.sql
@@ -0,0 +1 @@
+REFRESH MATERIALIZED VIEW {table_name}_mview;
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
index a91ee5bc9b..27480a5d07 100644
--- a/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/aws_elb/aws_elb-1.0.0.json
@@ -50,7 +50,24 @@
     "savedObjects": {
       "name": "aws_elb",
       "version": "1.0.0"
-    }
+    },
+    "queries": [
+      {
+        "name": "create_table",
+        "version": "1.0.0",
+        "language": "sql"
+      },
+      {
+        "name": "create_mv",
+        "version": "1.0.0",
+        "language": "sql"
+      },
+      {
+        "name": "refresh_mv",
+        "version": "1.0.0",
+        "language": "sql"
+      }
+    ]
   },
   "sampleData": {
     "path": "sample.json"
diff --git a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
index 24110600ae..1d92e26658 100644
--- a/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/aws_vpc_flow/aws_vpc_flow-1.0.0.json
@@ -5,7 +5,7 @@
   "description": "AWS VPC Flow log collector",
   "license": "Apache-2.0",
   "type": "logs_vpc",
-  "labels": ["Observability", "Logs", "AWS", "Flint S3", "Cloud"],
+  "labels": ["Observability", "Logs", "AWS", "Cloud"],
   "author": "Haidong Wang",
   "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/aws_vpc_flow/info",
   "statics": {
diff --git a/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json b/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
index 1b87c497a5..975430d0d8 100644
--- a/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
+++ b/server/adaptors/integrations/__data__/repository/nginx/nginx-1.0.0.json
@@ -5,7 +5,7 @@
   "description": "Nginx HTTP server collector",
   "license": "Apache-2.0",
   "type": "logs",
-  "labels": ["Observability", "Logs", "Flint S3"],
+  "labels": ["Observability", "Logs"],
   "author": "OpenSearch",
   "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info",
   "statics": {