Skip to content

Commit 5635808

Browse files
authored
Merge branch 'main' into remove-ff-eql-seq-suppression
2 parents 85687af + a40ecdb commit 5635808

1,181 files changed

Lines changed: 9321 additions & 3969 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/scripts/lifecycle/comment_on_pr.ts

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,23 @@ const ALLOWED_ENV_VARS = [
3333
'GITHUB_PR_USER',
3434
];
3535

36+
interface CommentOnPRArgs {
37+
messageTemplate: string;
38+
context?: string;
39+
clearPrevious: boolean;
40+
issueNumber?: string;
41+
repository?: string;
42+
repositoryOwner?: string;
43+
}
44+
3645
export function commentOnPR({
3746
messageTemplate,
3847
context,
3948
clearPrevious,
40-
}: {
41-
messageTemplate: string;
42-
context?: string;
43-
clearPrevious: boolean;
44-
}) {
49+
issueNumber,
50+
repository: repositoryBase,
51+
repositoryOwner,
52+
}: CommentOnPRArgs) {
4553
const message = messageTemplate.replace(/\${([^}]+)}/g, (_, envVar) => {
4654
if (ALLOWED_ENV_VARS.includes(envVar)) {
4755
return process.env[envVar] || '';
@@ -51,19 +59,26 @@ export function commentOnPR({
5159
});
5260

5361
if (context) {
54-
return upsertComment({ commentBody: message, commentContext: context, clearPrevious });
62+
return upsertComment(
63+
{ commentBody: message, commentContext: context, clearPrevious },
64+
repositoryOwner,
65+
repositoryBase,
66+
issueNumber
67+
);
5568
} else {
56-
return addComment(message);
69+
return addComment(message, repositoryOwner, repositoryBase, issueNumber);
5770
}
5871
}
5972

6073
if (require.main === module) {
61-
const args = parseArgs<{
62-
context?: string;
63-
message: string;
64-
'clear-previous'?: boolean | string;
65-
}>(process.argv.slice(2), {
66-
string: ['message', 'context'],
74+
const args = parseArgs<
75+
CommentOnPRArgs & {
76+
'clear-previous'?: CommentOnPRArgs['clearPrevious'] | string;
77+
'issue-number'?: CommentOnPRArgs['issueNumber'];
78+
'repository-owner'?: CommentOnPRArgs['repositoryOwner'];
79+
}
80+
>(process.argv.slice(2), {
81+
string: ['message', 'context', 'issue-number', 'repository', 'repository-owner'],
6782
boolean: ['clear-previous'],
6883
});
6984

@@ -82,6 +97,9 @@ if (require.main === module) {
8297
typeof args['clear-previous'] === 'string'
8398
? !!args['clear-previous'].match(/(1|true)/i)
8499
: !!args['clear-previous'],
100+
issueNumber: args['issue-number'],
101+
repository: args.repository,
102+
repositoryOwner: args['repository-owner'],
85103
}).catch((error) => {
86104
console.error(error);
87105
process.exit(1);

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ const RESTRICTED_IMPORTS = [
256256
name: 'react-use',
257257
message: 'Please use react-use/lib/{method} instead.',
258258
},
259+
{
260+
name: 'react-use/lib',
261+
message: 'Please use react-use/lib/{method} instead.',
262+
},
259263
{
260264
name: 'react-router-dom',
261265
importNames: ['Router', 'Switch', 'Route'],

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,7 +2251,7 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
22512251
/x-pack/solutions/security/plugins/security_solution_ess/public/upselling/pages/attack_discovery @elastic/security-generative-ai
22522252
/x-pack/test/security_solution_cypress/cypress/e2e/automatic_import @elastic/security-scalability
22532253
/x-pack/solutions/security/plugins/security_solution/public/configurations @elastic/security-generative-ai
2254-
/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/ai_soc @elastic/security-generative-ai @elastic/security-threat-hunting-explore
2254+
/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/ai_soc @elastic/security-solution @elastic/security-threat-hunting-explore
22552255

22562256

22572257
# AI4DSOC in Security Solution
@@ -2745,7 +2745,7 @@ src/platform/testfunctional/page_objects/solution_navigation.ts @elastic/appex-s
27452745
/x-pack/test_serverless/functional/test_suites/security/ftr/navigation.ts @elastic/appex-sharedux
27462746

27472747
# Root package.json file
2748-
/package.json @elastic/kibana-security
2748+
/package.json @elastic/kibana-security @kibanamachine
27492749

27502750
# OpenAPI spec files
27512751
oas_docs/.spectral.yaml @elastic/platform-docs
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
on:
2+
pull_request_target:
3+
branches:
4+
- main
5+
types:
6+
- opened
7+
8+
jobs:
9+
approve:
10+
name: Auto-approve renovate bot PRs
11+
runs-on: ubuntu-latest
12+
if: |
13+
startsWith(github.event.pull_request.head.ref, 'renovate') &&
14+
github.actor == 'renovate[bot]'
15+
permissions:
16+
pull-requests: write
17+
steps:
18+
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
19+
with:
20+
github-token: ${{ secrets.KIBANAMACHINE_TOKEN }}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
SLACK_TOKEN: ${{secrets.CODE_SCANNING_SLACK_TOKEN}}
8282
CODE_SCANNING_ES_HOST: ${{secrets.CODE_SCANNING_ES_HOST}}
8383
CODE_SCANNING_ES_API_KEY: ${{secrets.CODE_SCANNING_ES_API_KEY}}
84-
CODE_SCANNING_BRANCHES: 7.17,8.x,main
84+
CODE_SCANNING_BRANCHES: main,8.19
8585
run: |
8686
npm ci --omit=dev
8787
node codeql-alert

api_docs/actions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2025-04-23
11+
date: 2025-04-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

api_docs/advanced_settings.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2025-04-23
11+
date: 2025-04-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

api_docs/ai_assistant_management_selection.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
88
title: "aiAssistantManagementSelection"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiAssistantManagementSelection plugin
11-
date: 2025-04-23
11+
date: 2025-04-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
1313
---
1414
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

api_docs/aiops.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2025-04-23
11+
date: 2025-04-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';

api_docs/alerting.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
88
title: "alerting"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the alerting plugin
11-
date: 2025-04-23
11+
date: 2025-04-24
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
1313
---
1414
import alertingObj from './alerting.devdocs.json';

0 commit comments

Comments
 (0)