Merge branch 'main' into seanstory/4333-fix-multiple-pipeline-flow

.buildkite/scripts/build_kibana.sh

@@ -30,6 +30,7 @@ if is_pr_with_label "ci:build-cloud-image"; then
   --docker-push \
   --skip-docker-ubi \
   --skip-docker-ubuntu \
+  --skip-docker-serverless \
   --skip-docker-contexts
   docker logout docker.elastic.co
 

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -26,17 +26,18 @@ node scripts/build \
   --docker-images \
   --docker-namespace="kibana-ci" \
   --docker-tag="git-$GIT_ABBREV_COMMIT" \
+  --skip-docker-ubuntu \
   --skip-docker-ubi \
   --skip-docker-cloud \
   --skip-docker-contexts
 
 echo "--- Tag images"
 docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-$BASE_VERSION-docker-image.tar.gz"
+docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
 docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
 
 docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
 docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
 
 echo "--- Push images"

.buildkite/scripts/steps/cloud/build_and_deploy.sh

@@ -42,6 +42,7 @@ else
     --docker-push \
     --skip-docker-ubi \
     --skip-docker-ubuntu \
+    --skip-docker-serverless \
     --skip-docker-contexts
 fi
 

.buildkite/scripts/steps/demo_env/kibana.sh

@@ -9,7 +9,7 @@ source "$(dirname "${0}")/config.sh"
 export KIBANA_IMAGE="gcr.io/elastic-kibana-184716/demo/kibana:$DEPLOYMENT_NAME-$(git rev-parse HEAD)"
 
 echo '--- Build Kibana'
-node scripts/build --debug --docker-images --example-plugins --skip-docker-ubi --skip-docker-cloud --skip-docker-contexts
+node scripts/build --debug --docker-images --example-plugins --skip-docker-ubi --skip-docker-cloud --skip-docker-serverless --skip-docker-contexts
 
 echo '--- Build Docker image with example plugins'
 cd target/example_plugins

.buildkite/scripts/steps/package_testing/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 
-node scripts/build --all-platforms --debug --skip-docker-cloud --skip-docker-ubi --skip-docker-contexts
+node scripts/build --all-platforms --debug --skip-docker-cloud --skip-docker-serverless --skip-docker-ubi --skip-docker-contexts
 
 DOCKER_FILE="kibana-$KIBANA_PKG_VERSION-SNAPSHOT-docker-image.tar.gz"
 

.github/CODEOWNERS

@@ -286,6 +286,9 @@ packages/core/usage-data/core-usage-data-base-server-internal @elastic/kibana-co
 packages/core/usage-data/core-usage-data-server @elastic/kibana-core
 packages/core/usage-data/core-usage-data-server-internal @elastic/kibana-core
 packages/core/usage-data/core-usage-data-server-mocks @elastic/kibana-core
+packages/core/user-settings/core-user-settings-server @elastic/platform-security
+packages/core/user-settings/core-user-settings-server-internal @elastic/platform-security
+packages/core/user-settings/core-user-settings-server-mocks @elastic/platform-security
 x-pack/plugins/cross_cluster_replication @elastic/platform-deployment-management
 packages/kbn-crypto @elastic/kibana-security
 packages/kbn-crypto-browser @elastic/kibana-core

package.json

@@ -331,6 +331,9 @@
     "@kbn/core-usage-data-base-server-internal": "link:packages/core/usage-data/core-usage-data-base-server-internal",
     "@kbn/core-usage-data-server": "link:packages/core/usage-data/core-usage-data-server",
     "@kbn/core-usage-data-server-internal": "link:packages/core/usage-data/core-usage-data-server-internal",
+    "@kbn/core-user-settings-server": "link:packages/core/user-settings/core-user-settings-server",
+    "@kbn/core-user-settings-server-internal": "link:packages/core/user-settings/core-user-settings-server-internal",
+    "@kbn/core-user-settings-server-mocks": "link:packages/core/user-settings/core-user-settings-server-mocks",
     "@kbn/cross-cluster-replication-plugin": "link:x-pack/plugins/cross_cluster_replication",
     "@kbn/crypto": "link:packages/kbn-crypto",
     "@kbn/crypto-browser": "link:packages/kbn-crypto-browser",

packages/core/lifecycle/core-lifecycle-server-internal/src/internal_core_setup.ts

@@ -25,6 +25,7 @@ import type { InternalStatusServiceSetup } from '@kbn/core-status-server-interna
 import type { InternalUiSettingsServiceSetup } from '@kbn/core-ui-settings-server-internal';
 import type { InternalCoreUsageDataSetup } from '@kbn/core-usage-data-base-server-internal';
 import type { InternalCustomBrandingSetup } from '@kbn/core-custom-branding-server-internal';
+import type { InternalUserSettingsServiceSetup } from '@kbn/core-user-settings-server-internal';
 
 /** @internal */
 export interface InternalCoreSetup {
@@ -47,4 +48,5 @@ export interface InternalCoreSetup {
   deprecations: InternalDeprecationsServiceSetup;
   coreUsageData: InternalCoreUsageDataSetup;
   customBranding: InternalCustomBrandingSetup;
+  userSettings: InternalUserSettingsServiceSetup;
 }

packages/core/lifecycle/core-lifecycle-server-internal/tsconfig.json

@@ -32,7 +32,8 @@
     "@kbn/core-usage-data-base-server-internal",
     "@kbn/core-usage-data-server",
     "@kbn/core-custom-branding-server-internal",
-    "@kbn/core-custom-branding-server"
+    "@kbn/core-custom-branding-server",
+    "@kbn/core-user-settings-server-internal"
   ],
   "exclude": [
     "target/**/*",

packages/core/lifecycle/core-lifecycle-server-mocks/src/core_setup.mock.ts

@@ -26,6 +26,7 @@ import { executionContextServiceMock } from '@kbn/core-execution-context-server-
 import { coreUsageDataServiceMock } from '@kbn/core-usage-data-server-mocks';
 import { customBrandingServiceMock } from '@kbn/core-custom-branding-server-mocks';
 import { createCoreStartMock } from './core_start.mock';
+import { userSettingsServiceMock } from '@kbn/core-user-settings-server-mocks';
 
 type CoreSetupMockType = MockedKeys<CoreSetup> & {
   elasticsearch: ReturnType<typeof elasticsearchServiceMock.createSetup>;
@@ -53,6 +54,7 @@ export function createCoreSetupMock({
     analytics: analyticsServiceMock.createAnalyticsServiceSetup(),
     capabilities: capabilitiesServiceMock.createSetupContract(),
     customBranding: customBrandingServiceMock.createSetupContract(),
+    userSettings: userSettingsServiceMock.createSetupContract(),
     docLinks: docLinksServiceMock.createSetupContract(),
     elasticsearch: elasticsearchServiceMock.createSetup(),
     http: httpMock,

packages/core/lifecycle/core-lifecycle-server-mocks/src/internal_core_setup.mock.ts

@@ -25,6 +25,7 @@ import { statusServiceMock } from '@kbn/core-status-server-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks';
 import { coreUsageDataServiceMock } from '@kbn/core-usage-data-server-mocks';
 import { customBrandingServiceMock } from '@kbn/core-custom-branding-server-mocks';
+import { userSettingsServiceMock } from '@kbn/core-user-settings-server-mocks';
 
 export function createInternalCoreSetupMock() {
   const setupDeps = {
@@ -47,6 +48,7 @@ export function createInternalCoreSetupMock() {
     executionContext: executionContextServiceMock.createInternalSetupContract(),
     coreUsageData: coreUsageDataServiceMock.createSetupContract(),
     customBranding: customBrandingServiceMock.createSetupContract(),
+    userSettings: userSettingsServiceMock.createSetupContract(),
   };
   return setupDeps;
 }

packages/core/lifecycle/core-lifecycle-server-mocks/tsconfig.json

@@ -34,6 +34,7 @@
     "@kbn/core-http-request-handler-context-server",
     "@kbn/core-logging-server-mocks",
     "@kbn/core-custom-branding-server-mocks",
+    "@kbn/core-user-settings-server-mocks",
   ],
   "exclude": [
     "target/**/*",

packages/core/lifecycle/core-lifecycle-server/src/core_setup.ts

@@ -23,6 +23,7 @@ import { StatusServiceSetup } from '@kbn/core-status-server';
 import { UiSettingsServiceSetup } from '@kbn/core-ui-settings-server';
 import { CoreUsageDataSetup } from '@kbn/core-usage-data-server';
 import { CustomBrandingSetup } from '@kbn/core-custom-branding-server';
+import { UserSettingsServiceSetup } from '@kbn/core-user-settings-server';
 import { CoreStart } from './core_start';
 
 /**
@@ -64,6 +65,8 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
   status: StatusServiceSetup;
   /** {@link UiSettingsServiceSetup} */
   uiSettings: UiSettingsServiceSetup;
+  /** {@link UserSettingsServiceSetup} */
+  userSettings: UserSettingsServiceSetup;
   /** {@link DeprecationsServiceSetup} */
   deprecations: DeprecationsServiceSetup;
   /** {@link StartServicesAccessor} */

packages/core/lifecycle/core-lifecycle-server/tsconfig.json

@@ -28,7 +28,8 @@
     "@kbn/core-status-server",
     "@kbn/core-ui-settings-server",
     "@kbn/core-usage-data-server",
-    "@kbn/core-custom-branding-server"
+    "@kbn/core-custom-branding-server",
+    "@kbn/core-user-settings-server"
   ],
   "exclude": [
     "target/**/*",

packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts

@@ -260,6 +260,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       register: deps.uiSettings.register,
       registerGlobal: deps.uiSettings.registerGlobal,
     },
+    userSettings: {
+      setUserProfileSettings: deps.userSettings.setUserProfileSettings,
+    },
     getStartServices: () => plugin.startDependencies,
     deprecations: deps.deprecations.getRegistry(plugin.name),
     coreUsageData: {

packages/core/rendering/core-rendering-server-internal/src/bootstrap/bootstrap_renderer.test.ts

@@ -19,6 +19,7 @@ import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
 import { httpServiceMock, httpServerMock } from '@kbn/core-http-server-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-server-mocks';
 import { bootstrapRendererFactory, BootstrapRenderer } from './bootstrap_renderer';
+import { userSettingsServiceMock } from '@kbn/core-user-settings-server-mocks';
 
 const createPackageInfo = (parts: Partial<PackageInfo> = {}): PackageInfo => ({
   branch: 'master',
@@ -41,12 +42,14 @@ describe('bootstrapRenderer', () => {
   let renderer: BootstrapRenderer;
   let uiPlugins: UiPlugins;
   let packageInfo: PackageInfo;
+  let userSettingsService: ReturnType<typeof userSettingsServiceMock.createSetupContract>;
 
   beforeEach(() => {
     auth = httpServiceMock.createAuth();
     uiSettingsClient = uiSettingsServiceMock.createClient();
     uiPlugins = createUiPlugins();
     packageInfo = createPackageInfo();
+    userSettingsService = userSettingsServiceMock.createSetupContract();
 
     getThemeTagMock.mockReturnValue('v8light');
     getPluginsBundlePathsMock.mockReturnValue(new Map());
@@ -88,7 +91,7 @@ describe('bootstrapRenderer', () => {
       expect(uiSettingsClient.get).toHaveBeenCalledWith('theme:darkMode');
     });
 
-    it('calls getThemeTag with the correct parameters', async () => {
+    it('calls getThemeTag with the values from the UiSettingsClient when the UserSettingsService is not provided', async () => {
       uiSettingsClient.get.mockResolvedValue(true);
 
       const request = httpServerMock.createKibanaRequest();
@@ -104,6 +107,58 @@ describe('bootstrapRenderer', () => {
         darkMode: true,
       });
     });
+
+    it('calls getThemeTag with values from the UserSettingsService when provided', async () => {
+      userSettingsService.getUserSettingDarkMode.mockReturnValueOnce(true);
+
+      renderer = bootstrapRendererFactory({
+        auth,
+        packageInfo,
+        uiPlugins,
+        serverBasePath: '/base-path',
+        userSettingsService,
+      });
+
+      uiSettingsClient.get.mockResolvedValue(false);
+      const request = httpServerMock.createKibanaRequest();
+
+      await renderer({
+        request,
+        uiSettingsClient,
+      });
+
+      expect(getThemeTagMock).toHaveBeenCalledTimes(1);
+      expect(getThemeTagMock).toHaveBeenCalledWith({
+        themeVersion: 'v8',
+        darkMode: true,
+      });
+    });
+
+    it('calls getThemeTag with values from the UiSettingsClient when values from UserSettingsService are `undefined`', async () => {
+      userSettingsService.getUserSettingDarkMode.mockReturnValueOnce(undefined);
+
+      renderer = bootstrapRendererFactory({
+        auth,
+        packageInfo,
+        uiPlugins,
+        serverBasePath: '/base-path',
+        userSettingsService,
+      });
+
+      uiSettingsClient.get.mockResolvedValue(false);
+      const request = httpServerMock.createKibanaRequest();
+
+      await renderer({
+        request,
+        uiSettingsClient,
+      });
+
+      expect(getThemeTagMock).toHaveBeenCalledTimes(1);
+      expect(getThemeTagMock).toHaveBeenCalledWith({
+        themeVersion: 'v8',
+        darkMode: false,
+      });
+    });
   });
 
   describe('when the auth status is `unknown`', () => {

packages/core/rendering/core-rendering-server-internal/src/bootstrap/bootstrap_renderer.ts

@@ -12,6 +12,7 @@ import { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 import type { KibanaRequest, HttpAuth } from '@kbn/core-http-server';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-server';
 import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
+import { InternalUserSettingsServiceSetup } from '@kbn/core-user-settings-server-internal';
 import { getPluginsBundlePaths } from './get_plugin_bundle_paths';
 import { getJsDependencyPaths } from './get_js_dependency_paths';
 import { getThemeTag } from './get_theme_tag';
@@ -25,6 +26,7 @@ interface FactoryOptions {
   packageInfo: PackageInfo;
   uiPlugins: UiPlugins;
   auth: HttpAuth;
+  userSettingsService?: InternalUserSettingsServiceSetup;
 }
 
 interface RenderedOptions {
@@ -43,6 +45,7 @@ export const bootstrapRendererFactory: BootstrapRendererFactory = ({
   serverBasePath,
   uiPlugins,
   auth,
+  userSettingsService,
 }) => {
   const isAuthenticated = (request: KibanaRequest) => {
     const { status: authStatus } = auth.get(request);
@@ -56,7 +59,16 @@ export const bootstrapRendererFactory: BootstrapRendererFactory = ({
 
     try {
       const authenticated = isAuthenticated(request);
-      darkMode = authenticated ? await uiSettingsClient.get('theme:darkMode') : false;
+
+      if (authenticated) {
+        const userSettingDarkMode = await userSettingsService?.getUserSettingDarkMode(request);
+
+        if (userSettingDarkMode) {
+          darkMode = userSettingDarkMode;
+        } else {
+          darkMode = await uiSettingsClient.get('theme:darkMode');
+        }
+      }
     } catch (e) {
       // just use the default values in case of connectivity issues with ES
     }