Merge branch 'main' into pit-indicator

docs/user/security/audit-logging.asciidoc

@@ -155,6 +155,15 @@ Refer to the corresponding {es} logs for potential write errors.
 | `unknown` | User is updating an alert.
 | `failure` | User is not authorized to update an alert.
 
+.2+| `rule_snooze`
+| `unknown` | User is snoozing a rule.
+| `failure` | User is not authorized to snooze a rule.
+
+.2+| `rule_unsnooze`
+| `unknown` | User is unsnoozing a rule.
+| `failure` | User is not authorized to unsnooze a rule.
+
+
 3+a|
 ====== Type: deletion
 

packages/kbn-shared-ux-components/src/redirect_app_links/index.ts

@@ -9,7 +9,6 @@
 
 import { RedirectAppLinks } from './redirect_app_links';
 export type { RedirectAppLinksProps } from './redirect_app_links';
-
 export { RedirectAppLinks } from './redirect_app_links';
 
 /**

src/core/server/saved_objects/migrations/integration_tests/type_registrations.test.ts

@@ -75,6 +75,7 @@ const previouslyRegisteredTypes = [
   'ml-telemetry',
   'monitoring-telemetry',
   'osquery-pack',
+  'osquery-pack-asset',
   'osquery-saved-query',
   'osquery-usage-metric',
   'osquery-manager-usage-metric',

src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.ts

@@ -182,12 +182,16 @@ export const gaugeFunction = (): GaugeExpressionFunctionDefinition => ({
     }
 
     if (handlers?.inspectorAdapters?.tables) {
-      const logTable = prepareLogTable(data, [
-        [metric ? [metric] : undefined, strings.getMetricHelp()],
-        [min ? [min] : undefined, strings.getMinHelp()],
-        [max ? [max] : undefined, strings.getMaxHelp()],
-        [goal ? [goal] : undefined, strings.getGoalHelp()],
-      ]);
+      const logTable = prepareLogTable(
+        data,
+        [
+          [metric ? [metric] : undefined, strings.getMetricHelp()],
+          [min ? [min] : undefined, strings.getMinHelp()],
+          [max ? [max] : undefined, strings.getMaxHelp()],
+          [goal ? [goal] : undefined, strings.getGoalHelp()],
+        ],
+        true
+      );
 
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }

src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.ts

@@ -28,7 +28,7 @@ const convertToVisDimension = (
   const column = columns.find((c) => c.id === accessor);
   if (!column) return;
   return {
-    accessor: Number(column.id),
+    accessor: column,
     format: {
       id: column.meta.params?.id,
       params: { ...column.meta.params?.params },
@@ -212,7 +212,7 @@ export const heatmapFunction = (): HeatmapExpressionFunctionDefinition => ({
           })
         );
       }
-      const logTable = prepareLogTable(data, argsTable);
+      const logTable = prepareLogTable(data, argsTable, true);
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
     return {

src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts

@@ -162,7 +162,7 @@ export const metricVisFunction = (): MetricVisExpressionFunctionDefinition => ({
           }),
         ]);
       }
-      const logTable = prepareLogTable(input, argsTable);
+      const logTable = prepareLogTable(input, argsTable, true);
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
 

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.ts

@@ -134,12 +134,16 @@ export const mosaicVisFunction = (): MosaicVisExpressionFunctionDefinition => ({
     };
 
     if (handlers?.inspectorAdapters?.tables) {
-      const logTable = prepareLogTable(context, [
-        [[args.metric], strings.getSliceSizeHelp()],
-        [args.buckets, strings.getSliceHelp()],
-        [args.splitColumn, strings.getColumnSplitHelp()],
-        [args.splitRow, strings.getRowSplitHelp()],
-      ]);
+      const logTable = prepareLogTable(
+        context,
+        [
+          [[args.metric], strings.getSliceSizeHelp()],
+          [args.buckets, strings.getSliceHelp()],
+          [args.splitColumn, strings.getColumnSplitHelp()],
+          [args.splitRow, strings.getRowSplitHelp()],
+        ],
+        true
+      );
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
 

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.ts

@@ -154,12 +154,16 @@ export const pieVisFunction = (): PieVisExpressionFunctionDefinition => ({
     };
 
     if (handlers?.inspectorAdapters?.tables) {
-      const logTable = prepareLogTable(context, [
-        [[args.metric], strings.getSliceSizeHelp()],
-        [args.buckets, strings.getSliceHelp()],
-        [args.splitColumn, strings.getColumnSplitHelp()],
-        [args.splitRow, strings.getRowSplitHelp()],
-      ]);
+      const logTable = prepareLogTable(
+        context,
+        [
+          [[args.metric], strings.getSliceSizeHelp()],
+          [args.buckets, strings.getSliceHelp()],
+          [args.splitColumn, strings.getColumnSplitHelp()],
+          [args.splitRow, strings.getRowSplitHelp()],
+        ],
+        true
+      );
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
 

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.ts

@@ -134,12 +134,16 @@ export const treemapVisFunction = (): TreemapVisExpressionFunctionDefinition =>
     };
 
     if (handlers?.inspectorAdapters?.tables) {
-      const logTable = prepareLogTable(context, [
-        [[args.metric], strings.getSliceSizeHelp()],
-        [args.buckets, strings.getSliceHelp()],
-        [args.splitColumn, strings.getColumnSplitHelp()],
-        [args.splitRow, strings.getRowSplitHelp()],
-      ]);
+      const logTable = prepareLogTable(
+        context,
+        [
+          [[args.metric], strings.getSliceSizeHelp()],
+          [args.buckets, strings.getSliceHelp()],
+          [args.splitColumn, strings.getColumnSplitHelp()],
+          [args.splitRow, strings.getRowSplitHelp()],
+        ],
+        true
+      );
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
 

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.ts

@@ -129,12 +129,16 @@ export const waffleVisFunction = (): WaffleVisExpressionFunctionDefinition => ({
     };
 
     if (handlers?.inspectorAdapters?.tables) {
-      const logTable = prepareLogTable(context, [
-        [[args.metric], strings.getSliceSizeHelp()],
-        [buckets, strings.getSliceHelp()],
-        [args.splitColumn, strings.getColumnSplitHelp()],
-        [args.splitRow, strings.getRowSplitHelp()],
-      ]);
+      const logTable = prepareLogTable(
+        context,
+        [
+          [[args.metric], strings.getSliceSizeHelp()],
+          [buckets, strings.getSliceHelp()],
+          [args.splitColumn, strings.getColumnSplitHelp()],
+          [args.splitRow, strings.getRowSplitHelp()],
+        ],
+        true
+      );
       handlers.inspectorAdapters.tables.logDatatable('default', logTable);
     }
 

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

@@ -164,7 +164,7 @@ export const tagcloudFunction: ExpressionTagcloudFunction = () => {
         if (args.bucket) {
           argsTable.push([[args.bucket], dimension.tags]);
         }
-        const logTable = prepareLogTable(input, argsTable);
+        const logTable = prepareLogTable(input, argsTable, true);
         handlers.inspectorAdapters.tables.logDatatable('default', logTable);
       }
       return {

src/plugins/kibana_react/public/app_links/index.ts

@@ -5,5 +5,5 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+/** @deprecated Use `RedirectAppLinks` from `@kbn/shared-ux-components */
 export { RedirectAppLinks } from './redirect_app_link';

src/plugins/kibana_react/public/app_links/redirect_app_link.test.tsx

@@ -9,6 +9,7 @@
 import React, { MouseEvent } from 'react';
 import { mount } from 'enzyme';
 import { applicationServiceMock } from '../../../../core/public/mocks';
+/** @deprecated Use `RedirectAppLinks` from `@kbn/shared-ux-components */
 import { RedirectAppLinks } from './redirect_app_link';
 import { BehaviorSubject } from 'rxjs';
 

src/plugins/kibana_react/public/app_links/redirect_app_link.tsx

@@ -34,7 +34,10 @@ interface RedirectCrossAppLinksProps extends React.HTMLAttributes<HTMLDivElement
  * It is recommended to use the component at the highest possible level of the component tree that would
  * require to handle the links. A good practice is to consider it as a context provider and to use it
  * at the root level of an application or of the page that require the feature.
+ *
+ * @deprecated use RedirectAppLinks from @kbn-shared-ux-components
  */
+
 export const RedirectAppLinks: FunctionComponent<RedirectCrossAppLinksProps> = ({
   application,
   children,

src/plugins/kibana_react/public/index.ts

@@ -80,6 +80,7 @@ export { reactToUiComponent, uiToReactComponent } from './adapters';
 export { toMountPoint, MountPointPortal } from './util';
 export type { ToMountPointOptions } from './util';
 
+/** @deprecated Use `RedirectAppLinks` from `@kbn/shared-ux-components */
 export { RedirectAppLinks } from './app_links';
 
 export { wrapWithTheme, KibanaThemeProvider } from './theme';

src/plugins/vis_types/timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.ts

@@ -57,7 +57,7 @@ export const dateHistogram: AnnotationsRequestProcessorsFunction = ({
       time_zone: timezone,
       extended_bounds: {
         min: from.valueOf(),
-        max: to.valueOf() - bucketSize * 1000,
+        max: to.valueOf(),
       },
       ...dateHistogramInterval(autoBucketSize < bucketSize ? autoIntervalString : intervalString),
     });

src/plugins/visualizations/common/utils/prepare_log_table.ts

@@ -57,17 +57,23 @@ const getDimensionName = (
   }
 };
 
-export const prepareLogTable = (datatable: Datatable, dimensions: Dimension[]) => {
+export const prepareLogTable = (
+  datatable: Datatable,
+  dimensions: Dimension[],
+  removeUnmappedColumns: boolean = false
+) => {
   return {
     ...datatable,
-    columns: datatable.columns.map((column, columnIndex) => {
-      return {
-        ...column,
-        meta: {
-          ...column.meta,
-          dimensionName: getDimensionName(column, columnIndex, dimensions),
-        },
-      };
-    }),
+    columns: datatable.columns
+      .map((column, columnIndex) => {
+        return {
+          ...column,
+          meta: {
+            ...column.meta,
+            dimensionName: getDimensionName(column, columnIndex, dimensions),
+          },
+        };
+      })
+      .filter((column) => !removeUnmappedColumns || column.meta.dimensionName),
   };
 };

x-pack/plugins/actions/kibana.json

@@ -9,6 +9,6 @@
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "actions"],
   "requiredPlugins": ["licensing", "taskManager", "encryptedSavedObjects", "eventLog", "features"],
-  "optionalPlugins": ["usageCollection", "spaces", "security"],
+  "optionalPlugins": ["usageCollection", "spaces", "security", "monitoringCollection"],
   "ui": false
 }

x-pack/plugins/actions/server/action_type_registry.test.ts

@@ -13,8 +13,10 @@ import { actionsConfigMock } from './actions_config.mock';
 import { licenseStateMock } from './lib/license_state.mock';
 import { ActionsConfigurationUtilities } from './actions_config';
 import { licensingMock } from '../../licensing/server/mocks';
+import { inMemoryMetricsMock } from './monitoring/in_memory_metrics.mock';
 
 const mockTaskManager = taskManagerMock.createSetup();
+const inMemoryMetrics = inMemoryMetricsMock.create();
 let mockedLicenseState: jest.Mocked<ILicenseState>;
 let mockedActionsConfig: jest.Mocked<ActionsConfigurationUtilities>;
 let actionTypeRegistryParams: ActionTypeRegistryOpts;
@@ -26,7 +28,10 @@ beforeEach(() => {
   actionTypeRegistryParams = {
     licensing: licensingMock.createSetup(),
     taskManager: mockTaskManager,
-    taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor({ isESOCanEncrypt: true })),
+    taskRunnerFactory: new TaskRunnerFactory(
+      new ActionExecutor({ isESOCanEncrypt: true }),
+      inMemoryMetrics
+    ),
     actionsConfigUtils: mockedActionsConfig,
     licenseState: mockedLicenseState,
     preconfiguredActions: [