Merge branch 'main' into discover-tabs-add-separators

Author: akowalska622

.buildkite/ftr_security_serverless_configs.yml

@@ -61,6 +61,7 @@ enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/unified_alerts/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -44,6 +44,7 @@ enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/unified_alerts/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/ess.config.ts

.buildkite/package-lock.json

@@ -12,7 +12,7 @@
     "adm-zip": "^0.5.16",
     "axios": "^1.8.3",
     "globby": "^11.1.0",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "minimatch": "^5.0.1",
     "minimist": "^1.2.8",
     "p-limit": "^3.1.0",

.buildkite/package.json

@@ -24,22 +24,28 @@ spec:
       repository: elastic/kibana
       branch_configuration: main 9.1 8.19
       default_branch: main
-      pipeline_file: '.buildkite/pipelines/fips.yml'
+      pipeline_file: .buildkite/pipelines/fips/fips_pipeline.sh
       provider_settings:
         trigger_mode: none
       schedules:
-        Daily build (main):
-          message: Daily build
+        '140-2 Daily build (main)':
+          message: 140-2 Daily build
           branch: main
           cronline: 0 5 * * * America/New_York
-        Daily build (9.1):
-          message: Daily build
+          env:
+            KBN_FIPS_VERSION: '140-2'
+        '140-2 Daily build (9.1)':
+          message: 140-2 Daily build
           branch: '9.1'
           cronline: 0 5 * * * America/New_York
-        Daily build (8.19):
-          message: Daily build
+          env:
+            KBN_FIPS_VERSION: '140-2'
+        '140-2 Daily build (8.19)':
+          message: 140-2 Daily build
           branch: '8.19'
           cronline: 0 5 * * * America/New_York
+          env:
+            KBN_FIPS_VERSION: '140-2'
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml

@@ -9,4 +9,4 @@
 
 export * from './client';
 export * from './types';
-export * from './emitPipeline';
+export * from './utils';

.buildkite/pipeline-utils/buildkite/index.ts

@@ -7,24 +7,14 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { useMemo } from 'react';
-import { filter, share, tap } from 'rxjs';
-import type { UnifiedHistogramInput$ } from '../../../types';
+import fs from 'fs';
 
-export const useFetch = ({
-  input$,
-  beforeFetch,
-}: {
-  input$: UnifiedHistogramInput$;
-  beforeFetch: () => void;
-}) => {
-  return useMemo(
-    () =>
-      input$.pipe(
-        filter((message) => message.type === 'fetch'),
-        tap(beforeFetch),
-        share()
-      ),
-    [beforeFetch, input$]
-  );
+export function emitPipeline(pipelineSteps: string[]) {
+  const pipelineStr = [...new Set(pipelineSteps)].join('\n');
+  console.log(pipelineStr);
+}
+
+export const getPipeline = (filename: string, removeSteps = true) => {
+  const str = fs.readFileSync(filename).toString();
+  return removeSteps ? str.replace(/^steps:/, '') : str;
 };

src/platform/packages/shared/kbn-unified-histogram/components/chart/hooks/use_fetch.ts renamed to .buildkite/pipeline-utils/buildkite/utils.ts

@@ -32,7 +32,7 @@ steps:
 
   - wait
 
-  - command: .buildkite/scripts/steps/checks/verify_fips_enabled.sh
+  - command: .buildkite/pipelines/fips/verify_fips_enabled.sh
     label: 'Verify FIPS Enabled'
     depends_on: build
     timeout_in_minutes: 10

.buildkite/pipelines/fips.yml

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+
+ts-node .buildkite/pipelines/fips/fips_pipeline.ts

.buildkite/pipelines/fips/fips_pipeline.sh

@@ -0,0 +1,23 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { emitPipeline, getPipeline } from '#pipeline-utils';
+
+(async () => {
+  const pipeline: string[] = [];
+
+  try {
+    pipeline.push(getPipeline('.buildkite/pipelines/fips.yml', false));
+
+    emitPipeline(pipeline);
+  } catch (ex) {
+    console.error('Error while generating the pipeline steps: ' + ex.message, ex);
+    process.exit(1);
+  }
+})();