Merge branch 'main' into migrations/global_search-basic

x-pack/plugins/apm/server/routes/rum_client/queries.test.ts

@@ -13,8 +13,6 @@ import { getClientMetrics } from './get_client_metrics';
 import { getPageViewTrends } from './get_page_view_trends';
 import { getPageLoadDistribution } from './get_page_load_distribution';
 import { getLongTaskMetrics } from './get_long_task_metrics';
-import { getWebCoreVitals } from './get_web_core_vitals';
-import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
 
 describe('rum client dashboard queries', () => {
   let mock: SearchParamsMock;
@@ -66,19 +64,6 @@ describe('rum client dashboard queries', () => {
     expect(mock.params).toMatchSnapshot();
   });
 
-  it('fetches rum core vitals', async () => {
-    mock = await inspectSearchParams(
-      (setup) =>
-        getWebCoreVitals({
-          setup,
-          start: 0,
-          end: 50000,
-        }),
-      { uiFilters: { environment: ENVIRONMENT_ALL.value } }
-    );
-    expect(mock.params).toMatchSnapshot();
-  });
-
   it('fetches long task metrics', async () => {
     mock = await inspectSearchParams((setup) =>
       getLongTaskMetrics({

x-pack/plugins/apm/server/routes/rum_client/route.ts

@@ -14,7 +14,6 @@ import { getPageLoadDistribution } from './get_page_load_distribution';
 import { getPageViewTrends } from './get_page_view_trends';
 import { getPageLoadDistBreakdown } from './get_pl_dist_breakdown';
 import { getVisitorBreakdown } from './get_visitor_breakdown';
-import { getWebCoreVitals } from './get_web_core_vitals';
 import { hasRumData } from './has_rum_data';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { rangeRt } from '../default_api_types';
@@ -214,41 +213,6 @@ const rumVisitorsBreakdownRoute = createApmServerRoute({
   },
 });
 
-const rumWebCoreVitals = createApmServerRoute({
-  endpoint: 'GET /internal/apm/ux/web-core-vitals',
-  params: t.type({
-    query: uxQueryRt,
-  }),
-  options: { tags: ['access:apm'] },
-  handler: async (
-    resources
-  ): Promise<{
-    coreVitalPages: number;
-    cls: number | null;
-    fid: number | null | undefined;
-    lcp: number | null | undefined;
-    tbt: number;
-    fcp: number | null | undefined;
-    lcpRanks: number[];
-    fidRanks: number[];
-    clsRanks: number[];
-  }> => {
-    const setup = await setupUXRequest(resources);
-
-    const {
-      query: { urlQuery, percentile, start, end },
-    } = resources.params;
-
-    return getWebCoreVitals({
-      setup,
-      urlQuery,
-      percentile: percentile ? Number(percentile) : undefined,
-      start,
-      end,
-    });
-  },
-});
-
 const rumLongTaskMetrics = createApmServerRoute({
   endpoint: 'GET /internal/apm/ux/long-task-metrics',
   params: t.type({
@@ -338,7 +302,6 @@ export const rumRouteRepository = {
   ...rumPageLoadDistBreakdownRoute,
   ...rumPageViewsTrendRoute,
   ...rumVisitorsBreakdownRoute,
-  ...rumWebCoreVitals,
   ...rumLongTaskMetrics,
   ...rumHasDataRoute,
 };

x-pack/plugins/cloud_security_posture/public/pages/findings/latest_findings_by_resource/findings_by_resource_table.test.tsx

@@ -22,12 +22,14 @@ const getFakeFindingsByResource = (): FindingsByResourcePage => {
   const total = chance.integer() + count + 1;
   const normalized = count / total;
 
+  const [resourceName, resourceSubtype, ...cisSections] = chance.unique(chance.word, 4);
+
   return {
     cluster_id: chance.guid(),
     resource_id: chance.guid(),
-    resource_name: chance.word(),
-    resource_subtype: chance.word(),
-    cis_sections: [chance.word(), chance.word()],
+    resource_name: resourceName,
+    resource_subtype: resourceSubtype,
+    cis_sections: cisSections,
     failed_findings: {
       count,
       normalized,

x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/container/container_metrics_table.tsx

@@ -109,6 +109,7 @@ function containerNodeColumns(
       name: 'Name',
       field: 'name',
       truncateText: true,
+      textOnly: true,
       render: (name: string) => {
         return <MetricsNodeDetailsLink id={name} nodeType={'container'} timerange={timerange} />;
       },

x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/host/host_metrics_table.tsx

@@ -109,6 +109,7 @@ function hostMetricsColumns(
       name: 'Name',
       field: 'name',
       truncateText: true,
+      textOnly: true,
       render: (name: string) => (
         <MetricsNodeDetailsLink id={name} nodeType={'host'} timerange={timerange} />
       ),

x-pack/plugins/infra/public/components/infrastructure_node_metrics_tables/pod/pod_metrics_table.tsx

@@ -107,6 +107,7 @@ function podNodeColumns(
       name: 'Name',
       field: 'name',
       truncateText: true,
+      textOnly: true,
       render: (name: string) => {
         return <MetricsNodeDetailsLink id={name} nodeType={'pod'} timerange={timerange} />;
       },

x-pack/plugins/lens/public/xy_visualization/xy_config_panel/color_picker.tsx

@@ -70,29 +70,34 @@ export const ColorPicker = ({
   disabled?: boolean;
   showAlpha?: boolean;
 }) => {
-  const [color, setColor] = useState(overwriteColor || defaultColor);
-  const [hexColor, setHexColor] = useState(overwriteColor || defaultColor);
-  const [currentColorAlpha, setCurrentColorAlpha] = useState(getColorAlpha(color));
+  const [colorText, setColorText] = useState(overwriteColor || defaultColor);
+  const [validatedColor, setValidatedColor] = useState(overwriteColor || defaultColor);
+  const [currentColorAlpha, setCurrentColorAlpha] = useState(getColorAlpha(colorText));
   const unflushedChanges = useRef(false);
 
   useEffect(() => {
     //  only the changes from outside the color picker should be applied
     if (!unflushedChanges.current) {
       // something external changed the color that is currently selected (switching from annotation line to annotation range)
-      if (overwriteColor && hexColor && overwriteColor !== hexColor) {
-        setColor(overwriteColor || defaultColor);
+      if (
+        overwriteColor &&
+        validatedColor &&
+        overwriteColor.toUpperCase() !== validatedColor.toUpperCase()
+      ) {
+        setColorText(overwriteColor);
+        setValidatedColor(overwriteColor.toUpperCase());
         setCurrentColorAlpha(getColorAlpha(overwriteColor));
       }
     }
     unflushedChanges.current = false;
-  }, [hexColor, overwriteColor, defaultColor]);
+  }, [validatedColor, overwriteColor, defaultColor]);
 
   const handleColor: EuiColorPickerProps['onChange'] = (text, output) => {
-    setColor(text);
+    setColorText(text);
     unflushedChanges.current = true;
     if (output.isValid) {
-      setHexColor(output.hex);
-      setCurrentColorAlpha(chroma(output.hex)?.alpha() || 1);
+      setValidatedColor(output.hex.toUpperCase());
+      setCurrentColorAlpha(getColorAlpha(output.hex));
       setConfig({ color: output.hex });
     }
     if (text === '') {
@@ -113,7 +118,7 @@ export const ColorPicker = ({
       compressed
       isClearable={Boolean(overwriteColor)}
       onChange={handleColor}
-      color={disabled ? '' : color}
+      color={disabled ? '' : colorText}
       disabled={disabled}
       placeholder={
         defaultColor?.toUpperCase() ||
@@ -139,7 +144,7 @@ export const ColorPicker = ({
         <TooltipWrapper
           delay="long"
           position="top"
-          tooltipContent={color && !disabled ? tooltipContent.custom : tooltipContent.auto}
+          tooltipContent={colorText && !disabled ? tooltipContent.custom : tooltipContent.auto}
           condition={!disableHelpTooltip}
         >
           <span>

x-pack/plugins/security_solution/server/lib/telemetry/__mocks__/index.ts

@@ -14,7 +14,8 @@ import { PackagePolicy } from '@kbn/fleet-plugin/common/types/models/package_pol
 import { stubEndpointAlertResponse, stubProcessTree, stubFetchTimelineEvents } from './timeline';
 
 export const createMockTelemetryEventsSender = (
-  enableTelemetry?: boolean
+  enableTelemetry?: boolean,
+  canConnect?: boolean
 ): jest.Mocked<TelemetryEventsSender> => {
   return {
     setup: jest.fn(),
@@ -25,6 +26,7 @@ export const createMockTelemetryEventsSender = (
     queueTelemetryEvents: jest.fn(),
     processEvents: jest.fn(),
     isTelemetryOptedIn: jest.fn().mockReturnValue(enableTelemetry ?? jest.fn()),
+    isTelemetryServicesReachable: jest.fn().mockReturnValue(canConnect ?? jest.fn()),
     sendIfDue: jest.fn(),
     sendEvents: jest.fn(),
     sendOnDemand: jest.fn(),

x-pack/plugins/security_solution/server/lib/telemetry/preview_sender.ts

@@ -6,7 +6,6 @@
  */
 
 import axios, { AxiosInstance, AxiosResponse } from 'axios';
-
 import { Logger } from '@kbn/core/server';
 import { TelemetryPluginStart, TelemetryPluginSetup } from '@kbn/telemetry-plugin/server';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
@@ -120,6 +119,10 @@ export class PreviewTelemetryEventsSender implements ITelemetryEventsSender {
     return this.composite.isTelemetryOptedIn();
   }
 
+  public isTelemetryServicesReachable(): Promise<boolean> {
+    return this.composite.isTelemetryServicesReachable();
+  }
+
   public sendIfDue(axiosInstance?: AxiosInstance): Promise<void> {
     return this.composite.sendIfDue(axiosInstance);
   }

x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts

@@ -211,6 +211,7 @@ describe('TelemetryEventsSender', () => {
       sender['telemetrySetup'] = {
         getTelemetryUrl: jest.fn(async () => new URL('https://telemetry.elastic.co')),
       };
+      sender['isTelemetryServicesReachable'] = jest.fn(async () => true);
       sender['telemetryUsageCounter'] = telemetryUsageCounter;
       sender['sendEvents'] = jest.fn(async () => {
         sender['telemetryUsageCounter']?.incrementCounter({
@@ -249,6 +250,23 @@ describe('TelemetryEventsSender', () => {
       expect(sender['queue'].length).toBe(0);
       expect(sender['sendEvents']).toBeCalledTimes(0);
     });
+
+    it("shouldn't send when telemetry when opted in but cannot connect to elastic telemetry services", async () => {
+      const sender = new TelemetryEventsSender(logger);
+      sender['sendEvents'] = jest.fn();
+      const telemetryStart = {
+        getIsOptedIn: jest.fn(async () => true),
+      };
+      sender['telemetryStart'] = telemetryStart;
+      sender['isTelemetryServicesReachable'] = jest.fn(async () => false);
+
+      sender.queueTelemetryEvents([{ 'event.kind': '1' }, { 'event.kind': '2' }]);
+      expect(sender['queue'].length).toBe(2);
+      await sender['sendIfDue']();
+
+      expect(sender['queue'].length).toBe(0);
+      expect(sender['sendEvents']).toBeCalledTimes(0);
+    });
   });
 });