Merge branch 'de_on_week/esql-ai-assistant' of https://github.com/vit…

…aliidm/kibana into de_on_week/esql-ai-assistant
elastic · Jun 28, 2024 · 0472dac · 0472dac
2 parents be358cb + 338933c
commit 0472dac
Show file tree

Hide file tree

Showing 144 changed files with 3,022 additions and 590 deletions.
diff --git a/.buildkite/pipelines/artifacts.yml b/.buildkite/pipelines/artifacts.yml
@@ -92,7 +92,7 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: KIBANA_DOCKER_CONTEXT=chainguard .buildkite/scripts/steps/artifacts/docker_context.sh
+  - command: KIBANA_DOCKER_CONTEXT=wolfi .buildkite/scripts/steps/artifacts/docker_context.sh
     label: 'Docker Context Verification'
     agents:
       image: family/kibana-ubuntu-2004

diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
@@ -32,7 +32,7 @@ if is_pr_with_label "ci:build-cloud-image"; then
   --skip-docker-ubi \
   --skip-docker-fips \
   --skip-docker-ubuntu \
-  --skip-docker-chainguard \
+  --skip-docker-wolfi \
   --skip-docker-serverless \
   --skip-docker-contexts
 

diff --git a/...ite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh b/...ite/scripts/pipelines/security_solution_quality_gate/create_periodic_test_docker_image.sh
@@ -34,7 +34,7 @@ node scripts/build \
   --docker-namespace="kibana-ci" \
   --docker-tag="$KIBANA_IMAGE_TAG" \
   --skip-docker-ubuntu \
-  --skip-docker-chainguard \
+  --skip-docker-wolfi \
   --skip-docker-ubi \
   --skip-docker-cloud \
   --skip-docker-contexts \

diff --git a/.buildkite/scripts/steps/artifacts/docker_context.sh b/.buildkite/scripts/steps/artifacts/docker_context.sh
@@ -20,8 +20,8 @@ case $KIBANA_DOCKER_CONTEXT in
   default)
     DOCKER_CONTEXT_FILE="kibana-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
-  chainguard)
-    DOCKER_CONTEXT_FILE="kibana-chainguard-$FULL_VERSION-docker-build-context.tar.gz"
+  wolfi)
+    DOCKER_CONTEXT_FILE="kibana-wolfi-$FULL_VERSION-docker-build-context.tar.gz"
   ;;
   cloud)
     DOCKER_CONTEXT_FILE="kibana-cloud-$FULL_VERSION-docker-build-context.tar.gz"

diff --git a/.buildkite/scripts/steps/cloud/build_and_deploy.sh b/.buildkite/scripts/steps/cloud/build_and_deploy.sh
@@ -43,7 +43,7 @@ else
     --skip-docker-ubi \
     --skip-docker-fips \
     --skip-docker-ubuntu \
-    --skip-docker-chainguard \
+    --skip-docker-wolfi \
     --skip-docker-serverless \
     --skip-docker-contexts
 fi

diff --git a/.buildkite/scripts/steps/fips/build.sh b/.buildkite/scripts/steps/fips/build.sh
@@ -23,7 +23,7 @@ node scripts/build \
     --docker-push \
     --skip-docker-ubi \
     --skip-docker-ubuntu \
-    --skip-docker-chainguard \
+    --skip-docker-wolfi \
     --skip-docker-cloud \
     --skip-docker-serverless \
     --skip-docker-contexts

diff --git a/package.json b/package.json
@@ -1594,7 +1594,7 @@
     "buildkite-test-collector": "^1.7.0",
     "callsites": "^3.1.0",
     "chance": "1.0.18",
-    "chromedriver": "^126.0.2",
+    "chromedriver": "^126.0.3",
     "clean-webpack-plugin": "^3.0.0",
     "cli-progress": "^3.12.0",
     "cli-table3": "^0.6.1",
@@ -1717,7 +1717,7 @@
     "rxjs-marbles": "^7.0.1",
     "sass-embedded": "^1.77.5",
     "sass-loader": "^10.5.1",
-    "selenium-webdriver": "^4.21.0",
+    "selenium-webdriver": "^4.22.0",
     "sharp": "0.32.6",
     "simple-git": "^3.16.0",
     "sinon": "^7.4.2",

diff --git a/packages/kbn-alerts-as-data-utils/src/schemas/generated/observability_uptime_schema.ts b/packages/kbn-alerts-as-data-utils/src/schemas/generated/observability_uptime_schema.ts
@@ -74,7 +74,9 @@ const ObservabilityUptimeAlertOptional = rt.partial({
   'agent.name': schemaString,
   'anomaly.bucket_span.minutes': schemaString,
   'anomaly.start': schemaDate,
+  configId: schemaString,
   'error.message': schemaString,
+  'host.name': schemaString,
   'kibana.alert.context': schemaUnknown,
   'kibana.alert.evaluation.threshold': schemaStringOrNumber,
   'kibana.alert.evaluation.value': schemaStringOrNumber,
@@ -85,8 +87,11 @@ const ObservabilityUptimeAlertOptional = rt.partial({
       value: schemaStringArray,
     })
   ),
+  'location.id': schemaString,
+  'location.name': schemaString,
   'monitor.id': schemaString,
   'monitor.name': schemaString,
+  'monitor.tags': schemaStringArray,
   'monitor.type': schemaString,
   'observer.geo.name': schemaString,
   'tls.server.hash.sha256': schemaString,

diff --git a/packages/kbn-management/cards_navigation/src/consts.tsx b/packages/kbn-management/cards_navigation/src/consts.tsx
@@ -63,6 +63,13 @@ export const appDefinitions: Record<AppId, AppDefinition> = {
     }),
     icon: 'logstashQueue',
   },
+  [AppIds.DATA_QUALITY]: {
+    category: appCategories.DATA,
+    description: i18n.translate('management.landing.withCardNavigation.dataQualityDescription', {
+      defaultMessage: 'Find and manage quality issues in your log data.',
+    }),
+    icon: 'documents',
+  },
 
   [AppIds.RULES]: {
     category: appCategories.ALERTS,

diff --git a/packages/kbn-management/cards_navigation/src/types.ts b/packages/kbn-management/cards_navigation/src/types.ts
@@ -28,6 +28,7 @@ export enum AppIds {
   SERVERLESS_SETTINGS = 'settings',
   ROLES = 'roles',
   API_KEYS = 'api_keys',
+  DATA_QUALITY = 'data_quality',
 }
 
 // Create new type that is a union of all the appId values

diff --git a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@@ -115,7 +115,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-agent-policies": "90625b4a5ded9d4867358fcccc14a57c0454fcee",
         "ingest-download-sources": "279a68147e62e4d8858c09ad1cf03bd5551ce58d",
         "ingest-outputs": "daafff49255ab700e07491376fe89f04fc998b91",
-        "ingest-package-policies": "579cd432aa814145f59587354c0f55c71341e5dd",
+        "ingest-package-policies": "2c0f7c72d211bb7d3076ce2fc0bd368f9c16d274",
         "ingest_manager_settings": "91445219e7115ff0c45d1dabd5d614a80b421797",
         "inventory-view": "b8683c8e352a286b4aca1ab21003115a4800af83",
         "kql-telemetry": "93c1d16c1a0dfca9c8842062cf5ef8f62ae401ad",

diff --git a/src/dev/build/args.test.ts b/src/dev/build/args.test.ts
@@ -31,13 +31,13 @@ it('build default and oss dist for current platform, without packages, by defaul
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": false,
-        "createDockerChainguard": false,
         "createDockerCloud": false,
         "createDockerContexts": true,
         "createDockerFIPS": false,
         "createDockerServerless": false,
         "createDockerUBI": false,
         "createDockerUbuntu": false,
+        "createDockerWolfi": false,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
@@ -73,13 +73,13 @@ it('builds packages if --all-platforms is passed', () => {
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": true,
-        "createDockerChainguard": true,
         "createDockerCloud": true,
         "createDockerContexts": true,
         "createDockerFIPS": true,
         "createDockerServerless": true,
         "createDockerUBI": true,
         "createDockerUbuntu": true,
+        "createDockerWolfi": true,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
@@ -115,13 +115,13 @@ it('limits packages if --rpm passed with --all-platforms', () => {
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": false,
-        "createDockerChainguard": false,
         "createDockerCloud": false,
         "createDockerContexts": true,
         "createDockerFIPS": false,
         "createDockerServerless": false,
         "createDockerUBI": false,
         "createDockerUbuntu": false,
+        "createDockerWolfi": false,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
@@ -157,13 +157,13 @@ it('limits packages if --deb passed with --all-platforms', () => {
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": true,
-        "createDockerChainguard": false,
         "createDockerCloud": false,
         "createDockerContexts": true,
         "createDockerFIPS": false,
         "createDockerServerless": false,
         "createDockerUBI": false,
         "createDockerUbuntu": false,
+        "createDockerWolfi": false,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
@@ -200,13 +200,13 @@ it('limits packages if --docker passed with --all-platforms', () => {
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": false,
-        "createDockerChainguard": true,
         "createDockerCloud": true,
         "createDockerContexts": true,
         "createDockerFIPS": true,
         "createDockerServerless": true,
         "createDockerUBI": true,
         "createDockerUbuntu": true,
+        "createDockerWolfi": true,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
@@ -250,13 +250,13 @@ it('limits packages if --docker passed with --skip-docker-ubi and --all-platform
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": false,
-        "createDockerChainguard": true,
         "createDockerCloud": true,
         "createDockerContexts": true,
         "createDockerFIPS": true,
         "createDockerServerless": true,
         "createDockerUBI": false,
         "createDockerUbuntu": true,
+        "createDockerWolfi": true,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
@@ -293,13 +293,13 @@ it('limits packages if --all-platforms passed with --skip-docker-ubuntu', () =>
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": true,
-        "createDockerChainguard": true,
         "createDockerCloud": true,
         "createDockerContexts": true,
         "createDockerFIPS": true,
         "createDockerServerless": true,
         "createDockerUBI": true,
         "createDockerUbuntu": false,
+        "createDockerWolfi": true,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
@@ -336,13 +336,13 @@ it('limits packages if --all-platforms passed with --skip-docker-fips', () => {
         "createArchives": true,
         "createCdnAssets": true,
         "createDebPackage": true,
-        "createDockerChainguard": true,
         "createDockerCloud": true,
         "createDockerContexts": true,
         "createDockerFIPS": false,
         "createDockerServerless": true,
         "createDockerUBI": true,
         "createDockerUbuntu": true,
+        "createDockerWolfi": true,
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,

diff --git a/src/dev/build/args.ts b/src/dev/build/args.ts
@@ -31,7 +31,7 @@ export function readCliArgs(argv: string[]) {
       'skip-docker-contexts',
       'skip-docker-ubi',
       'skip-docker-ubuntu',
-      'skip-docker-chainguard',
+      'skip-docker-wolfi',
       'skip-docker-cloud',
       'skip-docker-serverless',
       'skip-docker-fips',
@@ -141,8 +141,7 @@ export function readCliArgs(argv: string[]) {
     createDebPackage: isOsPackageDesired('deb'),
     createDockerUbuntu:
       isOsPackageDesired('docker-images') && !Boolean(flags['skip-docker-ubuntu']),
-    createDockerChainguard:
-      isOsPackageDesired('docker-images') && !Boolean(flags['skip-docker-chainguard']),
+    createDockerWolfi: isOsPackageDesired('docker-images') && !Boolean(flags['skip-docker-wolfi']),
     createDockerCloud: isOsPackageDesired('docker-images') && !Boolean(flags['skip-docker-cloud']),
     createDockerServerless:
       (isOsPackageDesired('docker-images') && !Boolean(flags['skip-docker-serverless'])) ||

diff --git a/src/dev/build/build_distributables.ts b/src/dev/build/build_distributables.ts
@@ -31,7 +31,7 @@ export interface BuildOptions {
   createDebPackage: boolean;
   createDockerUBI: boolean;
   createDockerUbuntu: boolean;
-  createDockerChainguard: boolean;
+  createDockerWolfi: boolean;
   createDockerCloud: boolean;
   createDockerServerless: boolean;
   createDockerContexts: boolean;
@@ -151,9 +151,9 @@ export async function buildDistributables(log: ToolingLog, options: BuildOptions
     await run(Tasks.CreateDockerUbuntu);
   }
 
-  if (options.createDockerChainguard) {
-    // control w/ --docker-images or --skip-docker-chainguard or --skip-os-packages
-    await run(Tasks.CreateDockerChainguard);
+  if (options.createDockerWolfi) {
+    // control w/ --docker-images or --skip-docker-wolfi or --skip-os-packages
+    await run(Tasks.CreateDockerWolfi);
   }
   if (options.createDockerCloud) {
     // control w/ --docker-images and --skip-docker-cloud

diff --git a/src/dev/build/cli.ts b/src/dev/build/cli.ts
@@ -47,7 +47,7 @@ if (showHelp) {
         --skip-cdn-assets                    {dim Don't build CDN assets}
         --skip-docker-ubi                    {dim Don't build the docker ubi image}
         --skip-docker-ubuntu                 {dim Don't build the docker ubuntu image}
-        --skip-docker-chainguard             {dim Don't build the docker chainguard image}
+        --skip-docker-wolfi                  {dim Don't build the docker wolfi image}
         --skip-docker-fips                   {dim Don't build the docker fips image}
         --release                            {dim Produce a release-ready distributable}
         --version-qualifier                  {dim Suffix version with a qualifier}

diff --git a/src/dev/build/tasks/os_packages/create_os_package_tasks.ts b/src/dev/build/tasks/os_packages/create_os_package_tasks.ts
@@ -80,20 +80,20 @@ export const CreateDockerUbuntu: Task = {
   },
 };
 
-export const CreateDockerChainguard: Task = {
-  description: 'Creating Docker Chainguard image',
+export const CreateDockerWolfi: Task = {
+  description: 'Creating Docker Wolfi image',
 
   async run(config, log, build) {
     await runDockerGenerator(config, log, build, {
       architecture: 'x64',
-      baseImage: 'chainguard',
+      baseImage: 'wolfi',
       context: false,
       image: true,
       dockerBuildDate,
     });
     await runDockerGenerator(config, log, build, {
       architecture: 'aarch64',
-      baseImage: 'chainguard',
+      baseImage: 'wolfi',
       context: false,
       image: true,
       dockerBuildDate,
@@ -183,7 +183,7 @@ export const CreateDockerContexts: Task = {
       dockerBuildDate,
     });
     await runDockerGenerator(config, log, build, {
-      baseImage: 'chainguard',
+      baseImage: 'wolfi',
       context: true,
       image: false,
       dockerBuildDate,

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/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' | 'chainguard' | 'ubi' | 'ubuntu';
+    baseImage: 'none' | 'wolfi' | 'ubi' | 'ubuntu';
     context: boolean;
     image: boolean;
     ironbank?: boolean;
@@ -42,12 +42,12 @@ export async function runDockerGenerator(
   let baseImageName = '';
   if (flags.baseImage === 'ubuntu') baseImageName = 'ubuntu:20.04';
   if (flags.baseImage === 'ubi') baseImageName = 'docker.elastic.co/ubi9/ubi-minimal:latest';
-  if (flags.baseImage === 'chainguard')
+  if (flags.baseImage === 'wolfi')
     baseImageName = 'docker.elastic.co/wolfi/chainguard-base:20230214';
 
   let imageFlavor = '';
   if (flags.baseImage === 'ubi') imageFlavor += `-ubi`;
-  if (flags.baseImage === 'chainguard') imageFlavor += `-chainguard`;
+  if (flags.baseImage === 'wolfi') imageFlavor += `-wolfi`;
   if (flags.ironbank) imageFlavor += '-ironbank';
   if (flags.cloud) imageFlavor += '-cloud';
   if (flags.serverless) imageFlavor += '-serverless';

diff --git a/src/dev/build/tasks/os_packages/docker_generator/template_context.ts b/src/dev/build/tasks/os_packages/docker_generator/template_context.ts
@@ -24,7 +24,7 @@ export interface TemplateContext {
   dockerBuildDate: string;
   usePublicArtifact?: boolean;
   publicArtifactSubdomain: string;
-  baseImage: 'none' | 'ubi' | 'ubuntu' | 'chainguard';
+  baseImage: 'none' | 'ubi' | 'ubuntu' | 'wolfi';
   baseImageName: string;
   cloud?: boolean;
   serverless?: boolean;

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
@@ -17,9 +17,9 @@ RUN microdnf install -y findutils tar gzip
 {{#ubuntu}}
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
 {{/ubuntu}}
-{{#chainguard}}
+{{#wolfi}}
 RUN apk --no-cache add curl
-{{/chainguard}}
+{{/wolfi}}
 
 {{#usePublicArtifact}}
 RUN cd /tmp && \
@@ -109,9 +109,9 @@ RUN for iter in {1..10}; do \
     done; \
     (exit $exit_code)
 {{/ubuntu}}
-{{#chainguard}}
+{{#wolfi}}
 RUN apk --no-cache add bash curl fontconfig libstdc++ freetype nss findutils shadow
-{{/chainguard}}
+{{/wolfi}}
 
 # Bring in Kibana from the initial stage.
 COPY --from=builder --chown=1000:0 /usr/share/kibana /usr/share/kibana

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
@@ -16,7 +16,7 @@ function generator(options: TemplateContext) {
   const dir = options.ironbank ? 'ironbank' : 'base';
   const template = readFileSync(resolve(__dirname, dir, './Dockerfile'));
   return Mustache.render(template.toString(), {
-    chainguard: options.baseImage === 'chainguard',
+    wolfi: options.baseImage === 'wolfi',
     ubi: options.baseImage === 'ubi',
     ubuntu: options.baseImage === 'ubuntu',
     opensslLegacyProvider: !(options.cloud || options.serverless || options.fips),