Skip to content

Commit bb2c822

Browse files
machadoummachadoum
authored
Merge branch '8.x' into backport/8.x/pr-199278
2 parents 7ea98a9 + 5504690 commit bb2c822

946 files changed

Lines changed: 27852 additions & 16836 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/pipelines/pull_request/security_solution/defend_workflows.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,3 @@ steps:
1818
automatic:
1919
- exit_status: '-1'
2020
limit: 1
21-
22-
- command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
23-
label: 'Defend Workflows Cypress Tests on Serverless'
24-
agents:
25-
enableNestedVirtualization: true
26-
localSsds: 1
27-
localSsdInterface: nvme
28-
machineType: n2-standard-4
29-
depends_on:
30-
- build
31-
- quick_checks
32-
timeout_in_minutes: 60
33-
parallelism: 14
34-
retry:
35-
automatic:
36-
- exit_status: '-1'
37-
limit: 1

‎.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ steps:
6161
- exit_status: '1'
6262
limit: 2
6363

64-
- label: Running exception_lists:common:lists:qa:serverless:release
65-
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:common:lists:qa:serverless:release
66-
key: exception_lists:common:lists:qa:serverless:release
64+
- label: Running exception_lists:auth:common:qa:serverless:release
65+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:common:qa:serverless:release
66+
key: exception_lists:auth:common:qa:serverless:release
6767
agents:
6868
image: family/kibana-ubuntu-2004
6969
imageProject: elastic-images-prod
@@ -75,9 +75,9 @@ steps:
7575
- exit_status: '1'
7676
limit: 2
7777

78-
- label: Running exception_lists:items:lists:qa:serverless:release
79-
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:items:lists:qa:serverless:release
80-
key: exception_lists:items:lists:qa:serverless:release
78+
- label: Running exception_lists:auth:items:qa:serverless
79+
command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:items:qa:serverless
80+
key: exception_lists:auth:items:qa:serverless
8181
agents:
8282
image: family/kibana-ubuntu-2004
8383
imageProject: elastic-images-prod

‎.eslintrc.js‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,9 @@ module.exports = {
10261026
*/
10271027
{
10281028
files: ['x-pack/plugins/fleet/**/*.{js,mjs,ts,tsx}'],
1029+
plugins: ['testing-library'],
10291030
rules: {
1031+
'testing-library/await-async-utils': 'error',
10301032
'@typescript-eslint/consistent-type-imports': 'error',
10311033
'import/order': [
10321034
'warn',
@@ -1954,6 +1956,16 @@ module.exports = {
19541956
},
19551957
},
19561958

1959+
/**
1960+
* Cloud Security Team overrides
1961+
*/
1962+
{
1963+
files: ['x-pack/plugins/cloud_security_posture/**/*.{js,mjs,ts,tsx}'],
1964+
plugins: ['testing-library'],
1965+
rules: {
1966+
'testing-library/await-async-utils': 'error',
1967+
},
1968+
},
19571969
/**
19581970
* Code inside .buildkite runs separately from everything else in CI, before bootstrap, with ts-node. It needs a few tweaks because of this.
19591971
*/
@@ -1978,6 +1990,34 @@ module.exports = {
19781990
'max-classes-per-file': 'off',
19791991
},
19801992
},
1993+
{
1994+
files: [
1995+
// logsShared depends on o11y/private plugins, but platform plugins depend on it
1996+
'x-pack/plugins/observability_solution/logs_shared/**',
1997+
1998+
// this plugin depends on visTypeTimeseries plugin (for TSVB viz) which is platform/private ATM
1999+
'x-pack/plugins/observability_solution/infra/**',
2000+
2001+
// TODO @kibana/operations
2002+
'scripts/create_observability_rules.js', // is importing "@kbn/observability-alerting-test-data" (observability/private)
2003+
'src/cli_setup/**', // is importing "@kbn/interactive-setup-plugin" (platform/private)
2004+
'src/dev/build/tasks/install_chromium.ts', // is importing "@kbn/screenshotting-plugin" (platform/private)
2005+
2006+
// @kbn/osquery-plugin could be categorised as Security, but @kbn/infra-plugin (observability) depends on it!
2007+
'x-pack/plugins/osquery/**',
2008+
2009+
// For now, we keep the exception to let tests depend on anythying.
2010+
// Ideally, we need to classify the solution specific ones to reduce CI times
2011+
'test/**',
2012+
'x-pack/test_serverless/**',
2013+
'x-pack/test/**',
2014+
'x-pack/test/plugin_functional/plugins/resolver_test/**',
2015+
],
2016+
rules: {
2017+
'@kbn/imports/no_group_crossing_manifests': 'warn',
2018+
'@kbn/imports/no_group_crossing_imports': 'warn',
2019+
},
2020+
},
19812021
],
19822022
};
19832023

‎docs/CHANGELOG.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Deprecated functionality does not have an immediate impact on your application,
9494
you make the necessary updates after you upgrade to 8.16.0.
9595

9696
[discrete]
97-
* The Logs Stream is now hidden by default in favor of the Logs Explorer app.
97+
.The Logs Stream is now hidden by default in favor of the Logs Explorer app.
9898
[%collapsible]
9999
====
100100
*Details* +
@@ -105,7 +105,7 @@ You can still show the Logs Stream app again by navigating to Stack Management >
105105
====
106106

107107
[discrete]
108-
* Deprecates the Observability AI Assistant specific advanced setting `observability:aiAssistantLogsIndexPattern`.
108+
.Deprecates the Observability AI Assistant specific advanced setting `observability:aiAssistantLogsIndexPattern`.
109109
[%collapsible]
110110
====
111111
*Details* +

0 commit comments

Comments
 (0)