Merge branch 'main' into task/olm-fix-spaces-test-to-skip-mki

.buildkite/scripts/copy_es_snapshot_cache.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# If cached snapshots are baked into the agent, copy them into our workspace first
+# We are doing this rather than simply changing the ES base path because many workers
+#   run with the workspace mounted in memory or on a local ssd
+cacheDir="$ES_CACHE_DIR/cache"
+if [[ -d "$cacheDir" ]]; then
+  mkdir -p .es/cache
+  echo "--- Copying ES snapshot cache"
+  echo "Copying cached snapshots from $cacheDir to .es/cache"
+  cp -R "$cacheDir"/* .es/cache/
+fi

.buildkite/scripts/steps/functional/common.sh

@@ -8,17 +8,7 @@ source .buildkite/scripts/common/util.sh
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
-
-# If cached snapshots are baked into the agent, copy them into our workspace first
-# We are doing this rather than simply changing the ES base path because many workers
-#   run with the workspace mounted in memory or on a local ssd
-cacheDir="$ES_CACHE_DIR/cache"
-if [[ -d "$cacheDir" ]]; then
-  mkdir -p .es/cache
-  echo "--- Copying ES snapshot cache"
-  echo "Copying cached snapshots from $cacheDir to .es/cache"
-  cp -R "$cacheDir"/* .es/cache/
-fi
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 is_test_execution_step
 

.buildkite/scripts/steps/test/jest_integration.sh

@@ -7,6 +7,7 @@ source .buildkite/scripts/common/util.sh
 is_test_execution_step
 
 .buildkite/scripts/bootstrap.sh
+.buildkite/scripts/copy_es_snapshot_cache.sh
 
 echo '--- Jest Integration Tests'
 .buildkite/scripts/steps/test/jest_parallel.sh jest.integration.config.js

test/functional/apps/discover/group3/_doc_viewer.ts

@@ -625,7 +625,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           );
           expect(role).to.be('dialog');
           expect(tabindex).to.be('0');
-          expect(await find.existsByCssSelector(`#${describedBy}`)).to.be(true);
+          expect(await find.existsByCssSelector(`[id="${describedBy}"]`)).to.be(true);
           expect(noFocusLock).to.be('true');
           // overlay flyout
           await reduceScreenWidth();
@@ -635,7 +635,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           noFocusLock = await testSubjects.getAttribute('docViewerFlyout', 'data-no-focus-lock');
           expect(role).to.be('dialog');
           expect(tabindex).to.be('0');
-          expect(await find.existsByCssSelector(`#${describedBy}`)).to.be(true);
+          expect(await find.existsByCssSelector(`[id="${describedBy}"]`)).to.be(true);
           expect(noFocusLock).to.be(null);
         });
       });

x-pack/plugins/alerting/common/routes/framework/apis/health/index.ts

@@ -0,0 +1,15 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { healthFrameworkResponseSchema } from './schemas/latest';
+export type { HealthFrameworkResponse } from './types/latest';
+
+export {
+  healthFrameworkResponseBodySchema as healthFrameworkResponseBodySchemaV1,
+  healthFrameworkResponseSchema as healthFrameworkResponseSchemaV1,
+} from './schemas/v1';
+export type { HealthFrameworkResponseBody as HealthFrameworkResponseBodyV1 } from './types/v1';

x-pack/plugins/alerting/common/routes/framework/apis/health/schemas/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './v1';

x-pack/plugins/alerting/common/routes/framework/apis/health/schemas/v1.ts

@@ -0,0 +1,49 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+const alertingFrameworkHealthSchemaObject = {
+  status: schema.oneOf([schema.literal('ok'), schema.literal('warn'), schema.literal('error')]),
+  timestamp: schema.string(),
+};
+
+export const healthFrameworkResponseBodySchema = schema.object({
+  is_sufficiently_secure: schema.boolean({
+    meta: {
+      description: 'If false, security is enabled but TLS is not.',
+    },
+  }),
+  has_permanent_encryption_key: schema.boolean({
+    meta: {
+      description: 'If false, the encryption key is not set',
+    },
+  }),
+  alerting_framework_health: schema.object(
+    {
+      decryption_health: schema.object(alertingFrameworkHealthSchemaObject, {
+        meta: { description: 'The timestamp and status of the alert decryption.' },
+      }),
+      execution_health: schema.object(alertingFrameworkHealthSchemaObject, {
+        meta: { description: 'The timestamp and status of the alert execution.' },
+      }),
+      read_health: schema.object(alertingFrameworkHealthSchemaObject, {
+        meta: { description: 'The timestamp and status of the alert reading events.' },
+      }),
+    },
+    {
+      meta: {
+        description:
+          'Three substates identify the health of the alerting framework: decryptionHealth, executionHealth, and readHealth.',
+      },
+    }
+  ),
+});
+
+export const healthFrameworkResponseSchema = schema.object({
+  body: healthFrameworkResponseBodySchema,
+});

x-pack/plugins/alerting/common/routes/framework/apis/health/types/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './v1';

x-pack/plugins/alerting/common/routes/framework/apis/health/types/v1.ts

@@ -0,0 +1,13 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { TypeOf } from '@kbn/config-schema';
+
+import { healthFrameworkResponseBodySchemaV1, healthFrameworkResponseSchemaV1 } from '..';
+
+export type HealthFrameworkResponseBody = TypeOf<typeof healthFrameworkResponseBodySchemaV1>;
+export type HealthFrameworkResponse = TypeOf<typeof healthFrameworkResponseSchemaV1>;

x-pack/plugins/alerting/server/routes/health.test.ts → x-pack/plugins/alerting/server/routes/framework/apis/health/health.test.ts

@@ -8,18 +8,18 @@
 import { healthRoute } from './health';
 import { httpServiceMock } from '@kbn/core/server/mocks';
 import { HealthStatus } from '@kbn/alerting-types';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { licenseStateMock } from '../lib/license_state.mock';
+import { mockHandlerArguments } from '../../../_mock_handler_arguments';
+import { verifyApiAccess } from '../../../../lib/license_api_access';
+import { licenseStateMock } from '../../../../lib/license_state.mock';
 import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
-import { rulesClientMock } from '../rules_client.mock';
-import { alertsMock } from '../mocks';
-import { RecoveredActionGroup } from '../../common';
-import { RegistryAlertTypeWithAuth } from '../authorization';
+import { rulesClientMock } from '../../../../rules_client.mock';
+import { alertsMock } from '../../../../mocks';
+import { RecoveredActionGroup } from '../../../../../common';
+import { RegistryAlertTypeWithAuth } from '../../../../authorization';
 
 const rulesClient = rulesClientMock.create();
 
-jest.mock('../lib/license_api_access', () => ({
+jest.mock('../../../../lib/license_api_access', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

x-pack/plugins/alerting/server/routes/health.ts → x-pack/plugins/alerting/server/routes/framework/apis/health/health.ts

@@ -7,30 +7,16 @@
 
 import { IRouter } from '@kbn/core/server';
 import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
-import { ILicenseState } from '../lib';
-import { RewriteResponseCase, verifyAccessAndContext } from './lib';
+import { healthFrameworkResponseSchemaV1 } from '../../../../../common/routes/framework/apis/health';
+import { ILicenseState } from '../../../../lib';
+import { verifyAccessAndContext } from '../../../lib';
 import {
   AlertingRequestHandlerContext,
   BASE_ALERTING_API_PATH,
   AlertingFrameworkHealth,
-} from '../types';
-import { getSecurityHealth } from '../lib/get_security_health';
-
-const rewriteBodyRes: RewriteResponseCase<AlertingFrameworkHealth> = ({
-  isSufficientlySecure,
-  hasPermanentEncryptionKey,
-  alertingFrameworkHealth,
-  ...rest
-}) => ({
-  ...rest,
-  is_sufficiently_secure: isSufficientlySecure,
-  has_permanent_encryption_key: hasPermanentEncryptionKey,
-  alerting_framework_health: {
-    decryption_health: alertingFrameworkHealth.decryptionHealth,
-    execution_health: alertingFrameworkHealth.executionHealth,
-    read_health: alertingFrameworkHealth.readHealth,
-  },
-});
+} from '../../../../types';
+import { getSecurityHealth } from '../../../../lib/get_security_health';
+import { transformHealthBodyResponse } from './transforms/transform_health_response/v1';
 
 export const healthRoute = (
   router: IRouter<AlertingRequestHandlerContext>,
@@ -45,7 +31,18 @@ export const healthRoute = (
         summary: `Get the alerting framework health`,
         tags: ['oas-tag:alerting'],
       },
-      validate: false,
+      validate: {
+        request: {},
+        response: {
+          200: {
+            body: () => healthFrameworkResponseSchemaV1,
+            description: 'Indicates a successful call.',
+          },
+          401: {
+            description: 'Authorization information is missing or invalid.',
+          },
+        },
+      },
     },
     router.handleLegacyErrors(
       verifyAccessAndContext(licenseState, async function (context, req, res) {
@@ -68,7 +65,7 @@ export const healthRoute = (
             };
 
             return res.ok({
-              body: rewriteBodyRes(frameworkHealth),
+              body: transformHealthBodyResponse(frameworkHealth),
             });
           } else {
             return res.forbidden({

x-pack/plugins/alerting/server/routes/framework/apis/health/index.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { healthRoute } from './health';

x-pack/plugins/alerting/server/routes/framework/apis/health/transforms/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { transformHealthBodyResponse } from './transform_health_response/latest';
+export { transformHealthBodyResponse as transformHealthBodyResponseV1 } from './transform_health_response/v1';

x-pack/plugins/alerting/server/routes/framework/apis/health/transforms/transform_health_response/latest.ts

@@ -0,0 +1,8 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './v1';

x-pack/plugins/alerting/server/routes/framework/apis/health/transforms/transform_health_response/v1.ts

@@ -0,0 +1,21 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AlertingFrameworkHealth } from '../../../../../../types';
+import type { HealthFrameworkResponseBodyV1 } from '../../../../../../../common/routes/framework/apis/health';
+
+export const transformHealthBodyResponse = (
+  frameworkHealth: AlertingFrameworkHealth
+): HealthFrameworkResponseBodyV1 => ({
+  is_sufficiently_secure: frameworkHealth.isSufficientlySecure,
+  has_permanent_encryption_key: frameworkHealth.hasPermanentEncryptionKey,
+  alerting_framework_health: {
+    decryption_health: frameworkHealth.alertingFrameworkHealth.decryptionHealth,
+    execution_health: frameworkHealth.alertingFrameworkHealth.executionHealth,
+    read_health: frameworkHealth.alertingFrameworkHealth.readHealth,
+  },
+});

x-pack/plugins/alerting/server/routes/index.ts

@@ -28,7 +28,7 @@ import { getGlobalExecutionKPIRoute } from './get_global_execution_kpi';
 import { getActionErrorLogRoute } from './get_action_error_log';
 import { getRuleExecutionKPIRoute } from './get_rule_execution_kpi';
 import { getRuleStateRoute } from './get_rule_state';
-import { healthRoute } from './health';
+import { healthRoute } from './framework/apis/health';
 import { resolveRuleRoute } from './rule/apis/resolve';
 import { ruleTypesRoute } from './rule/apis/list_types/rule_types';
 import { muteAllRuleRoute } from './rule/apis/mute_all/mute_all_rule';

x-pack/plugins/data_usage/public/app/components/chart_panel.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { useCallback, useMemo } from 'react';
-import numeral from '@elastic/numeral';
+
 import { EuiFlexItem, EuiPanel, EuiTitle, useEuiTheme } from '@elastic/eui';
 import {
   Chart,
@@ -20,6 +20,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { LegendAction } from './legend_action';
 import { MetricTypes, MetricSeries } from '../../../common/rest_types';
+import { formatBytes } from '../../utils/format_bytes';
 
 // TODO: Remove this when we have a title for each metric type
 type ChartKey = Extract<MetricTypes, 'ingest_rate' | 'storage_retained'>;
@@ -118,7 +119,3 @@ export const ChartPanel: React.FC<ChartPanelProps> = ({
     </EuiFlexItem>
   );
 };
-
-const formatBytes = (bytes: number) => {
-  return numeral(bytes).format('0.0 b');
-};