Merge branch 'main' into spaces-ftr-skip-fips

elastic · Jan 30, 2025 · 8bb0a18 · 8bb0a18
2 parents c00bf22 + df4a6d7
commit 8bb0a18
Show file tree

Hide file tree

Showing 29 changed files with 3,557 additions and 103 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -4,6 +4,7 @@
   "targetBranchChoices": [
     "main",
     "8.x",
+    "8.18",
     "8.17",
     "8.16",
     "8.15",
@@ -56,7 +57,7 @@
   ],
   "branchLabelMapping": {
     "^v9.0.0$": "main",
-    "^v8.18.0$": "8.x",
+    "^v8.19.0$": "8.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.x 8.17 8.16 7.17
+      branch_configuration: main 8.x 8.18 8.17 8.16 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -52,6 +52,10 @@ spec:
           cronline: 0 22 * * * America/New_York
           message: Daily build
           branch: '8.x'
+        Daily build (8.18):
+          cronline: 0 22 * * * America/New_York
+          message: Daily build
+          branch: '8.18'
         Daily build (8.17):
           cronline: 0 22 * * * America/New_York
           message: Daily build
@@ -95,7 +99,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.x 8.17 8.16 7.17
+      branch_configuration: main 8.x 8.18 8.17 8.16 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -144,7 +148,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.x 8.17 8.16 7.17
+      branch_configuration: main 8.x 8.18 8.17 8.16 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.x 8.17 8.16 7.17
+      branch_configuration: main 8.x 8.18 8.17 8.16 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
@@ -26,7 +26,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SCOUT_REPORTER_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.x 8.17 8.16 7.17
+      branch_configuration: main 8.x 8.18 8.17 8.16 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge.yml

diff --git a/...ion_tests/saved_objects/migrations/group3/incompatible_cluster_routing_allocation.test.ts b/...ion_tests/saved_objects/migrations/group3/incompatible_cluster_routing_allocation.test.ts
@@ -92,7 +92,8 @@ async function updateRoutingAllocations(
   });
 }
 
-describe('incompatible_cluster_routing_allocation', () => {
+// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/158318
+describe.skip('incompatible_cluster_routing_allocation', () => {
   let client: ElasticsearchClient;
   let root: Root;
 

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
@@ -96,7 +96,8 @@ function createRoot({ logFileName, hosts }: RootConfig) {
   });
 }
 
-describe('migration v2', () => {
+// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/167676
+describe.skip('migration v2', () => {
   let esServer: TestElasticsearchUtils;
   let root: Root;
   const migratedIndexAlias = `.kibana_${pkg.version}`;

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
@@ -19,7 +19,9 @@ import { getFips } from 'crypto';
 
 const logFilePath = join(__dirname, 'read_batch_size.log');
 
-describe('migration v2 - read batch size', () => {
+// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/163254
+// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/163255
+describe.skip('migration v2 - read batch size', () => {
   let esServer: TestElasticsearchUtils;
   let root: Root;
   let logs: string;

diff --git a/src/platform/packages/shared/kbn-doc-links/src/get_doc_meta.test.ts b/src/platform/packages/shared/kbn-doc-links/src/get_doc_meta.test.ts
@@ -12,7 +12,7 @@ import { getDocLinksMeta } from './get_doc_meta';
 describe('getDocLinksMeta', () => {
   it('returns the correct version for the `main` branch', () => {
     expect(getDocLinksMeta({ kibanaBranch: 'main', buildFlavor: 'traditional' }).version).toEqual(
-      'master'
+      'current'
     );
   });
 

diff --git a/src/platform/packages/shared/kbn-doc-links/src/get_doc_meta.ts b/src/platform/packages/shared/kbn-doc-links/src/get_doc_meta.ts
@@ -19,7 +19,7 @@ export const getDocLinksMeta = ({
   buildFlavor,
 }: GetDocLinksMetaOptions): DocLinksMeta => {
   return {
-    version: kibanaBranch === 'main' ? 'master' : kibanaBranch,
+    version: kibanaBranch === 'main' ? 'current' : kibanaBranch,
     ecs_version: 'current',
     elasticWebsiteUrl: 'https://www.elastic.co/',
     elasticGithubUrl: 'https://github.com/elastic/',

diff --git a/...istant_management/selection/public/routes/components/ai_assistant_selection_page.test.tsx b/...istant_management/selection/public/routes/components/ai_assistant_selection_page.test.tsx
@@ -98,7 +98,7 @@ describe('AiAssistantSelectionPage', () => {
           screen.getByTestId('pluginsAiAssistantSelectionPageDocumentationLink')
         ).toHaveAttribute(
           'href',
-          'https://www.elastic.co/guide/en/observability/master/obs-ai-assistant.html'
+          'https://www.elastic.co/guide/en/observability/current/obs-ai-assistant.html'
         );
       });
     });
@@ -144,7 +144,7 @@ describe('AiAssistantSelectionPage', () => {
           screen.getByTestId('securityAiAssistantSelectionPageDocumentationLink')
         ).toHaveAttribute(
           'href',
-          'https://www.elastic.co/guide/en/security/master/security-assistant.html'
+          'https://www.elastic.co/guide/en/security/current/security-assistant.html'
         );
       });
     });

diff --git a/versions.json b/versions.json
@@ -8,11 +8,16 @@
       "currentMinor": true
     },
     {
-      "version": "8.18.0",
+      "version": "8.19.0",
       "branch": "8.x",
       "previousMajor": true,
       "previousMinor": true
     },
+    {
+      "version": "8.18.0",
+      "branch": "8.18",
+      "previousMajor": true
+    },
     {
       "version": "8.17.2",
       "branch": "8.17",

diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/layer_settings.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/layer_settings.tsx
@@ -79,7 +79,7 @@ export function LayerSettingsPanel({
                 values={{
                   link: (
                     <EuiLink
-                      href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-aggregations-random-sampler-aggregation.html"
+                      href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-random-sampler-aggregation.html"
                       target="_blank"
                       external
                     >

diff --git a/.../jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx b/.../jobs_awaiting_node_warning/new_job_awaiting_node_shared/new_job_awaiting_node_shared.tsx
@@ -151,7 +151,7 @@ const MLJobsAwaitingNodeWarning: FC<Props> = ({ jobIds }) => {
                   link: (
                     <EuiLink
                       href={
-                        'https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-node.html#ml-node'
+                        'https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html#ml-node'
                       }
                     >
                       <FormattedMessage

diff --git a/...nts/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx b/...nts/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx
@@ -7,7 +7,7 @@
 import { getTailSamplingSettings, isTailBasedSamplingValid } from './tail_sampling_settings';
 
 const DOCS_LINK =
-  'https://www.elastic.co/guide/en/apm/guide/master/configure-tail-based-sampling.html';
+  'https://www.elastic.co/guide/en/apm/guide/current/configure-tail-based-sampling.html';
 
 describe('tail_sampling_settings - isTailBasedSamplingFormValid', () => {
   it('return true when tail_sampling_interval is greater than 1s', () => {

diff --git a/x-pack/solutions/observability/plugins/profiling/public/views/add_data_view/index.tsx b/x-pack/solutions/observability/plugins/profiling/public/views/add_data_view/index.tsx
@@ -410,7 +410,7 @@ EOF`}
                     <EuiLink
                       data-test-subj="profilingAddDataViewInstructionsHereLink"
                       target="_blank"
-                      href={`https://www.elastic.co/guide/en/kibana/master/api-keys.html`}
+                      href={`https://www.elastic.co/guide/en/kibana/current/api-keys.html`}
                     >
                       {i18n.translate('xpack.profiling.tabs.symbols.step2.instructions', {
                         defaultMessage: 'Instructions here',

diff --git a/...ugins/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx b/...ugins/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx
@@ -232,7 +232,7 @@ export const ParamsList = () => {
             learnMore: (
               <EuiLink
                 data-test-subj="syntheticsParamsListLink"
-                href="https://www.elastic.co/guide/en/observability/master/synthetics-params-secrets.html"
+                href="https://www.elastic.co/guide/en/observability/current/synthetics-params-secrets.html"
                 target="_blank"
               >
                 {LEARN_MORE}