Merge branch 'main' into mds-traces

Author: sumukhswamy

public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap

@@ -359,8 +359,8 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
         >
           <button
             aria-controls="random_html_id"
-            aria-selected="true"
-            class="euiTab euiTab-isSelected"
+            aria-selected="false"
+            class="euiTab"
             id="associated_objects"
             role="tab"
             type="button"
@@ -401,8 +401,8 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
           </button>
           <button
             aria-controls="random_html_id"
-            aria-selected="false"
-            class="euiTab"
+            aria-selected="true"
+            class="euiTab euiTab-isSelected"
             id="access_control"
             role="tab"
             type="button"
@@ -415,7 +415,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
           </button>
         </div>
         <div
-          aria-labelledby="associated_objects"
+          aria-labelledby="access_control"
           id="random_html_id"
           role="tabpanel"
         >
@@ -446,9 +446,18 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
               <span
                 class="euiCallOutHeader__title"
               >
-                Accelerations recommended for tables. Setup acceleration or configure integrations
+                Configurations may be managed elsewhere.
               </span>
             </div>
+            <div
+              class="euiText euiText--small"
+            >
+              <div
+                class="euiTextColor euiTextColor--default"
+              >
+                Access to data may be managed in other systems outside of OpenSearch. Check with your administrator for additional configurations.
+              </div>
+            </div>
           </div>
           <div
             class="euiSpacer euiSpacer--l"
@@ -457,7 +466,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
             class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
           >
             <div
-              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
+              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
               <div
                 class="euiFlexItem"
@@ -468,78 +477,17 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                   <h2
                     class="panel-title"
                   >
-                    Associated objects
+                    Access control
                   </h2>
-                  Manage objects associated with this data sources.
-                </div>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              >
-                <div
-                  class="euiText euiText--extraSmall"
-                >
-                  <div
-                    class="euiTextAlign euiTextAlign--right"
-                  >
-                    <div
-                      class="euiTextColor euiTextColor--subdued"
-                    >
-                      Last updated at:
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="euiText euiText--extraSmall"
-                >
-                  <div
-                    class="euiTextAlign euiTextAlign--right"
-                  >
-                    <div
-                      class="euiTextColor euiTextColor--subdued"
-                    >
-                      1/1/2024, 12:00:00 AM
-                    </div>
-                  </div>
+                  Control which OpenSearch users have access to this data source.
                 </div>
               </div>
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <button
                   class="euiButton euiButton--primary"
-                  type="button"
-                >
-                  <span
-                    class="euiButtonContent euiButton__content"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiIcon--inherit euiButtonContent__icon"
-                      focusable="false"
-                      height="16"
-                      role="img"
-                      viewBox="0 0 16 16"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M11.228 2.942a.5.5 0 1 1-.538.842A5 5 0 1 0 13 8a.5.5 0 1 1 1 0 6 6 0 1 1-2.772-5.058ZM14 1.5v3A1.5 1.5 0 0 1 12.5 6h-3a.5.5 0 0 1 0-1h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 1 1 1 0Z"
-                      />
-                    </svg>
-                    <span
-                      class="euiButton__text"
-                    >
-                      Refresh
-                    </span>
-                  </span>
-                </button>
-              </div>
-              <div
-                class="euiFlexItem euiFlexItem--flexGrowZero"
-              >
-                <button
-                  class="euiButton euiButton--primary euiButton--fill"
+                  data-test-subj="createButton"
                   type="button"
                 >
                   <span
@@ -548,7 +496,7 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                     <span
                       class="euiButton__text"
                     >
-                      Create acceleration
+                      Edit
                     </span>
                   </span>
                 </button>
@@ -558,31 +506,38 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
               class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginLarge"
             />
             <div
-              class="euiEmptyPrompt"
+              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
-              <span
-                class="euiLoadingSpinner euiLoadingSpinner--xLarge"
-              />
               <div
-                class="euiSpacer euiSpacer--m"
-              />
-              <span
-                class="euiTextColor euiTextColor--subdued"
+                class="euiFlexItem"
               >
                 <div
-                  class="euiText euiText--medium"
+                  class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
                 >
-                  <p>
-                    Loading 
-                    databases
-                  </p>
+                  <div
+                    class="euiFlexItem euiFlexItem--flexGrowZero"
+                  >
+                    <div
+                      class="euiText euiText--medium overview-title"
+                    >
+                      Query access
+                    </div>
+                    <div
+                      class="euiText euiText--small overview-content"
+                    >
+                      Admin only
+                    </div>
+                  </div>
                 </div>
-              </span>
+              </div>
             </div>
           </div>
           <div
             class="euiSpacer euiSpacer--l"
           />
+          <div
+            class="euiSpacer euiSpacer--l"
+          />
         </div>
       </div>
       <div

public/components/datasources/components/__tests__/data_connection.test.tsx

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from '@testing-library/react';
+import { act, render, waitFor } from '@testing-library/react';
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import React from 'react';
@@ -65,4 +65,44 @@ describe('Data Connection Page test', () => {
     });
     expect(container).toMatchSnapshot();
   });
+
+  it('Does not render Associated Objects, Accelerations, and Installed Integrations tabs for Prometheus data source', async () => {
+    CatalogCacheManager.saveDataSourceCache(mockDataSourceCacheData);
+    CatalogCacheManager.saveAccelerationsCache(mockAccelerationCacheData);
+
+    (coreRefs.http!.get as jest.Mock).mockResolvedValue(describePrometheusDataConnection);
+
+    const { container, queryByText } = render(<DataConnection dataSource="PROMETHEUS" />);
+
+    await waitFor(() => {
+      expect(queryByText('Associated Objects')).not.toBeInTheDocument();
+      expect(queryByText('Accelerations')).not.toBeInTheDocument();
+      expect(queryByText('Installed Integrations')).not.toBeInTheDocument();
+
+      const accessControlTabs = Array.from(container.querySelectorAll('.euiTab__content')).filter(
+        (el) => el.textContent === 'Access control'
+      );
+      expect(accessControlTabs.length).toBeGreaterThan(0);
+    });
+  });
+
+  it('Renders all tabs for S3Glue data source', async () => {
+    CatalogCacheManager.saveDataSourceCache(mockDataSourceCacheData);
+    CatalogCacheManager.saveAccelerationsCache(mockAccelerationCacheData);
+
+    (coreRefs.http!.get as jest.Mock).mockResolvedValue(describeS3Dataconnection);
+
+    const { container, getByText } = render(<DataConnection dataSource="S3GLUE" />);
+
+    await waitFor(() => {
+      expect(getByText('Associated Objects')).toBeInTheDocument();
+      expect(getByText('Accelerations')).toBeInTheDocument();
+      expect(getByText('Installed Integrations')).toBeInTheDocument();
+
+      const accessControlTabs = Array.from(container.querySelectorAll('.euiTab__content')).filter(
+        (el) => el.textContent === 'Access control'
+      );
+      expect(accessControlTabs.length).toBeGreaterThan(0);
+    });
+  });
 });

public/components/datasources/components/manage/data_connection.tsx

@@ -209,41 +209,7 @@ export const DataConnection = (props: { dataSource: string }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [chrome, http]);
 
-  const tabs = [
-    {
-      id: 'associated_objects',
-      name: 'Associated Objects',
-      disabled: false,
-      content: (
-        <AssociatedObjectsTab
-          datasource={datasourceDetails}
-          cacheLoadingHooks={cacheLoadingHooks}
-          selectedDatabase={selectedDatabase}
-          setSelectedDatabase={setSelectedDatabase}
-        />
-      ),
-    },
-    {
-      id: 'acceleration_table',
-      name: 'Accelerations',
-      disabled: false,
-      content: (
-        <AccelerationTable dataSourceName={dataSource} cacheLoadingHooks={cacheLoadingHooks} />
-      ),
-    },
-    {
-      id: 'installed_integrations',
-      name: 'Installed Integrations',
-      disabled: false,
-      content: (
-        <InstalledIntegrationsTable
-          integrations={dataSourceIntegrations}
-          datasourceType={datasourceDetails.connector}
-          datasourceName={datasourceDetails.name}
-          refreshInstances={refreshInstances}
-        />
-      ),
-    },
+  const genericTabs = [
     {
       id: 'access_control',
       name: 'Access control',
@@ -260,6 +226,51 @@ export const DataConnection = (props: { dataSource: string }) => {
     },
   ];
 
+  const conditionalTabs =
+    datasourceDetails.connector === 'S3GLUE'
+      ? [
+          {
+            id: 'associated_objects',
+            name: 'Associated Objects',
+            disabled: false,
+            content: (
+              <AssociatedObjectsTab
+                datasource={datasourceDetails}
+                cacheLoadingHooks={cacheLoadingHooks}
+                selectedDatabase={selectedDatabase}
+                setSelectedDatabase={setSelectedDatabase}
+              />
+            ),
+          },
+          {
+            id: 'acceleration_table',
+            name: 'Accelerations',
+            disabled: false,
+            content: (
+              <AccelerationTable
+                dataSourceName={dataSource}
+                cacheLoadingHooks={cacheLoadingHooks}
+              />
+            ),
+          },
+          {
+            id: 'installed_integrations',
+            name: 'Installed Integrations',
+            disabled: false,
+            content: (
+              <InstalledIntegrationsTable
+                integrations={dataSourceIntegrations}
+                datasourceType={datasourceDetails.connector}
+                datasourceName={datasourceDetails.name}
+                refreshInstances={refreshInstances}
+              />
+            ),
+          },
+        ]
+      : [];
+
+  const tabs = [...conditionalTabs, ...genericTabs];
+
   const QueryOrAccelerateData = () => {
     switch (datasourceDetails.connector) {
       case 'S3GLUE':

server/adaptors/integrations/__data__/repository/aws_waf/assets/create_skipping_index-1.0.0.sql

@@ -0,0 +1,13 @@
+CREATE SKIPPING INDEX ON {table_name} (
+  `timestamp` MIN_MAX, 
+  `webaclId` VALUE_SET, 
+  `httpRequest` VALUE_SET, 
+  `action` VALUE_SET, 
+  `terminatingRuleType` VALUE_SET,
+  `httpSourceId` BLOOM_FILTER
+) WITH (
+  auto_refresh = true,
+  refresh_interval = '15 Minutes',
+  checkpoint_location = '{s3_checkpoint_location}',
+  watermark_delay = '1 Minute'
+)

server/adaptors/integrations/__data__/repository/aws_waf/assets/example_queries-1.0.0.ndjson

@@ -0,0 +1,3 @@
+{"attributes":{"createdTimeMs":1713289099101,"savedQuery":{"data_sources":"[{\"name\":\"mys3\",\"type\":\"s3glue\",\"label\":\"mys3\",\"value\":\"mys3\"}]","description":"","name":"Allowed Web Access Logs","query":"SELECT `timestamp` as event_timestamp, `webaclId`, `action`, `httpSourceName`, `httpRequest`.clientIp, `httpRequest`.country, `httpRequest`.uri, `httpRequest`.httpMethod, `httpRequest`.requestId FROM {table_name} WHERE `action` = 'ALLOW' ORDER BY event_timestamp DESC LIMIT 10;","query_lang":"SQL","selected_date_range":{"end":"now","start":"now-15m","text":""},"selected_fields":{"text":"","tokens":[]},"selected_timestamp":{"name":"","type":"timestamp"}},"title":"Allowed Web Access Logs","version":1},"id":"1d07d010-fc18-11ee-99c9-43e5dbd0692c","references":[],"type":"observability-search","updated_at":"2024-04-16T17:52:30.414Z","version":"WzI3NTEsMV0="}
+{"attributes":{"createdTimeMs":1713293269224,"savedQuery":{"data_sources":"[{\"name\":\"mys3\",\"type\":\"s3glue\",\"label\":\"mys3\",\"value\":\"mys3\"}]","description":"","name":"Regular TerminatingRule WebACLs Limited","query":"SELECT `webaclId` FROM {table_name} WHERE `terminatingRuleType` = 'REGULAR' LIMIT 10;","query_lang":"SQL","selected_date_range":{"end":"now","start":"now-15m","text":""},"selected_fields":{"text":"","tokens":[]},"selected_timestamp":{"name":"","type":"timestamp"}},"title":"Regular TerminatingRule WebACLs Limited","version":1},"id":"d2a038a0-fc21-11ee-ab45-d3075d0510e6","references":[],"type":"observability-search","updated_at":"2024-04-16T18:47:49.290Z","version":"WzI4MzIsMV0="}
+{"attributes":{"createdTimeMs":1713294061574,"savedQuery":{"data_sources":"[{\"name\":\"mys3\",\"type\":\"s3glue\",\"label\":\"mys3\",\"value\":\"mys3\"}]","description":"","name":"Allowed Actions WebACLs","query":"SELECT `webaclId`, `action` FROM {table_name} WHERE `action` = 'ALLOW' LIMIT 10;","query_lang":"SQL","selected_date_range":{"end":"now","start":"now-15m","text":""},"selected_fields":{"text":"","tokens":[]},"selected_timestamp":{"name":"","type":"timestamp"}},"title":"Allowed Actions WebACLs","version":1},"id":"aae73c80-fc23-11ee-ab45-d3075d0510e6","references":[],"type":"observability-search","updated_at":"2024-04-16T19:01:01.640Z","version":"WzI4MzUsMV0="}

server/adaptors/integrations/__data__/repository/aws_waf/aws_waf-1.0.0.json

@@ -73,6 +73,20 @@
       "type": "query",
       "workflows": ["dashboards"]
 
+    },
+    {
+      "name": "create_skipping_index",
+      "version": "1.0.0",
+      "extension": "sql",
+      "type": "query",
+      "workflows": ["queries"]
+    },
+    {
+      "name": "example_queries",
+      "version": "1.0.0",
+      "extension": "ndjson",
+      "type": "savedObjectBundle",
+      "workflows": ["queries"]
     }
   ],
   "sampleData": {