Merge branch '8.14' into backport/8.14/pr-181159

elastic · Apr 18, 2024 · 5135fcd · 5135fcd
2 parents 2b29f63 + 1cfebf8
commit 5135fcd
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -83,7 +83,7 @@ const CaseContainerComponent: React.FC = () => {
           },
         });
         telemetry.reportDetailsFlyoutOpened({
-          tableId: TimelineId.casePage,
+          location: TimelineId.casePage,
           panel: 'right',
         });
       }

diff --git a/...k/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx b/...k/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx
@@ -122,7 +122,7 @@ const RowActionComponent = ({
         },
       });
       telemetry.reportDetailsFlyoutOpened({
-        tableId,
+        location: tableId,
         panel: 'right',
       });
     }

diff --git a/...ck/plugins/security_solution/public/common/lib/telemetry/events/document_details/index.ts b/...ck/plugins/security_solution/public/common/lib/telemetry/events/document_details/index.ts
@@ -11,7 +11,7 @@ import { TelemetryEventTypes } from '../../constants';
 export const DocumentDetailsFlyoutOpenedEvent: TelemetryEvent = {
   eventType: TelemetryEventTypes.DetailsFlyoutOpened,
   schema: {
-    tableId: {
+    location: {
       type: 'text',
       _meta: {
         description: 'Table ID',
@@ -31,7 +31,7 @@ export const DocumentDetailsFlyoutOpenedEvent: TelemetryEvent = {
 export const DocumentDetailsTabClickedEvent: TelemetryEvent = {
   eventType: TelemetryEventTypes.DetailsFlyoutTabClicked,
   schema: {
-    tableId: {
+    location: {
       type: 'text',
       _meta: {
         description: 'Table ID',

diff --git a/...ck/plugins/security_solution/public/common/lib/telemetry/events/document_details/types.ts b/...ck/plugins/security_solution/public/common/lib/telemetry/events/document_details/types.ts
@@ -9,12 +9,12 @@ import type { RootSchema } from '@kbn/analytics-client';
 import type { TelemetryEventTypes } from '../../constants';
 
 export interface ReportDetailsFlyoutOpenedParams {
-  tableId: string;
+  location: string;
   panel: 'left' | 'right' | 'preview';
 }
 
 export interface ReportDetailsFlyoutTabClickedParams {
-  tableId: string;
+  location: string;
   panel: 'left' | 'right';
   tabId: string;
 }

diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx
@@ -69,7 +69,7 @@ export const LeftPanel: FC<Partial<LeftPanelProps>> = memo(({ path }) => {
       },
     });
     telemetry.reportDetailsFlyoutTabClicked({
-      tableId: scopeId,
+      location: scopeId,
       panel: 'left',
       tabId,
     });

diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/tabs/insights_tab.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/tabs/insights_tab.tsx
@@ -117,7 +117,7 @@ export const InsightsTab: React.FC = memo(() => {
         },
       });
       telemetry.reportDetailsFlyoutTabClicked({
-        tableId: scopeId,
+        location: scopeId,
         panel: 'left',
         tabId: optionId,
       });

diff --git a/...s/security_solution/public/flyout/document_details/right/components/alert_description.tsx b/...s/security_solution/public/flyout/document_details/right/components/alert_description.tsx
@@ -59,7 +59,7 @@ export const AlertDescription: FC = () => {
       },
     });
     telemetry.reportDetailsFlyoutOpened({
-      tableId: scopeId,
+      location: scopeId,
       panel: 'preview',
     });
   }, [eventId, openPreviewPanel, indexName, scopeId, ruleId, telemetry]);

diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/reason.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/reason.tsx
@@ -55,7 +55,7 @@ export const Reason: FC = () => {
       },
     });
     telemetry.reportDetailsFlyoutOpened({
-      tableId: scopeId,
+      location: scopeId,
       panel: 'preview',
     });
   }, [eventId, openPreviewPanel, indexName, scopeId, telemetry]);

diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/index.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/index.tsx
@@ -65,7 +65,7 @@ export const RightPanel: FC<Partial<RightPanelProps>> = memo(({ path }) => {
     storage.set(FLYOUT_STORAGE_KEYS.RIGHT_PANEL_SELECTED_TABS, tabId);
 
     telemetry.reportDetailsFlyoutTabClicked({
-      tableId: scopeId,
+      location: scopeId,
       panel: 'right',
       tabId,
     });

diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/navigation.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/navigation.tsx
@@ -36,7 +36,7 @@ export const PanelNavigation: FC<PanelNavigationProps> = memo(({ flyoutIsExpanda
       },
     });
     telemetry.reportDetailsFlyoutOpened({
-      tableId: scopeId,
+      location: scopeId,
       panel: 'left',
     });
   }, [eventId, openLeftPanel, indexName, scopeId, telemetry]);

diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/slos/delete_slo.ts b/x-pack/test_serverless/api_integration/test_suites/observability/slos/delete_slo.ts
@@ -47,7 +47,8 @@ export default function ({ getService }: FtrProviderContext) {
       return {};
     }
   };
-  describe('delete_slo', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/180982
+  describe.skip('delete_slo', () => {
     // DATE_VIEW should match the index template:
     // x-pack/packages/kbn-infra-forge/src/data_sources/composable/template.json
     const DATE_VIEW = 'kbn-data-forge-fake_hosts';