Merge branch 'main' into slo-fix-back-button-overview-stats

Author: mgiota

.buildkite/scout_ci_config.yml

@@ -5,14 +5,15 @@ plugins:
     - console
     - discover_enhanced
     - index_management
+    - infra
     - maps
     - observability
     - observability_onboarding
     - painless_lab
     - profiling
     - security_solution
-    - streams_app
     - slo
+    - streams_app
     - workflows_extensions
   disabled:
 

fleet_packages.json

@@ -30,7 +30,7 @@
   },
   {
     "name": "elastic_agent",
-    "version": "2.6.8"
+    "version": "2.6.9"
   },
   {
     "name": "endpoint",

src/dev/build/build_distributables.ts

@@ -170,12 +170,12 @@ export async function buildDistributables(log: ToolingLog, options: BuildOptions
     artifactTasks.push(Tasks.CreateDockerServerless('x64', null));
     artifactTasks.push(Tasks.CreateDockerServerless('x64', 'workplaceai'));
     artifactTasks.push(Tasks.CreateDockerServerless('x64', 'observability'));
-    artifactTasks.push(Tasks.CreateDockerServerless('x64', 'search'));
+    artifactTasks.push(Tasks.CreateDockerServerless('x64', 'elasticsearch'));
     artifactTasks.push(Tasks.CreateDockerServerless('x64', 'security'));
     artifactTasks.push(Tasks.CreateDockerServerless('aarch64', null));
     artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'workplaceai'));
     artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'observability'));
-    artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'search'));
+    artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'elasticsearch'));
     artifactTasks.push(Tasks.CreateDockerServerless('aarch64', 'security'));
   }
 

src/dev/build/lib/config.ts

@@ -18,11 +18,9 @@ import {
   type PluginPackage,
   getPluginPackagesFilter,
 } from '@kbn/repo-packages';
-import { type ModuleGroup } from '@kbn/projects-solutions-groups';
-
 import type { VersionInfo } from './version_info';
 import { getVersionInfo } from './version_info';
-import type { PlatformName, PlatformArchitecture } from './platform';
+import type { PlatformName, PlatformArchitecture, Solution } from './platform';
 import { ALL_PLATFORMS, SERVERLESS_PLATFORMS } from './platform';
 import type { BuildOptions } from '../build_distributables';
 
@@ -277,7 +275,7 @@ export class Config {
     return getPackages(this.repoRoot).filter((p) => !p.isDevOnly() && this.pluginFilter(p));
   }
 
-  getPrivateSolutionPackagesFromRepo(project: ModuleGroup) {
+  getPrivateSolutionPackagesFromRepo(project: Solution) {
     return getPackages(this.repoRoot).filter(
       (p) => p.group === project && p.visibility === 'private'
     );

src/dev/build/lib/platform.ts

@@ -12,7 +12,10 @@ import type { KibanaSolution } from '@kbn/projects-solutions-groups';
 export type PlatformName = 'win32' | 'darwin' | 'linux';
 export type PlatformArchitecture = 'x64' | 'arm64';
 export type Variant = 'serverless' | null;
-export type Solution = KibanaSolution | null;
+
+// Upstream project type referenced as kibana-elasticsearch
+// See https://github.com/elastic/kibana/pull/244739 for context
+export type Solution = Exclude<KibanaSolution, 'search'> | 'elasticsearch' | null;
 
 export class Platform {
   constructor(
@@ -89,8 +92,8 @@ export const SERVERLESS_PLATFORMS = [
   new Platform('linux', 'x64', 'linux-x86_64', 'serverless', 'observability'),
   new Platform('linux', 'arm64', 'linux-aarch64', 'serverless', 'observability'),
 
-  new Platform('linux', 'x64', 'linux-x86_64', 'serverless', 'search'),
-  new Platform('linux', 'arm64', 'linux-aarch64', 'serverless', 'search'),
+  new Platform('linux', 'x64', 'linux-x86_64', 'serverless', 'elasticsearch'),
+  new Platform('linux', 'arm64', 'linux-aarch64', 'serverless', 'elasticsearch'),
 
   new Platform('linux', 'x64', 'linux-x86_64', 'serverless', 'security'),
   new Platform('linux', 'arm64', 'linux-aarch64', 'serverless', 'security'),

src/dev/build/tasks/create_archives_sources_task.ts

@@ -10,19 +10,19 @@
 import { REPO_ROOT } from '@kbn/repo-info';
 import { removePackagesFromPackageMap } from '@kbn/repo-packages';
 import { KIBANA_SOLUTIONS } from '@kbn/projects-solutions-groups';
-import type { KibanaSolution } from '@kbn/projects-solutions-groups';
 import { resolve, join } from 'path';
 import { scanCopy, deleteAll, copyAll } from '../lib';
-import type { Task, Platform } from '../lib';
+import type { Task, Platform, Solution } from '../lib';
 import { getNodeDownloadInfo } from './nodejs';
 
 export const CreateArchivesSources: Task = {
   description: 'Creating platform-specific archive source directories',
   async run(config, log, build) {
-    async function removeSolutions(solutionsToRemove: KibanaSolution[], platform: Platform) {
+    async function removeSolutions(solutionsToRemove: Solution[], platform: Platform) {
       const solutionPluginNames: string[] = [];
 
       for (const solution of solutionsToRemove) {
+        if (!solution) continue;
         const solutionPlugins = config.getPrivateSolutionPackagesFromRepo(solution);
         solutionPluginNames.push(...solutionPlugins.map((p) => p.name));
       }
@@ -81,7 +81,7 @@ export const CreateArchivesSources: Task = {
 
           // Copy solution config.yml
           const WORKPLACE_AI_CONFIGS = ['serverless.workplaceai.yml'];
-          const SEARCH_CONFIGS = ['serverless.es.yml'];
+          const ELASTICSEARCH_CONFIGS = ['serverless.es.yml'];
           const OBSERVABILITY_CONFIGS = [
             'serverless.oblt.yml',
             'serverless.oblt.{logs_essentials,complete}.yml',
@@ -95,8 +95,8 @@ export const CreateArchivesSources: Task = {
             case 'workplaceai':
               configFiles.push(...WORKPLACE_AI_CONFIGS);
               break;
-            case 'search':
-              configFiles.push(...SEARCH_CONFIGS);
+            case 'elasticsearch':
+              configFiles.push(...ELASTICSEARCH_CONFIGS);
               break;
             case 'observability':
               configFiles.push(...OBSERVABILITY_CONFIGS);
@@ -107,7 +107,7 @@ export const CreateArchivesSources: Task = {
             default:
               configFiles.push(
                 ...WORKPLACE_AI_CONFIGS,
-                ...SEARCH_CONFIGS,
+                ...ELASTICSEARCH_CONFIGS,
                 ...OBSERVABILITY_CONFIGS,
                 ...SECURITY_CONFIGS
               );
@@ -123,8 +123,11 @@ export const CreateArchivesSources: Task = {
 
           // Remove non-target solutions
           const targetSolution = platform.getSolution();
-          if (targetSolution && KIBANA_SOLUTIONS.includes(targetSolution)) {
-            const solutionsToRemove = KIBANA_SOLUTIONS.filter((s) => s !== targetSolution);
+          const ARTIFACT_SOLUTIONS = KIBANA_SOLUTIONS.map((s) =>
+            s === 'search' ? 'elasticsearch' : s
+          );
+          if (targetSolution && ARTIFACT_SOLUTIONS.includes(targetSolution)) {
+            const solutionsToRemove = ARTIFACT_SOLUTIONS.filter((s) => s !== targetSolution);
             await removeSolutions(solutionsToRemove, platform);
           }
         } else if (config.isRelease) {

src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts

@@ -530,7 +530,7 @@ it('checks shasums for each downloaded node build', async () => {
             "architecture": "x64",
             "buildName": "linux-x86_64",
             "name": "linux",
-            "solution": "search",
+            "solution": "elasticsearch",
             "variant": "serverless",
           },
         ],
@@ -540,7 +540,7 @@ it('checks shasums for each downloaded node build', async () => {
             "architecture": "arm64",
             "buildName": "linux-aarch64",
             "name": "linux",
-            "solution": "search",
+            "solution": "elasticsearch",
             "variant": "serverless",
           },
         ],

src/platform/packages/shared/kbn-scout/src/playwright/fixtures/scope/test/context/page_context.ts

@@ -19,15 +19,8 @@ import { coreWorkerFixtures } from '../../worker';
  * ensuring consistent browser state across all tests.
  */
 export const pageContextFixture = coreWorkerFixtures.extend<{ context: BrowserContext }>({
-  context: async ({ context, log }, use) => {
-    // Add init script to set localStorage flags before any page navigation
-    // This will be executed on every page load/reload
-    await context.addInitScript(() => {
-      // Force hide tour for the solution navigation
-      localStorage.setItem('solutionNavigationTour:completed', 'true');
-    });
-
-    log.debug('Page context initialized');
+  context: async ({ context }, use) => {
+    // set localStorage flags before any page navigation
     await use(context);
   },
 });

src/platform/packages/shared/kbn-scout/src/playwright/fixtures/scope/worker/core_fixtures.ts

@@ -89,6 +89,18 @@ export const coreWorkerFixtures = base.extend<{}, CoreWorkerFixtures>({
       const serversConfigDir = projectUse.serversConfigDir;
       const configInstance = createScoutConfig(serversConfigDir, projectUse.configName, log);
 
+      log.info(
+        `Running tests against ${
+          configInstance.isCloud
+            ? configInstance.serverless
+              ? `MKI ${configInstance.projectType} project`
+              : 'ECH deployment'
+            : `local ${
+                configInstance.serverless ? `serverless ${configInstance.projectType}` : 'stateful'
+              } cluster`
+        }`
+      );
+
       use(configInstance);
     },
     { scope: 'worker' },
@@ -179,6 +191,8 @@ export const coreWorkerFixtures = base.extend<{}, CoreWorkerFixtures>({
 
         customRoleHash = newRoleHash;
       };
+      // Hide the announcements (including the sidenav tour) in the default space
+      await kbnClient.uiSettings.update({ hideAnnouncements: true });
 
       await use({ session, customRoleName, setCustomRole });
 

src/platform/packages/shared/kbn-scout/src/playwright/fixtures/scope/worker/scout_space/parallel.ts

@@ -126,6 +126,14 @@ export const scoutSpaceParallelFixture = coreWorkerFixtures.extend<
         setDefaultTime,
       };
 
+      /**
+       * To hide the sidenav tour we need to enable 'hideAnnouncements' setting
+       * It should hide both space tour and sidenav tour.
+       * Currently it can be set only per space, so we set it right after new space is created.
+       * TODO: update if setting becomes global https://github.com/elastic/kibana/issues/234771
+       */
+      await kbnClient.uiSettings.update({ hideAnnouncements: true }, { space: spaceId });
+
       log.serviceMessage('scoutSpace', `New Kibana space '${spaceId}' created`);
       await use({ savedObjects, uiSettings, id: spaceId });