Skip to content

Commit 8d15b1d

Browse files
authored
Merge branch 'main' into renovate/main-oas
2 parents 712dc26 + 9ff1224 commit 8d15b1d

Some content is hidden

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

43 files changed

+2243
-209
lines changed

.buildkite/scripts/pipelines/pull_request/pipeline.ts

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
] */
1717

1818
import fs from 'fs';
19-
import yaml from 'js-yaml';
2019
import prConfigs from '../../../pull_requests.json';
2120
import {
2221
areChangesSkippable,
23-
doAllChangesMatch,
2422
doAnyChangesMatch,
2523
getAgentImageConfig,
2624
emitPipeline,
@@ -65,35 +63,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
6563
}
6664

6765
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/base.yml', false));
68-
69-
const solutions = ['chat', 'observability', 'search', 'security'];
70-
let limitSolutions: string | undefined;
71-
for (const solution of solutions) {
72-
if (await doAllChangesMatch(new RegExp(`^x-pack/solutions/${solution}`))) {
73-
limitSolutions = solution;
74-
break;
75-
}
76-
}
77-
78-
const pickTestGroups = yaml.load(
79-
getPipeline('.buildkite/pipelines/pull_request/pick_test_groups.yml')
80-
) as Array<{ env?: Record<string, string> }>;
81-
if (limitSolutions) {
82-
pickTestGroups.forEach((step) => {
83-
step.env = {
84-
...step.env,
85-
LIMIT_SOLUTIONS: limitSolutions,
86-
};
87-
});
88-
}
89-
pipeline.push(
90-
yaml
91-
.dump(pickTestGroups)
92-
.split('\n')
93-
.map((line) => (line ? ` ${line}` : line))
94-
.join('\n')
95-
);
96-
66+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/pick_test_groups.yml'));
9767
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/scout_tests.yml'));
9868

9969
if (await doAnyChangesMatch([/^src\/platform\/packages\/private\/kbn-handlebars/])) {

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,7 @@ module.exports = {
11371137
'x-pack/solutions/observability/plugins/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
11381138
'x-pack/solutions/observability/packages/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
11391139
'src/platform/plugins/shared/ai_assistant_management/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
1140+
'x-pack/platform/plugins/shared/streams_app/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
11401141
'src/platform/packages/shared/kbn-unified-metrics-grid/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
11411142
],
11421143
rules: {

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ x-pack/platform/plugins/shared/ai_infra/product_doc_base @elastic/appex-ai-infra
984984
x-pack/platform/plugins/shared/aiops @elastic/ml-ui
985985
x-pack/platform/plugins/shared/alerting @elastic/response-ops
986986
x-pack/platform/plugins/shared/apm_sources_access @elastic/obs-ux-infra_services-team
987-
x-pack/platform/plugins/shared/automatic_import @elastic/security-scalability
987+
x-pack/platform/plugins/shared/automatic_import @elastic/integration-experience
988988
x-pack/platform/plugins/shared/cases @elastic/kibana-cases
989989
x-pack/platform/plugins/shared/cloud @elastic/kibana-core
990990
x-pack/platform/plugins/shared/content_connectors @elastic/search-kibana
@@ -2394,7 +2394,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
23942394
/x-pack/solutions/security/plugins/security_solution/public/attack_discovery @elastic/security-generative-ai
23952395
/x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/ai_assistant @elastic/security-generative-ai
23962396
/x-pack/solutions/security/plugins/security_solution_ess/public/upselling/pages/attack_discovery @elastic/security-generative-ai
2397-
/x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/automatic_import @elastic/security-scalability
2397+
/x-pack/solutions/security/test/security_solution_cypress/cypress/e2e/automatic_import @elastic/integration-experience
23982398
/x-pack/solutions/security/plugins/security_solution/public/configurations @elastic/security-generative-ai
23992399
/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/ai_soc @elastic/security-solution @elastic/security-threat-hunting-investigations
24002400

@@ -2804,7 +2804,7 @@ x-pack/solutions/security/test/security_solution_api_integration/test_suites/exp
28042804
x-pack/solutions/security/test/security_solution_api_integration/test_suites/genai @elastic/security-generative-ai
28052805

28062806
## Security Solution sub teams - Automatic Import
2807-
x-pack/platform/test/automatic_import_api_integration @elastic/security-scalability
2807+
x-pack/platform/test/automatic_import_api_integration @elastic/integration-experience
28082808

28092809
# Security Defend Workflows - OSQuery Ownership
28102810
/x-pack/solutions/security/test/osquery_cypress @elastic/security-defend-workflows

api_docs/automatic_import.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import automaticImportObj from './automatic_import.devdocs.json';
1515

1616
Plugin implementing the Automatic Import API and UI
1717

18-
Contact [@elastic/security-scalability](https://github.com/orgs/elastic/teams/security-scalability) for questions regarding this plugin.
18+
Contact [@elastic/integration-experience](https://github.com/orgs/elastic/teams/integration-experience) for questions regarding this plugin.
1919

2020
**Code health stats**
2121

api_docs/plugin_directory.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
3535
| <DocLink id="kibApmPluginApi" text="apm"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | The user interface for Elastic APM | 26 | 0 | 26 | 118 |
3636
| <DocLink id="kibApmDataAccessPluginApi" text="apmDataAccess"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 92 | 0 | 92 | 3 |
3737
| <DocLink id="kibApmSourcesAccessPluginApi" text="apmSourcesAccess"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 22 | 0 | 14 | 2 |
38-
| <DocLink id="kibAutomaticImportPluginApi" text="automaticImport"/> | [@elastic/security-scalability](https://github.com/orgs/elastic/teams/security-scalability) | Plugin implementing the Automatic Import API and UI | 79 | 0 | 63 | 4 |
38+
| <DocLink id="kibAutomaticImportPluginApi" text="automaticImport"/> | [@elastic/integration-experience](https://github.com/orgs/elastic/teams/integration-experience) | Plugin implementing the Automatic Import API and UI | 79 | 0 | 63 | 4 |
3939
| <DocLink id="kibBannersPluginApi" text="banners"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 10 | 0 | 10 | 0 |
4040
| <DocLink id="kibCanvasPluginApi" text="canvas"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds Canvas application to Kibana | 8 | 0 | 7 | 3 |
4141
| <DocLink id="kibCasesPluginApi" text="cases"/> | [@elastic/kibana-cases](https://github.com/orgs/elastic/teams/kibana-cases) | The Case management system in Kibana | 132 | 0 | 112 | 29 |

renovate.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4103,13 +4103,13 @@
41034103
"nunjucks"
41044104
],
41054105
"reviewers": [
4106-
"team:security-scalability"
4106+
"team:integration-experience"
41074107
],
41084108
"matchBaseBranches": [
41094109
"main"
41104110
],
41114111
"labels": [
4112-
"Team:Security-Scalability",
4112+
"Team:Integration-Experience",
41134113
"release_note:skip",
41144114
"backport:all-open"
41154115
],
@@ -4122,13 +4122,13 @@
41224122
"oas"
41234123
],
41244124
"reviewers": [
4125-
"team:security-scalability"
4125+
"team:integration-experience"
41264126
],
41274127
"matchBaseBranches": [
41284128
"main"
41294129
],
41304130
"labels": [
4131-
"Team:Security-Scalability",
4131+
"Team:Integration-Experience",
41324132
"release_note:skip",
41334133
"backport:all-open"
41344134
],
@@ -4142,13 +4142,13 @@
41424142
"@types/seedrandom"
41434143
],
41444144
"reviewers": [
4145-
"team:security-scalability"
4145+
"team:integration-experience"
41464146
],
41474147
"matchBaseBranches": [
41484148
"main"
41494149
],
41504150
"labels": [
4151-
"Team:Security-Scalability",
4151+
"Team:Integration-Experience",
41524152
"release_note:skip",
41534153
"backport:all-open"
41544154
],

src/platform/packages/private/kbn-code-owners/src/code_owner_areas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export const CODE_OWNER_AREA_MAPPINGS: { [area in CodeOwnerArea]: string[] } = {
6767
'elastic/streams-program-team',
6868
],
6969
security: [
70+
'elastic/integration-experience',
7071
'elastic/kibana-cloud-security-posture',
7172
'elastic/security-asset-management',
7273
'elastic/security-data-analytics',
@@ -78,7 +79,6 @@ export const CODE_OWNER_AREA_MAPPINGS: { [area in CodeOwnerArea]: string[] } = {
7879
'elastic/security-engineering-productivity',
7980
'elastic/security-entity-analytics',
8081
'elastic/security-generative-ai',
81-
'elastic/security-scalability',
8282
'elastic/security-service-integrations',
8383
'elastic/security-solution',
8484
'elastic/security-threat-hunting',

src/platform/packages/shared/shared-ux/feedback_snippet/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ The component has two main states:
2121
- **Prompt:** The panel shows a custom `promptViewMessage` to gather feedback from the user.
2222
- **Positive:** The panel shows a thank you message and then automatically dismisses itself.
2323
- **Negative:** The panel updates to show a custom `surveyUrl` call-to-action button. The panel remains visible until the user explicitly dismisses it or navigates to the survey (which opens in a new tab).
24+
25+
## Running tests
26+
You can run tests with:
27+
28+
`node scripts/jest --config=src/platform/packages/shared/shared-ux/feedback_snippet/jest.config.js`

src/platform/packages/shared/shared-ux/feedback_snippet/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
module.exports = {
11-
preset: '@kbn/test/jest_node',
11+
preset: '@kbn/test',
1212
rootDir: '../../../../../..',
1313
roots: ['<rootDir>/src/platform/packages/shared/shared-ux/feedback_snippet'],
1414
};

src/platform/packages/shared/shared-ux/feedback_snippet/src/__snapshots__/feedback_button.test.tsx.snap

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

0 commit comments

Comments
 (0)