merge main

.buildkite/ftr_configs.yml

@@ -373,7 +373,8 @@ enabled:
   - x-pack/test/security_functional/user_profiles.config.ts
   - x-pack/test/security_functional/expired_session.config.ts
   - x-pack/test/security_solution_endpoint_api_int/config.ts
-  - x-pack/test/security_solution_endpoint/config.ts
+  - x-pack/test/security_solution_endpoint/endpoint.config.ts
+  - x-pack/test/security_solution_endpoint/integrations.config.ts
   - x-pack/test/session_view/basic/config.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts

packages/kbn-alerts-as-data-utils/src/field_maps/ecs_field_map.ts

@@ -11,25 +11,23 @@ import { EcsMetadata, FieldMap } from './types';
 
 const EXCLUDED_TYPES = ['constant_keyword'];
 
-export const ecsFieldMap: FieldMap = Object.keys(EcsFlat).reduce((acc, currKey) => {
-  const value: EcsMetadata = EcsFlat[currKey as keyof typeof EcsFlat];
-
-  // Exclude excluded types
-  if (EXCLUDED_TYPES.includes(value.type)) {
-    return acc;
-  }
-
-  return {
-    ...acc,
-    [currKey]: {
-      type: value.type,
-      array: value.normalize.includes('array'),
-      required: !!value.required,
-      ...(value.scaling_factor ? { scaling_factor: value.scaling_factor } : {}),
-      ...(value.ignore_above ? { ignore_above: value.ignore_above } : {}),
-      ...(value.multi_fields ? { multi_fields: value.multi_fields } : {}),
-    },
-  };
-}, {});
+export const ecsFieldMap: FieldMap = Object.fromEntries(
+  Object.entries(EcsFlat)
+    .filter(([_, value]) => !EXCLUDED_TYPES.includes(value.type))
+    .map(([key, _]) => {
+      const value: EcsMetadata = EcsFlat[key as keyof typeof EcsFlat];
+      return [
+        key,
+        {
+          type: value.type,
+          array: value.normalize.includes('array'),
+          required: !!value.required,
+          ...(value.scaling_factor ? { scaling_factor: value.scaling_factor } : {}),
+          ...(value.ignore_above ? { ignore_above: value.ignore_above } : {}),
+          ...(value.multi_fields ? { multi_fields: value.multi_fields } : {}),
+        },
+      ];
+    })
+);
 
 export type EcsFieldMap = typeof ecsFieldMap;

packages/kbn-chart-icons/index.ts

@@ -40,4 +40,5 @@ export {
   IconChartHeatmap,
   IconChartHorizontalBullet,
   IconChartVerticalBullet,
+  IconChartTagcloud,
 } from './src/assets';

packages/kbn-chart-icons/src/assets/chart_tagcloud.tsx

@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, { FunctionComponent } from 'react';
+import type { EuiIconProps } from '@elastic/eui';
+import { colors } from './common_styles';
+
+export const IconChartTagcloud: FunctionComponent = ({
+  title,
+  titleId,
+  ...props
+}: Omit<EuiIconProps, 'type'>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="30" height="22" viewBox="0 0 30 22" {...props}>
+    {title ? <title id={titleId} /> : null}
+    <path
+      d="M19 5a2 2 0 0 1 2-2h4a2 2 0 1 1 0 4h-4a2 2 0 0 1-2-2ZM2 11a2 2 0 0 1 2-2h8a2 2 0 1 1 0 4H4a2 2 0 0 1-2-2Zm15 4a2 2 0 1 0 0 4h6a2 2 0 1 0 0-4h-6Z"
+      className={colors.accent}
+    />
+    <path
+      d="M6 4a1 1 0 0 0 0 2h4a1 1 0 1 0 0-2H6Zm8 0a1 1 0 1 0 0 2h2a1 1 0 1 0 0-2h-2Zm2 7a1 1 0 0 1 1-1h10a1 1 0 1 1 0 2H17a1 1 0 0 1-1-1Zm-8 5a1 1 0 1 0 0 2h4a1 1 0 1 0 0-2H8Z"
+      className={colors.subdued}
+    />
+  </svg>
+);

packages/kbn-chart-icons/src/assets/index.ts

@@ -40,3 +40,4 @@ export { IconRegionMap } from './region_map';
 export { IconChartHeatmap } from './chart_heatmap';
 export { IconChartHorizontalBullet } from './chart_horizontal_bullet';
 export { IconChartVerticalBullet } from './chart_vertical_bullet';
+export { IconChartTagcloud } from './chart_tagcloud';

src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts

@@ -150,7 +150,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ui-metric": "d227284528fd19904e9d972aea0a13716fc5fe24",
         "upgrade-assistant-ml-upgrade-operation": "421f52731cb24e242d70672ba4725e169277efb3",
         "upgrade-assistant-reindex-operation": "01f3c3e051659ace56492a73928987e717537a93",
-        "uptime-dynamic-settings": "a9e9c42d8c1b6643946f32558478b274de0f89e0",
+        "uptime-dynamic-settings": "b6756ff71d6b5258971b1c8fd433d167affbde52",
         "uptime-synthetics-api-key": "7ae976a461248f9dbd8442af14a179bdbc229eca",
         "url": "c923a4a5002a09c0080c9095e958f07d518e6704",
         "usage-counters": "48782b3bcb6b5a23ba6f2bfe3a380d835e68890a",

src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.ts

@@ -20,7 +20,7 @@ const strings = {
   help: i18n.translate('expressionTagcloud.functions.tagcloudHelpText', {
     defaultMessage: 'Tagcloud visualization.',
   }),
-  args: {
+  argHelp: {
     scale: i18n.translate('expressionTagcloud.functions.tagcloud.args.scaleHelpText', {
       defaultMessage: 'Scale to determine font size of a word',
     }),
@@ -48,6 +48,9 @@ const strings = {
     ariaLabel: i18n.translate('expressionTagcloud.functions.tagcloud.args.ariaLabelHelpText', {
       defaultMessage: 'Specifies the aria label of the tagcloud',
     }),
+    isPreview: i18n.translate('expressionTagcloud.functions.tagcloud.args.isPreviewHelpText', {
+      defaultMessage: 'Set isPreview to true to avoid showing out of room warnings',
+    }),
   },
   dimension: {
     tags: i18n.translate('expressionTagcloud.functions.tagcloud.dimension.tags', {
@@ -81,7 +84,7 @@ export const errors = {
 };
 
 export const tagcloudFunction: ExpressionTagcloudFunction = () => {
-  const { help, args: argHelp, dimension } = strings;
+  const { help, argHelp, dimension } = strings;
 
   return {
     name: EXPRESSION_NAME,
@@ -137,6 +140,12 @@ export const tagcloudFunction: ExpressionTagcloudFunction = () => {
         help: argHelp.ariaLabel,
         required: false,
       },
+      isPreview: {
+        types: ['boolean'],
+        help: argHelp.isPreview,
+        default: false,
+        required: false,
+      },
     },
     fn(input, args, handlers) {
       validateAccessor(args.metric, input.columns);
@@ -157,6 +166,7 @@ export const tagcloudFunction: ExpressionTagcloudFunction = () => {
           args.ariaLabel ??
           (handlers.variables?.embeddableTitle as string) ??
           handlers.getExecutionContext?.()?.description,
+        isPreview: Boolean(args.isPreview),
       };
 
       if (handlers?.inspectorAdapters?.tables) {

src/plugins/chart_expressions/expression_tagcloud/common/index.ts

@@ -7,3 +7,5 @@
  */
 
 export { EXPRESSION_NAME, ScaleOptions, Orientation } from './constants';
+
+export type { ExpressionTagcloudFunctionDefinition } from './types/expression_functions';

src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts

@@ -17,23 +17,23 @@ import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
 
 interface TagCloudCommonParams {
-  scale: $Values<typeof ScaleOptions>;
+  scale?: $Values<typeof ScaleOptions>;
   orientation: $Values<typeof Orientation>;
   minFontSize: number;
   maxFontSize: number;
   showLabel: boolean;
   ariaLabel?: string;
+  metric: ExpressionValueVisDimension | string;
+  bucket?: ExpressionValueVisDimension | string;
+  palette: PaletteOutput;
 }
 
 export interface TagCloudVisConfig extends TagCloudCommonParams {
-  metric: ExpressionValueVisDimension | string;
-  bucket?: ExpressionValueVisDimension | string;
+  isPreview?: boolean;
 }
 
 export interface TagCloudRendererParams extends TagCloudCommonParams {
-  palette: PaletteOutput;
-  metric: ExpressionValueVisDimension | string;
-  bucket?: ExpressionValueVisDimension | string;
+  isPreview: boolean;
 }
 
 export interface TagcloudRendererConfig {
@@ -43,13 +43,11 @@ export interface TagcloudRendererConfig {
   syncColors: boolean;
 }
 
-interface Arguments extends TagCloudVisConfig {
-  palette: PaletteOutput;
-}
-
-export type ExpressionTagcloudFunction = () => ExpressionFunctionDefinition<
-  'tagcloud',
+export type ExpressionTagcloudFunctionDefinition = ExpressionFunctionDefinition<
+  typeof EXPRESSION_NAME,
   Datatable,
-  Arguments,
+  TagCloudVisConfig,
   ExpressionValueRender<TagcloudRendererConfig>
 >;
+
+export type ExpressionTagcloudFunction = () => ExpressionTagcloudFunctionDefinition;

src/plugins/chart_expressions/expression_tagcloud/kibana.jsonc

@@ -20,6 +20,9 @@
     "requiredBundles": [
       "kibanaUtils",
       "kibanaReact"
+    ],
+    "extraPublicDirs": [
+      "common"
     ]
   }
 }

src/plugins/chart_expressions/expression_tagcloud/public/__stories__/tagcloud_renderer.stories.tsx

@@ -57,6 +57,7 @@ const config: TagcloudRendererConfig = {
       format: { id: 'string', params: {} },
     },
     palette: { type: 'palette', name: 'default' },
+    isPreview: false,
   },
   syncColors: false,
 };

src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.test.tsx

@@ -61,6 +61,7 @@ const visParams: TagCloudRendererParams = {
   minFontSize: 12,
   maxFontSize: 70,
   showLabel: true,
+  isPreview: false,
 };
 
 const formattedData: WordcloudSpec['data'] = [

src/plugins/chart_expressions/expression_tagcloud/public/components/tagcloud_component.tsx

@@ -10,14 +10,12 @@ import React, { useCallback, useState, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { throttle } from 'lodash';
 import { EuiIconTip, EuiResizeObserver } from '@elastic/eui';
+import { IconChartTagcloud } from '@kbn/chart-icons';
 import { Chart, Settings, Wordcloud, RenderChangeListener } from '@elastic/charts';
+import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
 import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring';
 import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/public';
-import {
-  getColumnByAccessor,
-  getAccessor,
-  getFormatByAccessor,
-} from '@kbn/visualizations-plugin/common/utils';
+import { getColumnByAccessor, getFormatByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { getFormatService } from '../format_service';
 import { TagcloudRendererConfig } from '../../common/types';
 import { ScaleOptions, Orientation } from '../../common/constants';
@@ -153,6 +151,11 @@ export const TagCloudChart = ({
       const termsBucketId = getColumnByAccessor(bucket, visData.columns)!.id;
       const clickedValue = elements[0][0].text;
 
+      const columnIndex = visData.columns.findIndex((col) => col.id === termsBucketId);
+      if (columnIndex < 0) {
+        return;
+      }
+
       const rowIndex = visData.rows.findIndex((row) => {
         const formattedValue = bucketFormatter
           ? bucketFormatter.convert(row[termsBucketId], 'text')
@@ -170,7 +173,7 @@ export const TagCloudChart = ({
           data: [
             {
               table: visData,
-              column: getAccessor(bucket),
+              column: columnIndex,
               row: rowIndex,
             },
           ],
@@ -180,6 +183,10 @@ export const TagCloudChart = ({
     [bucket, bucketFormatter, fireEvent, visData]
   );
 
+  if (visData.rows.length === 0) {
+    return <EmptyPlaceholder icon={IconChartTagcloud} renderComplete={renderComplete} />;
+  }
+
   return (
     <EuiResizeObserver onResize={updateChart}>
       {(resizeRef) => (
@@ -215,7 +222,7 @@ export const TagCloudChart = ({
               {label}
             </div>
           )}
-          {warning && (
+          {!visParams.isPreview && warning && (
             <div className="tgcChart__warning">
               <EuiIconTip
                 type="warning"
@@ -229,7 +236,7 @@ export const TagCloudChart = ({
               />
             </div>
           )}
-          {tagCloudData.length > MAX_TAG_COUNT && (
+          {!visParams.isPreview && tagCloudData.length > MAX_TAG_COUNT && (
             <div className="tgcChart__warning">
               <EuiIconTip
                 type="warning"

src/plugins/chart_expressions/expression_tagcloud/public/expression_renderers/tagcloud_renderer.tsx

@@ -68,8 +68,6 @@ export const tagcloudRenderer: (
 
     const palettesRegistry = await plugins.charts.palettes.getPalettes();
 
-    const showNoResult = config.visData.rows.length === 0;
-
     render(
       <KibanaThemeProvider theme$={core.theme.theme$}>
         <I18nProvider>
@@ -81,7 +79,6 @@ export const tagcloudRenderer: (
                 // It is used for rendering at `Canvas`.
                 className={cx('tagCloudContainer', css(tagCloudVisClass))}
                 renderComplete={renderComplete}
-                showNoResult={showNoResult}
               >
                 <TagCloudChart
                   {...config}

src/plugins/chart_expressions/expression_tagcloud/tsconfig.json

@@ -26,6 +26,7 @@
     "@kbn/kibana-react-plugin",
     "@kbn/analytics",
     "@kbn/chart-expressions-common",
+    "@kbn/chart-icons",
   ],
   "exclude": [
     "target/**/*",

src/plugins/chart_expressions/expression_xy/common/index.ts

@@ -9,7 +9,7 @@
 export const PLUGIN_ID = 'expressionXy';
 export const PLUGIN_NAME = 'expressionXy';
 
-export { LayerTypes } from './constants';
+export { LayerTypes, XYCurveTypes } from './constants';
 
 export type {
   AllowedXYOverrides,

src/plugins/chart_expressions/expression_xy/public/index.ts

@@ -14,6 +14,6 @@ export function plugin() {
   return new ExpressionXyPlugin();
 }
 
-export { LayerTypes } from '../common';
+export { LayerTypes, XYCurveTypes } from '../common';
 
 export type { ExpressionXyPluginSetup, ExpressionXyPluginStart } from './types';

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/xy/configuration.ts

@@ -7,7 +7,8 @@
  */
 
 import { Position } from '@elastic/charts';
-import { XYConfiguration, XYLayerConfig } from '@kbn/visualizations-plugin/common';
+import { XYCurveTypes } from '@kbn/visualizations-plugin/public';
+import type { XYConfiguration, XYLayerConfig } from '@kbn/visualizations-plugin/common';
 import { Panel } from '../../../../../common/types';
 import { getYExtents } from './extents';
 
@@ -18,6 +19,7 @@ export const getConfigurationForTimeseries = (
   const extents = getYExtents(model);
   return {
     layers,
+    curveType: model.series[0].steps === 1 ? XYCurveTypes.CURVE_STEP_AFTER : undefined,
     fillOpacity: Number(model.series[0].fill) ?? 0.3,
     legend: {
       isVisible: Boolean(model.show_legend),

src/plugins/visualizations/public/index.ts

@@ -53,7 +53,7 @@ export {
   DEFAULT_LEGEND_SIZE,
 } from '../common/constants';
 export type { SavedVisState, VisParams, Dimension } from '../common';
-export { prepareLogTable } from '../common';
+export { prepareLogTable, XYCurveTypes } from '../common';
 export type { ExpressionValueVisDimension } from '../common/expression_functions/vis_dimension';
 export type {
   ExpressionValueXYDimension,

test/interpreter_functional/snapshots/baseline/partial_test_1.json

@@ -1 +1 @@
-{"as":"tagcloud","type":"render","value":{"syncColors":false,"visData":{"columns":[{"id":"col-0-2","meta":{"field":"response.raw","index":"logstash-*","params":{"id":"terms","params":{"id":"string","missingBucketLabel":"Missing","otherBucketLabel":"Other"}},"source":"esaggs","sourceParams":{"appliedTimeRange":null,"enabled":true,"hasPrecisionError":false,"id":"2","indexPatternId":"logstash-*","params":{"excludeIsRegex":true,"field":"response.raw","includeIsRegex":true,"missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"schema":"segment","type":"terms"},"type":"string"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"field":null,"index":"logstash-*","params":{"id":"number"},"source":"esaggs","sourceParams":{"appliedTimeRange":null,"enabled":true,"hasPrecisionError":false,"id":"1","indexPatternId":"logstash-*","params":{"emptyAsNull":false},"schema":"metric","type":"count"},"type":"number"},"name":"Count"}],"meta":{"source":"logstash-*","statistics":{"totalCount":14004},"type":"esaggs"},"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"datatable"},"visParams":{"ariaLabel":null,"bucket":{"accessor":0,"format":{"id":"terms","params":{"id":"string","missingBucketLabel":"Missing","otherBucketLabel":"Other"}},"type":"vis_dimension"},"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","palette":{"name":"custom","params":{"colors":["#882E72","#B178A6","#D6C1DE","#1965B0","#5289C7","#7BAFDE","#4EB265","#90C987","#CAE0AB","#F7EE55","#F6C141","#F1932D","#E8601C","#DC050C"],"continuity":"above","gradient":false,"range":"percent","rangeMax":null,"rangeMin":0,"stops":[]},"type":"palette"},"scale":"linear","showLabel":true},"visType":"tagcloud"}}
+{"as":"tagcloud","type":"render","value":{"syncColors":false,"visData":{"columns":[{"id":"col-0-2","meta":{"field":"response.raw","index":"logstash-*","params":{"id":"terms","params":{"id":"string","missingBucketLabel":"Missing","otherBucketLabel":"Other"}},"source":"esaggs","sourceParams":{"appliedTimeRange":null,"enabled":true,"hasPrecisionError":false,"id":"2","indexPatternId":"logstash-*","params":{"excludeIsRegex":true,"field":"response.raw","includeIsRegex":true,"missingBucket":false,"missingBucketLabel":"Missing","order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","size":4},"schema":"segment","type":"terms"},"type":"string"},"name":"response.raw: Descending"},{"id":"col-1-1","meta":{"field":null,"index":"logstash-*","params":{"id":"number"},"source":"esaggs","sourceParams":{"appliedTimeRange":null,"enabled":true,"hasPrecisionError":false,"id":"1","indexPatternId":"logstash-*","params":{"emptyAsNull":false},"schema":"metric","type":"count"},"type":"number"},"name":"Count"}],"meta":{"source":"logstash-*","statistics":{"totalCount":14004},"type":"esaggs"},"rows":[{"col-0-2":"200","col-1-1":12891},{"col-0-2":"404","col-1-1":696},{"col-0-2":"503","col-1-1":417}],"type":"datatable"},"visParams":{"ariaLabel":null,"bucket":{"accessor":0,"format":{"id":"terms","params":{"id":"string","missingBucketLabel":"Missing","otherBucketLabel":"Other"}},"type":"vis_dimension"},"isPreview":false,"maxFontSize":72,"metric":{"accessor":1,"format":{"id":"number","params":{}},"type":"vis_dimension"},"minFontSize":18,"orientation":"single","palette":{"name":"custom","params":{"colors":["#882E72","#B178A6","#D6C1DE","#1965B0","#5289C7","#7BAFDE","#4EB265","#90C987","#CAE0AB","#F7EE55","#F6C141","#F1932D","#E8601C","#DC050C"],"continuity":"above","gradient":false,"range":"percent","rangeMax":null,"rangeMin":0,"stops":[]},"type":"palette"},"scale":"linear","showLabel":true},"visType":"tagcloud"}}