Merge branch 'main' into eui/60.1.0

.buildkite/pipelines/artifacts.yml

@@ -51,7 +51,17 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
+  - command: KIBANA_DOCKER_CONTEXT=ubi8 .buildkite/scripts/steps/artifacts/docker_context.sh
+    label: 'Docker Context Verification'
+    agents:
+      queue: n2-2
+    timeout_in_minutes: 30
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: KIBANA_DOCKER_CONTEXT=ubi9 .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
       queue: n2-2

.buildkite/scripts/steps/artifacts/docker_context.sh

@@ -19,8 +19,10 @@ if [[ "$KIBANA_DOCKER_CONTEXT" == "default" ]]; then
   DOCKER_CONTEXT_FILE="kibana-$FULL_VERSION-docker-build-context.tar.gz"
 elif [[ "$KIBANA_DOCKER_CONTEXT" == "cloud" ]]; then
   DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"
-elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi" ]]; then
+elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi8" ]]; then
   DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
+elif [[ "$KIBANA_DOCKER_CONTEXT" == "ubi9" ]]; then
+  DOCKER_CONTEXT_FILE="kibana-ubi9-$FULL_VERSION-docker-build-context.tar.gz"
 fi
 
 tar -xf "target/$DOCKER_CONTEXT_FILE" -C "$DOCKER_BUILD_FOLDER"

.github/CODEOWNERS

@@ -57,6 +57,7 @@
 /examples/search_examples/ @elastic/kibana-app-services
 /packages/kbn-datemath/ @elastic/kibana-app-services
 /packages/kbn-interpreter/ @elastic/kibana-app-services
+/packages/kbn-monaco/ @elastic/kibana-app-services
 /packages/kbn-react-field/ @elastic/kibana-app-services
 /packages/kbn-es-query/ @elastic/kibana-app-services
 /packages/kbn-field-types/ @elastic/kibana-app-services
@@ -394,7 +395,6 @@
 /x-pack/plugins/watcher/  @elastic/platform-deployment-management
 /x-pack/plugins/ingest_pipelines/  @elastic/platform-deployment-management
 /packages/kbn-ace/ @elastic/platform-deployment-management
-/packages/kbn-monaco/ @elastic/platform-deployment-management
 #CC# /x-pack/plugins/cross_cluster_replication/ @elastic/platform-deployment-management
 
 # Security Solution

.i18nrc.json

@@ -29,6 +29,7 @@
     "expressionImage": "src/plugins/expression_image",
     "expressionMetric": "src/plugins/expression_metric",
     "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
+    "expressionLegacyMetricVis": "src/plugins/chart_expressions/expression_legacy_metric",
     "expressionPartitionVis": "src/plugins/chart_expressions/expression_partition_vis",
     "expressionXY": "src/plugins/chart_expressions/expression_xy",
     "expressionRepeatImage": "src/plugins/expression_repeat_image",
@@ -57,10 +58,7 @@
     "kibana-react": "src/plugins/kibana_react",
     "kibanaOverview": "src/plugins/kibana_overview",
     "lists": "packages/kbn-securitysolution-list-utils/src",
-    "management": [
-      "src/legacy/core_plugins/management",
-      "src/plugins/management"
-    ],
+    "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "monaco": "packages/kbn-monaco/src",
     "navigation": "src/plugins/navigation",
     "newsfeed": "src/plugins/newsfeed",
@@ -74,13 +72,8 @@
     "sharedUXPackages": "packages/shared-ux",
     "coloring": "packages/kbn-coloring/src",
     "statusPage": "src/legacy/core_plugins/status_page",
-    "telemetry": [
-      "src/plugins/telemetry",
-      "src/plugins/telemetry_management_section"
-    ],
-    "timelion": [
-      "src/plugins/vis_types/timelion"
-    ],
+    "telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
+    "timelion": ["src/plugins/vis_types/timelion"],
     "uiActions": "src/plugins/ui_actions",
     "uiActionsEnhanced": "src/plugins/ui_actions_enhanced",
     "uiActionsExamples": "examples/ui_action_examples",

docs/api/cases/cases-api-get-comments.asciidoc

@@ -47,12 +47,12 @@ default space is used.
 
 === {api-examples-title}
 
-Retrieves comment ID `71ec1870-725b-11ea-a0b2-c51ea50a58e2` from case ID
-`a18b38a0-71b0-11ea-a0b2-c51ea50a58e2`:
+Retrieves comment ID `8048b460-fe2b-11ec-b15d-779a7c8bbcc3` from case ID
+`ecbf8a20-fe2a-11ec-b15d-779a7c8bbcc3`:
 
 [source,sh]
 --------------------------------------------------
-GET api/cases/a18b38a0-71b0-11ea-a0b2-c51ea50a58e2/comments/71ec1870-725b-11ea-a0b2-c51ea50a58e2
+GET api/cases/ecbf8a20-fe2a-11ec-b15d-779a7c8bbcc3/comments/8048b460-fe2b-11ec-b15d-779a7c8bbcc3
 --------------------------------------------------
 // KIBANA
 
@@ -61,20 +61,20 @@ The API returns the requested comment JSON object. For example:
 [source,json]
 --------------------------------------------------
 {
-  "id":"8acb3a80-ab0a-11ec-985f-97e55adae8b9",
-  "version":"Wzc5NzYsM10=",
-  "comment":"Start operation bubblegum immediately! And chew fast!",
+  "id":"8048b460-fe2b-11ec-b15d-779a7c8bbcc3",
+  "version":"WzIzLDFd",
   "type":"user",
   "owner":"cases",
-  "created_at":"2022-03-24T00:37:10.832Z",
-  "created_by": {
-    "email": "classified@hms.oo.gov.uk",
-    "full_name": "Classified",
-    "username": "M"
-    },
-  "pushed_at": null,
-  "pushed_by": null,
-  "updated_at": null,
-  "updated_by": null
+  "comment":"A new comment",
+  "created_at":"2022-07-07T19:32:13.104Z",
+  "created_by":{
+    "email":null,
+    "full_name":null,
+    "username":"elastic"
+  },
+  "pushed_at":null,
+  "pushed_by":null,
+  "updated_at":null,
+  "updated_by":null
 }
 --------------------------------------------------

docs/developer/plugin-list.asciidoc

@@ -114,6 +114,10 @@ This API doesn't support angular, for registering angular dev tools, bootstrap a
 |Expression Image plugin adds an image renderer to the expression plugin. The renderer will display the given image.
 
 
+|{kib-repo}blob/{branch}/src/plugins/chart_expressions/expression_legacy_metric/README.md[expressionLegacyMetricVis]
+|Expression MetricVis plugin adds a metric renderer and function to the expression plugin. The renderer will display the metric chart.
+
+
 |{kib-repo}blob/{branch}/src/plugins/expression_metric/README.md[expressionMetric]
 |Expression Metric plugin adds a metric renderer and function to the expression plugin.
 

packages/kbn-ambient-ui-types/index.d.ts

@@ -24,6 +24,12 @@ declare module '*.svg' {
   export default content;
 }
 
+declare module '*.gif' {
+  const content: string;
+  // eslint-disable-next-line import/no-default-export
+  export default content;
+}
+
 declare module '*.mdx' {
   let MDXComponent: (props: any) => JSX.Element;
   // eslint-disable-next-line import/no-default-export

packages/kbn-optimizer/limits.yml

@@ -96,6 +96,7 @@ pageLoadAssetSize:
   securitySolution: 273763
   customIntegrations: 28810
   expressionMetricVis: 23121
+  expressionLegacyMetricVis: 23121
   expressionHeatmap: 27505
   visTypeMetric: 23332
   bfetch: 22837

src/dev/build/tasks/os_packages/create_os_package_tasks.ts

@@ -86,7 +86,13 @@ export const CreateDockerUBI: Task = {
   async run(config, log, build) {
     await runDockerGenerator(config, log, build, {
       architecture: 'x64',
-      baseImage: 'ubi',
+      baseImage: 'ubi8',
+      context: false,
+      image: true,
+    });
+    await runDockerGenerator(config, log, build, {
+      architecture: 'x64',
+      baseImage: 'ubi9',
       context: false,
       image: true,
     });
@@ -124,9 +130,13 @@ export const CreateDockerContexts: Task = {
       image: false,
       dockerBuildDate,
     });
-
     await runDockerGenerator(config, log, build, {
-      baseImage: 'ubi',
+      baseImage: 'ubi8',
+      context: true,
+      image: false,
+    });
+    await runDockerGenerator(config, log, build, {
+      baseImage: 'ubi9',
       context: true,
       image: false,
     });

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

@@ -29,7 +29,7 @@ export async function runDockerGenerator(
   build: Build,
   flags: {
     architecture?: string;
-    baseImage: 'none' | 'ubi' | 'ubuntu';
+    baseImage: 'none' | 'ubi9' | 'ubi8' | 'ubuntu';
     context: boolean;
     image: boolean;
     ironbank?: boolean;
@@ -39,11 +39,12 @@ export async function runDockerGenerator(
 ) {
   let baseImageName = '';
   if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:20.04';
-  if (flags.baseImage === 'ubi') baseImageName = 'docker.elastic.co/ubi8/ubi-minimal:latest';
-  const ubiVersionTag = 'ubi8';
+  if (flags.baseImage === 'ubi8') baseImageName = 'docker.elastic.co/ubi8/ubi-minimal:latest';
+  if (flags.baseImage === 'ubi9') baseImageName = 'docker.elastic.co/ubi9/ubi-minimal:latest';
 
   let imageFlavor = '';
-  if (flags.baseImage === 'ubi') imageFlavor += `-${ubiVersionTag}`;
+  if (flags.baseImage === 'ubi8') imageFlavor += `-ubi8`;
+  if (flags.baseImage === 'ubi9') imageFlavor += `-ubi9`;
   if (flags.ironbank) imageFlavor += '-ironbank';
   if (flags.cloud) imageFlavor += '-cloud';
 

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

@@ -23,7 +23,7 @@ export interface TemplateContext {
   dockerBuildDate: string;
   usePublicArtifact?: boolean;
   publicArtifactSubdomain: string;
-  baseImage: 'none' | 'ubi' | 'ubuntu';
+  baseImage: 'none' | 'ubi8' | 'ubi9' | 'ubuntu';
   baseImageName: string;
   cloud?: boolean;
   metricbeatTarball?: string;

src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts

@@ -16,8 +16,8 @@ function generator(options: TemplateContext) {
   const dir = options.ironbank ? 'ironbank' : 'base';
   const template = readFileSync(resolve(__dirname, dir, './Dockerfile'));
   return Mustache.render(template.toString(), {
-    packageManager: options.baseImage === 'ubi' ? 'microdnf' : 'apt-get',
-    ubi: options.baseImage === 'ubi',
+    packageManager: options.baseImage.includes('ubi') ? 'microdnf' : 'apt-get',
+    ubi: options.baseImage.includes('ubi'),
     ubuntu: options.baseImage === 'ubuntu',
     ...options,
   });

src/plugins/chart_expressions/expression_legacy_metric/.i18nrc.json

@@ -0,0 +1,6 @@
+{
+  "prefix": "expressionLegacyMetricVis",
+  "paths": {
+    "expressionLegacyMetricVis": "."
+  }
+}

src/plugins/chart_expressions/expression_legacy_metric/.storybook/main.js

@@ -0,0 +1,26 @@
+/*
+ * 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 { defaultConfig } from '@kbn/storybook';
+import webpackMerge from 'webpack-merge';
+import { resolve } from 'path';
+
+const mockConfig = {
+  resolve: {
+    alias: {
+      '../../../expression_legacy_metric/public/services': resolve(
+        __dirname,
+        '../public/__mocks__/services.ts'
+      ),
+    },
+  },
+};
+
+module.exports = {
+  ...defaultConfig,
+  webpackFinal: (config) => webpackMerge(config, mockConfig),
+};

src/plugins/chart_expressions/expression_legacy_metric/README.md

@@ -0,0 +1,9 @@
+# expressionLegacyMetricVis
+
+Expression MetricVis plugin adds a `metric` renderer and function to the expression plugin. The renderer will display the `metric` chart.
+
+---
+
+## Development
+
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.

src/plugins/chart_expressions/expression_legacy_metric/common/constants.ts

@@ -0,0 +1,14 @@
+/*
+ * 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.
+ */
+
+export const EXPRESSION_METRIC_NAME = 'legacyMetricVis';
+
+export const LabelPosition = {
+  BOTTOM: 'bottom',
+  TOP: 'top',
+} as const;

src/plugins/chart_expressions/expression_legacy_metric/common/expression_functions/index.ts

@@ -0,0 +1,9 @@
+/*
+ * 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.
+ */
+
+export { metricVisFunction } from './metric_vis_function';