Skip to content

Commit 9654225

Browse files
authored
Merge branch 'master' into resolve-perfmon-deprecation
2 parents 53623ae + b2f973f commit 9654225

File tree

1,013 files changed

+13401
-134219
lines changed

Some content is hidden

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

1,013 files changed

+13401
-134219
lines changed

.ci/packaging.groovy

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,21 +328,24 @@ def tagAndPush(Map args = [:]) {
328328
}
329329

330330
variants.each { variant ->
331+
// cloud docker images are stored in the private docker namespace.
332+
def sourceNamespace = variant.equals('-cloud') ? 'beats-ci' : 'beats'
331333
tags.each { tag ->
332334
// TODO:
333335
// For backward compatibility let's ensure we tag only for amd64, then E2E can benefit from until
334336
// they support the versioning with the architecture
335337
if ("${arch}" == "amd64") {
336-
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}")
338+
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}", sourceNamespace: sourceNamespace)
337339
}
338-
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}")
340+
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}", sourceNamespace: sourceNamespace)
339341
}
340342
}
341343
}
342344

343345
/**
344346
* @param beatName name of the Beat
345347
* @param variant name of the variant used to build the docker image name
348+
* @param sourceNamespace namespace to be used as source for the docker tag command
346349
* @param sourceTag tag to be used as source for the docker tag command, usually under the 'beats' namespace
347350
* @param targetTag tag to be used as target for the docker tag command, usually under the 'observability-ci' namespace
348351
*/
@@ -351,7 +354,8 @@ def doTagAndPush(Map args = [:]) {
351354
def variant = args.variant
352355
def sourceTag = args.sourceTag
353356
def targetTag = args.targetTag
354-
def sourceName = "${DOCKER_REGISTRY}/beats/${beatName}${variant}:${sourceTag}"
357+
def sourceNamespace = args.sourceNamespace
358+
def sourceName = "${DOCKER_REGISTRY}/${sourceNamespace}/${beatName}${variant}:${sourceTag}"
355359
def targetName = "${DOCKER_REGISTRY}/observability-ci/${beatName}${variant}:${targetTag}"
356360
def iterations = 0
357361
retryWithSleep(retries: 3, seconds: 5, backoff: true) {

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.16.6
1+
1.17.1

CHANGELOG-developer.next.asciidoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
6363
- Fix export dashboard command when running against Elastic Cloud hosted Kibana. {pull}22746[22746]
6464
- Remove `event.dataset` (ECS) annotion from `libbeat.logp`. {issue}27404[27404]
6565
- Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804]
66+
- Avoid panicking in `add_fields` processor when input event.Fields is a nil map. {pull}28219[28219]
6667

6768
==== Added
6869

@@ -121,3 +122,8 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
121122
- Update to go-concert 0.2.0 {pull}27162[27162]
122123
- Update Go version to 1.16.5. {issue}26182[26182] {pull}26186[26186]
123124
- Introduce `libbeat/beat.Beat.OutputConfigReloader` {pull}28048[28048]
125+
- Update Go version to 1.17.1. {pull}27543[27543]
126+
127+
==== Deprecated
128+
129+
- Deprecated the `common.Float` type. {issue}28279[28279] {pull}28280[28280]

CHANGELOG.next.asciidoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
2323
- Remove deprecated/undocumented IncludeCreatorMetadata setting from kubernetes metadata config options {pull}28006[28006]
2424
- Remove deprecated fields from kubernetes module {pull}28046[28046]
2525
- Remove deprecated config option aws_partition. {pull}28120[28120]
26+
- Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917]
2627

2728
*Auditbeat*
2829

@@ -92,6 +93,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
9293
- Remove deprecated fields in Kafka module. {pull}27938[27938]
9394
- Remove deprecated fields in coredns module. {pull}28196[28196]
9495
- Remove old `httpjson` config implementation. {pull}28054[28054]
96+
- Fix initialization of http client in Cloudfoundry input. {issue}28271[28271] {pull}28277[28277]
9597

9698
*Heartbeat*
9799

@@ -116,6 +118,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
116118
- Remove deprecated fields in Kafka module. {pull}27938[27938]
117119
- Remove deprecated config option default_region from aws module. {pull}28120[28120]
118120
- Remove deprecated config option perfmon.counters from windows/perfmon metricset. {pull}28282[28282]
121+
- Remove deprecated fields in Redis module. {issue}11835[11835] {pull}28246[28246]
119122

120123
*Packetbeat*
121124

@@ -139,6 +142,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
139142

140143
*Functionbeat*
141144

145+
- Support for Google Cloud Functions have been removed, as it has been in Beta for a long time and been broken
146+
for a few releases. Please use other tools provided by Elastic to fetch data from GCP (e.g. Filebeat).
147+
142148

143149
==== Bugfixes
144150

@@ -210,6 +216,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
210216
- Periodic metrics in logs will now report `libbeat.output.events.active` and `beat.memstats.rss`
211217
as gauges (rather than counters). {pull}22877[22877]
212218
- Beats dashboards use custom index when `setup.dashboards.index` is set. {issue}21232[21232] {pull}27901[27901]
219+
- Fix handling of float data types within processors. {issue}28279[28279] {pull}28280[28280]
220+
- Allow `clone3` syscall in seccomp filters. {pull}28117[28117]
213221

214222
*Auditbeat*
215223

@@ -307,6 +315,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
307315
- Update indentation for azure filebeat configuration. {pull}26604[26604]
308316
- Update Sophos xg module pipeline to deal with missing `date` and `time` fields. {pull}27834[27834]
309317
- sophos/xg fileset: Add missing pipeline for System Health logs. {pull}27827[27827] {issue}27826[27826]
318+
- Resolve issue with @timestamp for defender_atp. {pull}28272[28272]
319+
- Tolerate faults when Windows Event Log session is interrupted {issue}27947[27947] {pull}28191[28191]
320+
- Add support for username in cisco asa security negotiation logs {pull}26975[26975]
321+
- Relax time parsing and capture group and session type in Cisco ASA module {issue}24710[24710] {pull}28325[28325]
310322

311323
*Heartbeat*
312324

@@ -415,6 +427,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
415427

416428
*Packetbeat*
417429

430+
- Handle truncated DNS records more gracefully. {issue}21495[21495] {pull}28297[28297]
418431

419432
*Winlogbeat*
420433

@@ -423,6 +436,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
423436
- Add source.ip validation for event ID 4778 in the Security module. {issue}19627[19627]
424437
- Protect against accessing undefined variables in Sysmon module. {issue}22219[22219] {pull}22236[22236]
425438
- Protect against accessing an undefined variable in Security module. {pull}22937[22937]
439+
- Tolerate faults when Windows Event Log session is interrupted {issue}27947[27947] {pull}28191[28191]
426440

427441
*Functionbeat*
428442

@@ -741,6 +755,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
741755
- Make aws-cloudwatch input GA. {pull}28161[28161]
742756
- Move processing to ingest node for AWS vpcflow fileset. {pull}28168[28168]
743757
- Release zoom module as GA. {pull}28106[28106]
758+
- Add support for secondary object attribute handling in ThreatIntel MISP module {pull}28124[28124]
744759

745760
*Heartbeat*
746761

Jenkinsfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,13 +460,15 @@ def tagAndPush(Map args = [:]) {
460460
def variants = ["", "-oss", "-ubi8"]
461461

462462
if(beatName == 'elastic-agent'){
463-
variants.add("-complete")
464-
variants.add("-cloud")
463+
variants.add("-complete")
464+
variants.add("-cloud")
465465
}
466466

467467
variants.each { variant ->
468+
// cloud docker images are stored in the private docker namespace.
469+
def sourceNamespace = variant.equals('-cloud') ? 'beats-ci' : 'beats'
468470
tags.each { tag ->
469-
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}")
471+
doTagAndPush(beatName: beatName, variant: variant, sourceTag: libbetaVer, targetTag: "${tag}-${arch}", sourceNamespace: sourceNamespace)
470472
}
471473
}
472474
}
@@ -482,7 +484,8 @@ def doTagAndPush(Map args = [:]) {
482484
def variant = args.variant
483485
def sourceTag = args.sourceTag
484486
def targetTag = args.targetTag
485-
def sourceName = "${DOCKER_REGISTRY}/beats/${beatName}${variant}:${sourceTag}"
487+
def sourceNamespace = args.sourceNamespace
488+
def sourceName = "${DOCKER_REGISTRY}/${sourceNamespace}/${beatName}${variant}:${sourceTag}"
486489
def targetName = "${DOCKER_REGISTRY}/observability-ci/${beatName}${variant}:${targetTag}"
487490

488491
def iterations = 0

0 commit comments

Comments
 (0)