Merge branch 'master' into prevent-rerenders-observability-flyout

package.json

@@ -99,7 +99,7 @@
  "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
  "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.14",
  "@elastic/ems-client": "7.14.0",
- "@elastic/eui": "36.1.0",
+ "@elastic/eui": "37.1.1",
  "@elastic/filesaver": "1.1.2",
  "@elastic/good": "^9.0.1-kibana3",
  "@elastic/maki": "6.3.0",

packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts

@@ -13,9 +13,6 @@ import type { EsQueryConfig } from '@kbn/es-query';
  * registering a new instance of the rule data client
  * in a new plugin will require updating the below data structure
  * to include the index name where the alerts as data will be written to.
- *
- * This doesn't work in combination with the `xpack.ruleRegistry.index`
- * setting, with which the user can change the index prefix.
  */
 
 export const AlertConsumers = {
@@ -24,7 +21,7 @@ export const AlertConsumers = {
  INFRASTRUCTURE: 'infrastructure',
  OBSERVABILITY: 'observability',
  SIEM: 'siem',
- SYNTHETICS: 'synthetics',
+ UPTIME: 'uptime',
 } as const;
 export type AlertConsumers = typeof AlertConsumers[keyof typeof AlertConsumers];
 export type STATUS_VALUES = 'open' | 'acknowledged' | 'closed' | 'in-progress'; // TODO: remove 'in-progress' after migration to 'acknowledged'
@@ -35,7 +32,7 @@ export const mapConsumerToIndexName: Record<AlertConsumers, string | string[]> =
  infrastructure: '.alerts-observability.metrics',
  observability: '.alerts-observability',
  siem: ['.alerts-security.alerts', '.siem-signals'],
- synthetics: '.alerts-observability-synthetics',
+ uptime: '.alerts-observability.uptime',
 };
 export type ValidFeatureId = keyof typeof mapConsumerToIndexName;
 

src/core/public/i18n/i18n_eui_mapping.tsx

@@ -497,6 +497,16 @@ export const getEuiContextMapping = (): EuiTokensObject => {
  description: 'Descending size label',
  }
  ),
+ 'euiDatePopoverButton.invalidTitle': ({ title }: EuiValues) =>
+ i18n.translate('core.euiDatePopoverButton.invalidTitle', {
+ defaultMessage: 'Invalid date: {title}',
+ values: { title },
+ }),
+ 'euiDatePopoverButton.outdatedTitle': ({ title }: EuiValues) =>
+ i18n.translate('core.euiDatePopoverButton.outdatedTitle', {
+ defaultMessage: 'Update needed: {title}',
+ values: { title },
+ }),
  'euiFieldPassword.showPassword': i18n.translate('core.euiFieldPassword.showPassword', {
  defaultMessage:
  'Show password as plain text. Note: this will visually expose your password on the screen.',

src/core/server/environment/resolve_uuid.test.ts

@@ -227,15 +227,15 @@ describe('resolveInstanceUuid', () => {
  await expect(
  resolveInstanceUuid({ pathConfig, serverConfig, logger })
  ).rejects.toThrowErrorMatchingInlineSnapshot(
- `"Unable to read Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EACCES"`
+ `"Unable to read UUID file at data-folder/uuid. Ensure Kibana has sufficient permissions to read / write to this file.  Error was: EACCES"`
  );
  });
  it('throws an explicit error for file write errors', async () => {
  mockWriteFile(isDirectoryError);
  await expect(
  resolveInstanceUuid({ pathConfig, serverConfig, logger })
  ).rejects.toThrowErrorMatchingInlineSnapshot(
- `"Unable to write Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EISDIR"`
+ `"Unable to write to UUID file at data-folder/uuid. Ensure Kibana has sufficient permissions to read / write to this file.  Error was: EISDIR"`
  );
  });
  });

src/core/server/environment/resolve_uuid.ts

@@ -79,8 +79,8 @@ async function readUuidFromFile(filepath: string, logger: Logger): Promise<strin
  return undefined;
  }
  throw new Error(
- 'Unable to read Kibana UUID file, please check the uuid.server configuration ' +
- 'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+ `Unable to read UUID file at ${filepath}. ` +
+ 'Ensure Kibana has sufficient permissions to read / write to this file.  ' +
  `Error was: ${e.code}`
  );
  }
@@ -91,8 +91,8 @@ async function writeUuidToFile(filepath: string, uuidValue: string) {
  return await writeFile(filepath, uuidValue, { encoding: FILE_ENCODING });
  } catch (e) {
  throw new Error(
- 'Unable to write Kibana UUID file, please check the uuid.server configuration ' +
- 'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+ `Unable to write to UUID file at ${filepath}. ` +
+ 'Ensure Kibana has sufficient permissions to read / write to this file.  ' +
  `Error was: ${e.code}`
  );
  }

src/core/server/execution_context/execution_context_service.mock.ts

@@ -6,12 +6,18 @@
  * Side Public License, v 1.
  */
 
+import type { KibanaExecutionContext } from '../../types';
 import type {
  IExecutionContext,
  InternalExecutionContextSetup,
  ExecutionContextSetup,
 } from './execution_context_service';
 
+// attempted removal of any: unsuccessful! In theory, replaceable with <R>/R
+function withContextMock(context: KibanaExecutionContext | undefined, fn: () => any): any {
+ return fn();
+}
+
 const createExecutionContextMock = () => {
  const mock: jest.Mocked<IExecutionContext> = {
  set: jest.fn(),
@@ -21,6 +27,7 @@ const createExecutionContextMock = () => {
  getParentContextFrom: jest.fn(),
  getAsHeader: jest.fn(),
  };
+ mock.withContext.mockImplementation(withContextMock);
  return mock;
 };
 const createInternalSetupContractMock = () => {
@@ -32,6 +39,7 @@ const createSetupContractMock = () => {
  const mock: jest.Mocked<ExecutionContextSetup> = {
  withContext: jest.fn(),
  };
+ mock.withContext.mockImplementation(withContextMock);
  return mock;
 };
 

src/core/server/execution_context/execution_context_service.test.ts

@@ -346,7 +346,7 @@ describe('ExecutionContextService', () => {
  id: 'id-a',
  description: 'description-a',
  },
- (i) => i
+ () => null
  );
  expect(loggingSystemMock.collect(core.logger).debug).toMatchInlineSnapshot(`
  Array [
@@ -378,6 +378,26 @@ describe('ExecutionContextService', () => {
 
  expect(result).toBeUndefined();
  });
+ it('executes provided function when disabled', async () => {
+ const coreWithDisabledService = mockCoreContext.create();
+ coreWithDisabledService.configService.atPath.mockReturnValue(
+ new BehaviorSubject({ enabled: false })
+ );
+ const disabledService = new ExecutionContextService(coreWithDisabledService).setup();
+ const fn = jest.fn();
+
+ disabledService.withContext(
+ {
+ type: 'type-b',
+ name: 'name-b',
+ id: 'id-b',
+ description: 'description-b',
+ },
+ fn
+ );
+
+ expect(fn).toHaveBeenCalledTimes(1);
+ });
  });
 
  describe('getAsHeader', () => {
@@ -387,6 +407,21 @@ describe('ExecutionContextService', () => {
  expect(service.getAsHeader()).toBe('1234');
  });
 
+ it('falls back to "unknownId" if no id provided', async () => {
+ expect(service.getAsHeader()).toBe('unknownId');
+ });
+
+ it('falls back to "unknownId" and context if no id provided', async () => {
+ service.set({
+ type: 'type-a',
+ name: 'name-a',
+ id: 'id-a',
+ description: 'description-a',
+ });
+
+ expect(service.getAsHeader()).toBe('unknownId;kibana:type-a:name-a:id-a');
+ });
+
  it('returns request id and registered context', async () => {
  service.setRequestId('1234');
  service.set({

src/core/server/execution_context/execution_context_service.ts

@@ -34,7 +34,7 @@ export interface IExecutionContext {
  * https://nodejs.org/api/async_context.html#async_context_asynclocalstorage_enterwith_store
  */
  get(): IExecutionContextContainer | undefined;
- withContext<R>(context: KibanaExecutionContext | undefined, fn: (...args: any[]) => R): R;
+ withContext<R>(context: KibanaExecutionContext | undefined, fn: () => R): R;
  /**
  * returns serialized representation to send as a header
  **/
@@ -153,8 +153,11 @@ export class ExecutionContextService
 
  private getAsHeader(): string | undefined {
  if (!this.enabled) return;
- const stringifiedCtx = this.contextStore.getStore()?.toString();
- const requestId = this.requestIdStore.getStore()?.requestId;
- return stringifiedCtx ? `${requestId};kibana:${stringifiedCtx}` : requestId;
+ // requestId may not be present in the case of FakeRequest
+ const requestId = this.requestIdStore.getStore()?.requestId ?? 'unknownId';
+ const executionContext = this.contextStore.getStore()?.toString();
+ const executionContextStr = executionContext ? `;kibana:${executionContext}` : '';
+
+ return `${requestId}${executionContextStr}`;
  }
 }

src/dev/license_checker/config.ts

@@ -75,7 +75,7 @@ export const LICENSE_OVERRIDES = {
  '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
  'node-sql-parser@3.6.1': ['(GPL-2.0 OR MIT)'], // GPL-2.0* https://github.com/taozhi8833998/node-sql-parser
  '@elastic/ems-client@7.14.0': ['Elastic License 2.0'],
- '@elastic/eui@36.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
+ '@elastic/eui@37.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
 
  // TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released
  'xmldom@0.1.27': ['MIT'],

src/dev/typescript/projects.ts

@@ -40,6 +40,22 @@ export const PROJECTS = [
  createProject('x-pack/plugins/security_solution/cypress/tsconfig.json', {
  name: 'security_solution/cypress',
  }),
+ createProject(
+ 'x-pack/plugins/enterprise_search/public/applications/shared/cypress/tsconfig.json',
+ { name: 'enterprise_search/shared/cypress' }
+ ),
+ createProject(
+ 'x-pack/plugins/enterprise_search/public/applications/enterprise_search/cypress/tsconfig.json',
+ { name: 'enterprise_search/overview/cypress' }
+ ),
+ createProject(
+ 'x-pack/plugins/enterprise_search/public/applications/app_search/cypress/tsconfig.json',
+ { name: 'enterprise_search/app_search/cypress' }
+ ),
+ createProject(
+ 'x-pack/plugins/enterprise_search/public/applications/workplace_search/cypress/tsconfig.json',
+ { name: 'enterprise_search/workplace_search/cypress' }
+ ),
  createProject('x-pack/plugins/osquery/cypress/tsconfig.json', {
  name: 'osquery/cypress',
  }),