Merge branch 'main' into oas/remove-elastic-api-from-stateful-doc

package.json

@@ -1017,7 +1017,7 @@
     "@langchain/langgraph": "0.0.34",
     "@langchain/openai": "^0.1.3",
     "@langtrase/trace-attributes": "^3.0.8",
-    "@launchdarkly/node-server-sdk": "^9.6.0",
+    "@launchdarkly/node-server-sdk": "^9.6.1",
     "@launchdarkly/openfeature-node-server": "^1.0.0",
     "@loaders.gl/core": "^3.4.7",
     "@loaders.gl/json": "^3.4.7",

packages/kbn-test/src/jest/resolver.js

@@ -51,6 +51,13 @@ module.exports = (request, options) => {
     });
   }
 
+  if (request === '@launchdarkly/js-sdk-common') {
+    return resolve.sync('@launchdarkly/js-sdk-common/dist/cjs/index.cjs', {
+      basedir: options.basedir,
+      extensions: options.extensions,
+    });
+  }
+
   if (request === `elastic-apm-node`) {
     return APM_AGENT_MOCK;
   }

src/dev/build/tasks/os_packages/docker_generator/run.ts

@@ -51,7 +51,7 @@ export async function runDockerGenerator(
    */
   if (flags.baseImage === 'wolfi')
     baseImageName =
-      'docker.elastic.co/wolfi/chainguard-base:latest@sha256:de4d5b06ee2074eb716f29e72b170346fd4715e5f083fc83a378603ce5bd9ced';
+      'docker.elastic.co/wolfi/chainguard-base:latest@sha256:18153942f0d6e97bc6131cd557c7ed3be6e892846a5df0760896eb8d15b1b236';
 
   let imageFlavor = '';
   if (flags.baseImage === 'ubi') imageFlavor += `-ubi`;

x-pack/packages/kbn-cloud-security-posture/public/src/hooks/use_navigate_findings.ts

@@ -39,3 +39,17 @@ export const useNavigateFindings = () => {
 
 export const useNavigateVulnerabilities = () =>
   useNavigate(findingsNavigation.vulnerabilities.path);
+
+export const useNavigateNativeVulnerabilities = () => {
+  const navToVulnerabilities = useNavigateVulnerabilities();
+
+  return useCallback(
+    (filterParams: NavFilter = {}, groupBy?: string[]) => {
+      navToVulnerabilities(
+        { ...filterParams, 'data_stream.dataset': 'cloud_security_posture.vulnerabilities' },
+        groupBy
+      );
+    },
+    [navToVulnerabilities]
+  );
+};

x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_statistics.tsx

@@ -7,15 +7,15 @@
 import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiHealth } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useNavigateVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
+import { useNavigateNativeVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
 import { VULNERABILITIES_SEVERITY } from '@kbn/cloud-security-posture-common';
 import { getSeverityStatusColor } from '@kbn/cloud-security-posture';
 import { VulnCounterCard, type VulnCounterCardProps } from '../../components/vuln_counter_card';
 import { useVulnerabilityDashboardApi } from '../../common/api/use_vulnerability_dashboard_api';
 import { CompactFormattedNumber } from '../../components/compact_formatted_number';
 
 export const VulnerabilityStatistics = () => {
-  const navToVulnerabilities = useNavigateVulnerabilities();
+  const navToVulnerabilities = useNavigateNativeVulnerabilities();
   const getVulnerabilityDashboard = useVulnerabilityDashboardApi();
 
   const stats: VulnCounterCardProps[] = useMemo(

x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_table_panel_section.tsx

@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { NavFilter } from '@kbn/cloud-security-posture/src/utils/query_utils';
-import { useNavigateVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
+import { useNavigateNativeVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
 import type { VulnSeverity } from '@kbn/cloud-security-posture-common';
 import { CVSScoreBadge, SeverityStatusBadge } from '@kbn/cloud-security-posture';
 import {
@@ -33,7 +33,7 @@ import { VULNERABILITY_GROUPING_OPTIONS, VULNERABILITY_FIELDS } from '../../comm
 export const VulnerabilityTablePanelSection = () => {
   const getVulnerabilityDashboard = useVulnerabilityDashboardApi();
   const { euiTheme } = useEuiTheme();
-  const navToVulnerabilities = useNavigateVulnerabilities();
+  const navToVulnerabilities = useNavigateNativeVulnerabilities();
 
   const onCellClick = useCallback(
     (filters: NavFilter) => {

x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_trend_graph.tsx

@@ -19,7 +19,7 @@ import { EuiButton, EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { useNavigateVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
+import { useNavigateNativeVulnerabilities } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
 import type { VulnSeverity } from '@kbn/cloud-security-posture-common';
 import { VULNERABILITIES_SEVERITY } from '@kbn/cloud-security-posture-common';
 import { getSeverityStatusColor } from '@kbn/cloud-security-posture';
@@ -50,7 +50,7 @@ const theme: PartialTheme = {
 };
 
 const ViewAllButton = () => {
-  const navToVulnerabilities = useNavigateVulnerabilities();
+  const navToVulnerabilities = useNavigateNativeVulnerabilities();
 
   return (
     <EuiButton onClick={() => navToVulnerabilities()} size="s">

x-pack/plugins/security_solution/public/common/lib/telemetry/constants.ts

@@ -68,6 +68,8 @@ export enum TelemetryEventTypes {
   EntityDetailsClicked = 'Entity Details Clicked',
   EntityAlertsClicked = 'Entity Alerts Clicked',
   EntityRiskFiltered = 'Entity Risk Filtered',
+  EntityStoreEnablementToggleClicked = 'Entity Store Enablement Toggle Clicked',
+  EntityStoreDashboardInitButtonClicked = 'Entity Store Initialization Button Clicked',
   MLJobUpdate = 'ML Job Update',
   AddRiskInputToTimelineClicked = 'Add Risk Input To Timeline Clicked',
   ToggleRiskSummaryClicked = 'Toggle Risk Summary Clicked',

x-pack/plugins/security_solution/public/common/lib/telemetry/events/entity_analytics/index.ts

@@ -214,3 +214,36 @@ export const assetCriticalityCsvImportedEvent: TelemetryEvent = {
     },
   },
 };
+
+export const entityStoreInitEvent: TelemetryEvent = {
+  eventType: TelemetryEventTypes.EntityStoreDashboardInitButtonClicked,
+  schema: {
+    timestamp: {
+      type: 'date',
+      _meta: {
+        description: 'Timestamp of the event',
+        optional: false,
+      },
+    },
+  },
+};
+
+export const entityStoreEnablementEvent: TelemetryEvent = {
+  eventType: TelemetryEventTypes.EntityStoreEnablementToggleClicked,
+  schema: {
+    timestamp: {
+      type: 'date',
+      _meta: {
+        description: 'Timestamp of the event',
+        optional: false,
+      },
+    },
+    action: {
+      type: 'keyword',
+      _meta: {
+        description: 'Event toggle action',
+        optional: false,
+      },
+    },
+  },
+};

x-pack/plugins/security_solution/public/common/lib/telemetry/events/entity_analytics/types.ts

@@ -59,6 +59,15 @@ export interface ReportAssetCriticalityCsvImportedParams {
   };
 }
 
+export interface ReportEntityStoreEnablementParams {
+  timestamp: string;
+  action: 'start' | 'stop';
+}
+
+export interface ReportEntityStoreInitParams {
+  timestamp: string;
+}
+
 export type ReportEntityAnalyticsTelemetryEventParams =
   | ReportEntityDetailsClickedParams
   | ReportEntityAlertsClickedParams
@@ -68,7 +77,9 @@ export type ReportEntityAnalyticsTelemetryEventParams =
   | ReportAddRiskInputToTimelineClickedParams
   | ReportAssetCriticalityCsvPreviewGeneratedParams
   | ReportAssetCriticalityFileSelectedParams
-  | ReportAssetCriticalityCsvImportedParams;
+  | ReportAssetCriticalityCsvImportedParams
+  | ReportEntityStoreEnablementParams
+  | ReportEntityStoreInitParams;
 
 export type EntityAnalyticsTelemetryEvent =
   | {
@@ -106,4 +117,12 @@ export type EntityAnalyticsTelemetryEvent =
   | {
       eventType: TelemetryEventTypes.AssetCriticalityCsvImported;
       schema: RootSchema<ReportAssetCriticalityCsvImportedParams>;
+    }
+  | {
+      eventType: TelemetryEventTypes.EntityStoreEnablementToggleClicked;
+      schema: RootSchema<ReportEntityStoreEnablementParams>;
+    }
+  | {
+      eventType: TelemetryEventTypes.EntityStoreDashboardInitButtonClicked;
+      schema: RootSchema<ReportEntityStoreInitParams>;
     };

x-pack/plugins/security_solution/public/common/lib/telemetry/events/telemetry_events.ts

@@ -21,6 +21,8 @@ import {
   assetCriticalityCsvPreviewGeneratedEvent,
   assetCriticalityFileSelectedEvent,
   assetCriticalityCsvImportedEvent,
+  entityStoreEnablementEvent,
+  entityStoreInitEvent,
 } from './entity_analytics';
 import {
   assistantInvokedEvent,
@@ -172,6 +174,8 @@ export const telemetryEvents = [
   assetCriticalityCsvPreviewGeneratedEvent,
   assetCriticalityFileSelectedEvent,
   assetCriticalityCsvImportedEvent,
+  entityStoreEnablementEvent,
+  entityStoreInitEvent,
   toggleRiskSummaryClickedEvent,
   RiskInputsExpandedFlyoutOpenedEvent,
   addRiskInputToTimelineClickedEvent,

x-pack/plugins/security_solution/public/common/lib/telemetry/telemetry_client.mock.ts

@@ -43,4 +43,6 @@ export const createTelemetryClientMock = (): jest.Mocked<TelemetryClientStart> =
   reportOpenNoteInExpandableFlyoutClicked: jest.fn(),
   reportAddNoteFromExpandableFlyoutClicked: jest.fn(),
   reportPreviewRule: jest.fn(),
+  reportEntityStoreEnablement: jest.fn(),
+  reportEntityStoreInit: jest.fn(),
 });

x-pack/plugins/security_solution/public/common/lib/telemetry/telemetry_client.ts

@@ -45,6 +45,8 @@ import type {
   ReportEventLogShowSourceEventDateRangeParams,
   ReportEventLogFilterByRunTypeParams,
   PreviewRuleParams,
+  ReportEntityStoreEnablementParams,
+  ReportEntityStoreInitParams,
 } from './types';
 import { TelemetryEventTypes } from './constants';
 
@@ -216,4 +218,12 @@ export class TelemetryClient implements TelemetryClientStart {
   public reportPreviewRule = (params: PreviewRuleParams) => {
     this.analytics.reportEvent(TelemetryEventTypes.PreviewRule, params);
   };
+
+  public reportEntityStoreEnablement = (params: ReportEntityStoreEnablementParams) => {
+    this.analytics.reportEvent(TelemetryEventTypes.EntityStoreEnablementToggleClicked, params);
+  };
+
+  public reportEntityStoreInit = (params: ReportEntityStoreInitParams) => {
+    this.analytics.reportEvent(TelemetryEventTypes.EntityStoreDashboardInitButtonClicked, params);
+  };
 }

x-pack/plugins/security_solution/public/common/lib/telemetry/types.ts

@@ -32,6 +32,8 @@ import type {
   ReportAssetCriticalityCsvPreviewGeneratedParams,
   ReportAssetCriticalityFileSelectedParams,
   ReportAssetCriticalityCsvImportedParams,
+  ReportEntityStoreEnablementParams,
+  ReportEntityStoreInitParams,
 } from './events/entity_analytics/types';
 import type {
   AssistantTelemetryEvent,
@@ -78,17 +80,7 @@ export * from './events/ai_assistant/types';
 export * from './events/alerts_grouping/types';
 export * from './events/data_quality/types';
 export * from './events/onboarding/types';
-export type {
-  ReportEntityAlertsClickedParams,
-  ReportEntityDetailsClickedParams,
-  ReportEntityRiskFilteredParams,
-  ReportRiskInputsExpandedFlyoutOpenedParams,
-  ReportToggleRiskSummaryClickedParams,
-  ReportAddRiskInputToTimelineClickedParams,
-  ReportAssetCriticalityCsvPreviewGeneratedParams,
-  ReportAssetCriticalityFileSelectedParams,
-  ReportAssetCriticalityCsvImportedParams,
-} from './events/entity_analytics/types';
+export * from './events/entity_analytics/types';
 export * from './events/document_details/types';
 export * from './events/manual_rule_run/types';
 export * from './events/event_log/types';
@@ -168,6 +160,9 @@ export interface TelemetryClientStart {
   ): void;
   reportAssetCriticalityCsvImported(params: ReportAssetCriticalityCsvImportedParams): void;
   reportCellActionClicked(params: ReportCellActionClickedParams): void;
+  // Entity Analytics Entity Store
+  reportEntityStoreEnablement(params: ReportEntityStoreEnablementParams): void;
+  reportEntityStoreInit(params: ReportEntityStoreInitParams): void;
 
   reportAnomaliesCountClicked(params: ReportAnomaliesCountClickedParams): void;
   reportDataQualityIndexChecked(params: ReportDataQualityIndexCheckedParams): void;

x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/hooks/use_entity_store.ts

@@ -9,6 +9,7 @@ import type { UseMutationOptions } from '@tanstack/react-query';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useState } from 'react';
 
+import { useKibana } from '../../../../common/lib/kibana/kibana_react';
 import type {
   DeleteEntityEngineResponse,
   InitEntityEngineResponse,
@@ -21,6 +22,7 @@ const ENTITY_STORE_ENABLEMENT_INIT = 'ENTITY_STORE_ENABLEMENT_INIT';
 
 export const useEntityStoreEnablement = () => {
   const [polling, setPolling] = useState(false);
+  const { telemetry } = useKibana().services;
 
   useEntityEngineStatus({
     disabled: !polling,
@@ -46,8 +48,11 @@ export const useEntityStoreEnablement = () => {
   });
 
   const enable = useCallback(() => {
+    telemetry?.reportEntityStoreInit({
+      timestamp: new Date().toISOString(),
+    });
     initialize().then(() => setPolling(true));
-  }, [initialize]);
+  }, [initialize, telemetry]);
 
   return { enable };
 };
@@ -65,10 +70,17 @@ export const useInvalidateEntityEngineStatusQuery = () => {
 };
 
 export const useInitEntityEngineMutation = (options?: UseMutationOptions<{}>) => {
+  const { telemetry } = useKibana().services;
   const invalidateEntityEngineStatusQuery = useInvalidateEntityEngineStatusQuery();
   const { initEntityStore } = useEntityStoreRoutes();
   return useMutation<InitEntityEngineResponse[]>(
-    () => Promise.all([initEntityStore('user'), initEntityStore('host')]),
+    () => {
+      telemetry?.reportEntityStoreEnablement({
+        timestamp: new Date().toISOString(),
+        action: 'start',
+      });
+      return Promise.all([initEntityStore('user'), initEntityStore('host')]);
+    },
     {
       ...options,
       mutationKey: INIT_ENTITY_ENGINE_STATUS_KEY,
@@ -86,10 +98,17 @@ export const useInitEntityEngineMutation = (options?: UseMutationOptions<{}>) =>
 export const STOP_ENTITY_ENGINE_STATUS_KEY = ['POST', 'STOP_ENTITY_ENGINE'];
 
 export const useStopEntityEngineMutation = (options?: UseMutationOptions<{}>) => {
+  const { telemetry } = useKibana().services;
   const invalidateEntityEngineStatusQuery = useInvalidateEntityEngineStatusQuery();
   const { stopEntityStore } = useEntityStoreRoutes();
   return useMutation<StopEntityEngineResponse[]>(
-    () => Promise.all([stopEntityStore('user'), stopEntityStore('host')]),
+    () => {
+      telemetry?.reportEntityStoreEnablement({
+        timestamp: new Date().toISOString(),
+        action: 'stop',
+      });
+      return Promise.all([stopEntityStore('user'), stopEntityStore('host')]);
+    },
     {
       ...options,
       mutationKey: STOP_ENTITY_ENGINE_STATUS_KEY,

x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/artifacts_mocked_data.cy.ts

@@ -35,8 +35,7 @@ const loginWithoutAccess = (url: string) => {
   loadPage(url);
 };
 
-// Failing: See https://github.com/elastic/kibana/issues/191914
-describe.skip('Artifacts pages', { tags: ['@ess', '@serverless', '@skipInServerlessMKI'] }, () => {
+describe('Artifacts pages', { tags: ['@ess', '@serverless', '@skipInServerlessMKI'] }, () => {
   let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
 
   before(() => {

x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/event_filters.cy.ts

@@ -41,8 +41,7 @@ describe('Event Filters', { tags: ['@ess', '@serverless', '@skipInServerlessMKI'
     removeAllArtifacts();
   });
 
-  // FLAKY: https://github.com/elastic/kibana/issues/194135
-  describe.skip('when editing event filter value', () => {
+  describe('when editing event filter value', () => {
     let eventFiltersMock: ArtifactsFixtureType;
     beforeEach(() => {
       login();