Skip to content

Commit 59461ed

Browse files
kcreddykcreddy
committed
Merge remote-tracking branch 'upstream/main' into tagging-evt-original-standards-2
2 parents 73b319e + da58441 commit 59461ed

162 files changed

Lines changed: 4765 additions & 3072 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.

‎.github/CODEOWNERS‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# GH Actions Workflow co-owners below.
1111
# Please keep the list sorted.
12-
/.github/workflows/trigger-package-tests-security-ml.yml @elastic/sec-applied-ml
12+
/.github/workflows/trigger-package-tests-security-ml.yml @elastic/threat-research-and-detection-engineering
1313

1414
# Package owners below.
1515
# Please keep the list sorted.
@@ -160,7 +160,7 @@
160160
/packages/barracuda @elastic/integration-experience
161161
/packages/barracuda_cloudgen_firewall @elastic/integration-experience
162162
/packages/bbot @elastic/security-service-integrations @elastic/sit-crest-contractors
163-
/packages/beaconing @elastic/sec-applied-ml @elastic/kibana-management
163+
/packages/beaconing @elastic/threat-research-and-detection-engineering @elastic/kibana-management
164164
/packages/beat @elastic/stack-monitoring
165165
/packages/beelzebub @elastic/security-service-integrations @elastic/sit-crest-contractors
166166
/packages/beyondinsight_password_safe @elastic/security-service-integrations @elastic/sit-crest-contractors
@@ -235,8 +235,8 @@
235235
/packages/cylance @elastic/security-service-integrations @elastic/sit-crest-contractors
236236
/packages/darktrace @elastic/security-service-integrations @elastic/sit-crest-contractors
237237
/packages/dataminr_pulse @elastic/security-service-integrations @elastic/sit-crest-contractors
238-
/packages/ded @elastic/sec-applied-ml @elastic/kibana-management
239-
/packages/dga @elastic/sec-applied-ml
238+
/packages/ded @elastic/threat-research-and-detection-engineering @elastic/kibana-management
239+
/packages/dga @elastic/threat-research-and-detection-engineering
240240
/packages/digital_guardian @elastic/security-service-integrations @elastic/sit-crest-contractors
241241
/packages/docker @elastic/obs-ds-hosted-services
242242
/packages/docker_input_otel @elastic/ecosystem
@@ -273,7 +273,7 @@
273273
/packages/fim @elastic/sec-linux-platform
274274
/packages/fireeye @elastic/integration-experience
275275
/packages/first_epss @elastic/security-service-integrations @elastic/sit-crest-contractors
276-
/packages/fleet_server @elastic/fleet
276+
/packages/fleet_server @elastic/streams-ui
277277
/packages/forcepoint_web @elastic/integration-experience
278278
/packages/forescout @elastic/integration-experience
279279
/packages/forgerock @elastic/security-service-integrations @elastic/sit-crest-contractors
@@ -327,7 +327,7 @@
327327
/packages/hid_bravura_monitor @elastic/sec-windows-platform
328328
/packages/hostmetrics_input_otel @elastic/obs-infraobs-integrations
329329
/packages/hpe_aruba_cx @elastic/integration-experience
330-
/packages/hta @elastic/sec-applied-ml
330+
/packages/hta @elastic/threat-research-and-detection-engineering
331331
/packages/http_endpoint @elastic/security-service-integrations @elastic/sit-crest-contractors
332332
/packages/httpcheck_otel @elastic/ecosystem
333333
/packages/httpjson @elastic/security-service-integrations @elastic/sit-crest-contractors
@@ -375,7 +375,7 @@
375375
/packages/kubernetes_otel @elastic/obs-infraobs-integrations
376376
/packages/lastpass @elastic/security-service-integrations @elastic/sit-crest-contractors
377377
/packages/linux @elastic/elastic-agent-data-plane
378-
/packages/lmd @elastic/sec-applied-ml @elastic/kibana-management
378+
/packages/lmd @elastic/threat-research-and-detection-engineering @elastic/kibana-management
379379
/packages/log @elastic/elastic-agent-data-plane
380380
/packages/logstash @elastic/logstash
381381
/packages/lumos @elastic/security-service-integrations @elastic/sit-crest-contractors
@@ -445,7 +445,7 @@
445445
/packages/osquery_manager @elastic/security-defend-workflows
446446
/packages/otel_collector_internal_telemetry @elastic/obs-signals-metrics-team
447447
/packages/otlp_input_otel @elastic/ecosystem
448-
/packages/pad @elastic/sec-applied-ml @elastic/kibana-management
448+
/packages/pad @elastic/threat-research-and-detection-engineering @elastic/kibana-management
449449
/packages/panw @elastic/integration-experience
450450
/packages/panw_cortex_xdr @elastic/security-service-integrations @elastic/sit-crest-contractors
451451
/packages/panw_metrics @elastic/obs-infraobs-integrations
@@ -459,7 +459,7 @@
459459
/packages/pps @elastic/security-service-integrations @elastic/sit-crest-contractors
460460
/packages/prisma_access @elastic/integration-experience
461461
/packages/prisma_cloud @elastic/security-service-integrations @elastic/sit-crest-contractors
462-
/packages/problemchild @elastic/sec-applied-ml
462+
/packages/problemchild @elastic/threat-research-and-detection-engineering
463463
/packages/profiling_otel @elastic/obs-signals-logs-team
464464
/packages/profilingmetrics_otel @elastic/obs-signals-logs-team
465465
/packages/prometheus @elastic/obs-infraobs-integrations
@@ -521,7 +521,7 @@
521521
/packages/swimlane @elastic/security-service-integrations @elastic/sit-crest-contractors
522522
/packages/symantec_endpoint @elastic/integration-experience
523523
/packages/symantec_endpoint_security @elastic/security-service-integrations @elastic/sit-crest-contractors
524-
/packages/synthetics @elastic/actionable-obs-team
524+
/packages/synthetics @elastic/actionable-obs-team @elastic/obs-signals-logs-team
525525
/packages/synthetics_dashboards @elastic/actionable-obs-team
526526
/packages/sysdig @elastic/security-service-integrations @elastic/sit-crest-contractors
527527
/packages/syslog_router @elastic/integration-experience
@@ -642,4 +642,4 @@
642642
/packages/zscaler_zia @elastic/security-service-integrations @elastic/sit-crest-contractors
643643
/packages/zscaler_zpa @elastic/security-service-integrations @elastic/sit-crest-contractors
644644
/packages/otel_rum_dashboards @elastic/apm-agent-rum
645-
/packages/otel_android_dashboards @elastic/apm-agent-android @elastic/apm-agent-approvers
645+
/packages/otel_android_dashboards @elastic/apm-agent-android @elastic/obs-signals-traces-approvers

‎catalog-info.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
url: https://www.elastic.co/integrations/
1313
spec:
1414
type: library
15-
owner: group:ingest-fp
15+
owner: group:streams
1616
system: platform-ingest
1717
lifecycle: production
1818
dependsOn:
@@ -33,7 +33,7 @@ metadata:
3333

3434
spec:
3535
type: buildkite-pipeline
36-
owner: group:ingest-fp
36+
owner: group:streams
3737
system: platform-ingest
3838
implementation:
3939
apiVersion: buildkite.elastic.dev/v1
@@ -59,7 +59,7 @@ spec:
5959
env:
6060
ELASTIC_PR_COMMENTS_ENABLED: 'true'
6161
teams:
62-
ingest-fp:
62+
streams:
6363
access_level: MANAGE_BUILD_AND_READ
6464
ecosystem:
6565
access_level: MANAGE_BUILD_AND_READ
@@ -73,7 +73,7 @@ spec:
7373
access_level: BUILD_AND_READ
7474
elastic-agent-data-plane:
7575
access_level: BUILD_AND_READ
76-
fleet:
76+
streams-ui:
7777
access_level: BUILD_AND_READ
7878
integration-experience:
7979
access_level: BUILD_AND_READ
@@ -122,7 +122,7 @@ metadata:
122122

123123
spec:
124124
type: buildkite-pipeline
125-
owner: group:ingest-fp
125+
owner: group:streams
126126
system: platform-ingest
127127
implementation:
128128
apiVersion: buildkite.elastic.dev/v1
@@ -150,7 +150,7 @@ spec:
150150
env:
151151
ELASTIC_PR_COMMENTS_ENABLED: 'true'
152152
teams:
153-
ingest-fp:
153+
streams:
154154
access_level: MANAGE_BUILD_AND_READ
155155
observablt-ci:
156156
access_level: MANAGE_BUILD_AND_READ
@@ -170,7 +170,7 @@ metadata:
170170

171171
spec:
172172
type: buildkite-pipeline
173-
owner: group:ingest-fp
173+
owner: group:streams
174174
system: platform-ingest
175175
implementation:
176176
apiVersion: buildkite.elastic.dev/v1
@@ -226,7 +226,7 @@ spec:
226226
SLACK_NOTIFICATIONS_ALL_BRANCHES: 'true'
227227
SLACK_NOTIFICATIONS_ON_SUCCESS: 'true'
228228
teams:
229-
ingest-fp:
229+
streams:
230230
access_level: MANAGE_BUILD_AND_READ
231231
observablt-ci:
232232
access_level: MANAGE_BUILD_AND_READ
@@ -246,7 +246,7 @@ metadata:
246246

247247
spec:
248248
type: buildkite-pipeline
249-
owner: group:ingest-fp
249+
owner: group:streams
250250
system: platform-ingest
251251
implementation:
252252
apiVersion: buildkite.elastic.dev/v1
@@ -276,7 +276,7 @@ spec:
276276
SLACK_NOTIFICATIONS_ALL_BRANCHES: 'true'
277277
SLACK_NOTIFICATIONS_ON_SUCCESS: 'true'
278278
teams:
279-
ingest-fp:
279+
streams:
280280
access_level: MANAGE_BUILD_AND_READ
281281
observablt-ci:
282282
access_level: MANAGE_BUILD_AND_READ
@@ -295,7 +295,7 @@ metadata:
295295

296296
spec:
297297
type: buildkite-pipeline
298-
owner: group:ingest-fp
298+
owner: group:streams
299299
system: platform-ingest
300300
implementation:
301301
apiVersion: buildkite.elastic.dev/v1
@@ -319,7 +319,7 @@ spec:
319319
skip_intermediate_builds: true
320320
skip_intermediate_builds_branch_filter: '!main'
321321
teams:
322-
ingest-fp:
322+
streams:
323323
access_level: MANAGE_BUILD_AND_READ
324324
observablt-ci:
325325
access_level: MANAGE_BUILD_AND_READ
@@ -339,7 +339,7 @@ metadata:
339339

340340
spec:
341341
type: buildkite-pipeline
342-
owner: group:ingest-fp
342+
owner: group:streams
343343
system: platform-ingest
344344
implementation:
345345
apiVersion: buildkite.elastic.dev/v1
@@ -363,7 +363,7 @@ spec:
363363
skip_intermediate_builds: true
364364
skip_intermediate_builds_branch_filter: '!main'
365365
teams:
366-
ingest-fp:
366+
streams:
367367
access_level: MANAGE_BUILD_AND_READ
368368
everyone:
369369
access_level: BUILD_AND_READ
@@ -381,7 +381,7 @@ metadata:
381381

382382
spec:
383383
type: buildkite-pipeline
384-
owner: group:ingest-fp
384+
owner: group:streams
385385
system: platform-ingest
386386
implementation:
387387
apiVersion: buildkite.elastic.dev/v1
@@ -405,7 +405,7 @@ spec:
405405
skip_intermediate_builds: true
406406
skip_intermediate_builds_branch_filter: '!main'
407407
teams:
408-
ingest-fp:
408+
streams:
409409
access_level: MANAGE_BUILD_AND_READ
410410
ecosystem:
411411
access_level: MANAGE_BUILD_AND_READ
@@ -425,7 +425,7 @@ metadata:
425425

426426
spec:
427427
type: buildkite-pipeline
428-
owner: group:ingest-fp
428+
owner: group:streams
429429
system: platform-ingest
430430
implementation:
431431
apiVersion: buildkite.elastic.dev/v1
@@ -449,7 +449,7 @@ spec:
449449
skip_intermediate_builds: true
450450
skip_intermediate_builds_branch_filter: '!main !backport-*'
451451
teams:
452-
ingest-fp:
452+
streams:
453453
access_level: MANAGE_BUILD_AND_READ
454454
everyone:
455455
access_level: READ_ONLY

‎cmd/backport/backports/checklist/checklist.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ func BuildComment(pkgs []PackageBranches, checked map[string]bool) string {
132132
fmt.Fprintln(&b, "> This comment is updated automatically on each push — manual edits will be overwritten.")
133133
fmt.Fprintln(&b)
134134
fmt.Fprintln(&b, "Tick the branches you want to backport to. PRs will be created automatically on merge, or when you update this checklist after merge.")
135+
fmt.Fprintln(&b)
136+
fmt.Fprintln(&b, "Backport a change when it fixes behavior a branch already has; leave new behavior on `main`. See [when and why to backport](https://github.com/elastic/integrations/wiki/Package-Backports) if you are unsure.")
135137

136138
for _, p := range pkgs {
137139
if len(p.Branches) == 0 {

‎cmd/backport/backports/checklist/checklist_test.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,17 @@ func TestBuildComment(t *testing.T) {
103103
checked: map[string]bool{},
104104
wantContains: []string{"PRs will be created automatically on merge, or when you update this checklist after merge."},
105105
},
106+
{
107+
title: "intro links to the backport guidance wiki",
108+
pkgs: []PackageBranches{
109+
{Package: "aws", Branches: []backports.ActiveResult{awsBranch("backport-aws-6.14")}},
110+
},
111+
checked: map[string]bool{},
112+
wantContains: []string{
113+
"Backport a change when it fixes behavior a branch already has",
114+
"https://github.com/elastic/integrations/wiki/Package-Backports",
115+
},
116+
},
106117
{
107118
title: "multiple packages both rendered",
108119
pkgs: []PackageBranches{

‎packages/airlock_digital/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "0.6.0"
3+
changes:
4+
- description: Add tags to ingest pipeline processors and add `preserve_original_event` to pipeline-level `on_failure` handlers.
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/20575
27
- version: "0.5.1"
38
changes:
49
- description: Set agentless deployment mode `release` field to `ga`.

0 commit comments

Comments
 (0)