Skip to content

Commit f45d651

Browse files
alvarezmelissa87alvarezmelissa87
authored
Merge branch 'main' into preconfig-connector-updates
2 parents 0146ed4 + ed166b5 commit f45d651

5,411 files changed

Lines changed: 247478 additions & 64349 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_oblt_serverless_configs.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
disabled:
22
# Base config files, only necessary to inform config finding script
3-
- x-pack/solutions/observability/test/serverless/functional/test_suites/cypress/oblt_config.base.ts
43
- x-pack/platform/test/serverless/functional/config.oblt.base.ts
54
- x-pack/platform/test/serverless/functional/config.logs_essentials.base.ts
65

7-
# Cypress configs, for now these are still run manually
8-
- x-pack/solutions/observability/test/serverless/functional/test_suites/cypress/config_headless.ts
9-
- x-pack/solutions/observability/test/serverless/functional/test_suites/cypress/config_runner.ts
10-
116
# Observability AI Assistant local-only tests
127
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts
138

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ enabled:
336336
- x-pack/platform/test/security_functional/user_profiles.config.ts
337337
- x-pack/platform/test/security_functional/expired_session.config.ts
338338
- x-pack/solutions/security/test/session_view/basic/config.ts
339+
- x-pack/solutions/security/test/kubernetes_security/basic/config.ts
339340
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
340341
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
341342
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ enabled:
6161
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
6262
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
6363
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
64+
- 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
6465
- 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
6566
- 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
6667
- 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
@@ -110,13 +111,11 @@ enabled:
110111
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
111112
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts
112113
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/startup/trial_license_complete_tier/configs/serverless.config.ts
113-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
114114
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
115-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/ess.config.ts
115+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/trial_license_complete_tier/configs/serverless.config.ts
116+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/basic_license_essentials_tier/configs/serverless.config.ts
116117
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/serverless.config.ts
117-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
118118
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/serverless.config.ts
119-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/ess.config.ts
120119
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/serverless.config.ts
121120
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
122121
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
@@ -139,6 +138,7 @@ enabled:
139138
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
140139
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts
141140
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/serverless.config.ts
141+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.serverless.config.ts
142142
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/serverless.config.ts
143143
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/configs/serverless.config.ts
144144
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/policy_response/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ enabled:
4444
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
4545
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts
4646
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/ess.config.ts
47+
- 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
4748
- 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
4849
- 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
4950
- 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
@@ -94,6 +95,12 @@ enabled:
9495
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/ess.config.ts
9596
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/telemetry/configs/ess.config.ts
9697
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
98+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/ess.config.ts
99+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/trial_license_complete_tier/configs/ess.config.ts
100+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/privileges/basic_license_essentials_tier/configs/ess.config.ts
101+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/trial_license_complete_tier/configs/ess.config.ts
102+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/attack_discovery/schedules/basic_license_essentials_tier/configs/ess.config.ts
103+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai/conversations/trial_license_complete_tier/configs/ess.config.ts
97104
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
98105
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
99106
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
@@ -111,6 +118,7 @@ enabled:
111118
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
112119
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
113120
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
121+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.ess.config.ts
114122
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
115123
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/ess.config.ts
116124
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/package/trial_license_complete_tier/configs/ess.config.ts
@@ -122,6 +130,7 @@ enabled:
122130
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/trial_license_complete_tier/configs/ess.config.ts
123131
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/role_migrations/trial_license_complete_tier/configs/serverless.config.ts
124132
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/ess.config.ts
133+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/spaces/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.ess.config.ts
125134
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/configs/ess.config.ts
126135
- x-pack/solutions/security/test/security_solution_endpoint/configs/endpoint.config.ts
127136
- x-pack/solutions/security/test/security_solution_endpoint/configs/integrations.config.ts

‎.buildkite/package-lock.json‎

Lines changed: 14 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.buildkite/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"adm-zip": "^0.5.16",
1313
"axios": "^1.8.3",
1414
"globby": "^11.1.0",
15-
"js-yaml": "^4.1.0",
15+
"js-yaml": "^4.1.1",
1616
"minimatch": "^5.0.1",
1717
"minimist": "^1.2.8",
1818
"p-limit": "^3.1.0",

‎.buildkite/pipeline-resource-definitions/kibana-agent-builder-smoke-tests-daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
description: Runs the Agent Builder smoke tests daily
2020
spec:
2121
env:
22-
SLACK_NOTIFICATIONS_CHANNEL: '#agent-builder-eng'
22+
SLACK_NOTIFICATIONS_CHANNEL: '#agent-builder-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
2525
branch_configuration: main

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,28 @@ spec:
2424
repository: elastic/kibana
2525
branch_configuration: main 9.1 8.19
2626
default_branch: main
27-
pipeline_file: '.buildkite/pipelines/fips.yml'
27+
pipeline_file: .buildkite/pipelines/fips/fips_pipeline.sh
2828
provider_settings:
2929
trigger_mode: none
3030
schedules:
31-
Daily build (main):
32-
message: Daily build
31+
'140-2 Daily build (main)':
32+
message: 140-2 Daily build
3333
branch: main
3434
cronline: 0 5 * * * America/New_York
35-
Daily build (9.1):
36-
message: Daily build
35+
env:
36+
KBN_FIPS_VERSION: '140-2'
37+
'140-2 Daily build (9.1)':
38+
message: 140-2 Daily build
3739
branch: '9.1'
3840
cronline: 0 5 * * * America/New_York
39-
Daily build (8.19):
40-
message: Daily build
41+
env:
42+
KBN_FIPS_VERSION: '140-2'
43+
'140-2 Daily build (8.19)':
44+
message: 140-2 Daily build
4145
branch: '8.19'
4246
cronline: 0 5 * * * America/New_York
47+
env:
48+
KBN_FIPS_VERSION: '140-2'
4349
teams:
4450
kibana-operations:
4551
access_level: MANAGE_BUILD_AND_READ

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
export * from './client';
1111
export * from './types';
12-
export * from './emitPipeline';
12+
export * from './utils';

‎.buildkite/pipeline-utils/buildkite/utils.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
import fs from 'fs';
11+
12+
export function emitPipeline(pipelineSteps: string[]) {
13+
const pipelineStr = [...new Set(pipelineSteps)].join('\n');
14+
console.log(pipelineStr);
15+
}
16+
17+
export const getPipeline = (filename: string, removeSteps = true) => {
18+
const str = fs.readFileSync(filename).toString();
19+
return removeSteps ? str.replace(/^steps:/, '') : str;
20+
};

0 commit comments

Comments
 (0)