Skip to content

Commit ad9d309

Browse files
ChrsMarkChrsMark
committed
Merge remote-tracking branch 'upstream/master' into remove_deprecated_k8s_fields
2 parents 858f991 + b204d4d commit ad9d309

7 files changed

Lines changed: 140 additions & 96 deletions

File tree

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"upstream": "elastic/beats",
3-
"branches": [ { "name": "7.x", "checked": true }, "7.15", "7.14", "7.13", "7.12" ],
3+
"branches": [ { "name": "7.x", "checked": true }, "7.15", "7.14" ],
44
"labels": ["backport"],
55
"autoAssign": true,
66
"prTitle": "Cherry-pick to {targetBranch}: {commitMessages}"

‎.mergify.yml‎

Lines changed: 42 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,6 @@ pull_request_rules:
1212
labels:
1313
- "backport"
1414
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
15-
- name: backport patches to 7.x branch
16-
conditions:
17-
- merged
18-
- label=backport-v7.16.0
19-
actions:
20-
backport:
21-
assignees:
22-
- "{{ author }}"
23-
branches:
24-
- "7.x"
25-
labels:
26-
- "backport"
27-
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
28-
- name: backport patches to 7.13 branch
29-
conditions:
30-
- merged
31-
- label=backport-v7.13.0
32-
actions:
33-
backport:
34-
assignees:
35-
- "{{ author }}"
36-
branches:
37-
- "7.13"
38-
labels:
39-
- "backport"
40-
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
41-
- name: backport patches to 7.12 branch
42-
conditions:
43-
- merged
44-
- label=backport-v7.12.0
45-
actions:
46-
backport:
47-
assignees:
48-
- "{{ author }}"
49-
branches:
50-
- "7.12"
51-
labels:
52-
- "backport"
53-
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
5415
- name: ask to resolve conflict
5516
conditions:
5617
- conflict
@@ -106,19 +67,6 @@ pull_request_rules:
10667
- files~=^\.go-version$
10768
actions:
10869
delete_head_branch:
109-
- name: backport patches to 7.14 branch
110-
conditions:
111-
- merged
112-
- label=backport-v7.14.0
113-
actions:
114-
backport:
115-
assignees:
116-
- "{{ author }}"
117-
branches:
118-
- "7.14"
119-
labels:
120-
- "backport"
121-
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
12270
- name: automatic approval for mergify pull requests with changes in bump-rules
12371
conditions:
12472
- author=mergify[bot]
@@ -151,6 +99,48 @@ pull_request_rules:
15199
- files~=^\.mergify\.yml$
152100
actions:
153101
delete_head_branch:
102+
- name: notify the backport policy
103+
conditions:
104+
- -label~=^backport
105+
- base=master
106+
actions:
107+
comment:
108+
message: |
109+
This pull request does not have a backport label. Could you fix it @{{author}}? 🙏
110+
To fixup this pull request, you need to add the backport labels for the needed
111+
branches, such as:
112+
* `backport-v./d./d./d` is the label to automatically backport to the `7./d` branch. `/d` is the digit
113+
114+
**NOTE**: `backport-skip` has been added to this pull request.
115+
label:
116+
add:
117+
- backport-skip
118+
- name: backport patches to 7.x branch
119+
conditions:
120+
- merged
121+
- label=backport-v7.16.0
122+
actions:
123+
backport:
124+
assignees:
125+
- "{{ author }}"
126+
branches:
127+
- "7.x"
128+
labels:
129+
- "backport"
130+
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
131+
- name: backport patches to 7.14 branch
132+
conditions:
133+
- merged
134+
- label=backport-v7.14.0
135+
actions:
136+
backport:
137+
assignees:
138+
- "{{ author }}"
139+
branches:
140+
- "7.14"
141+
labels:
142+
- "backport"
143+
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
154144
- name: backport patches to 7.15 branch
155145
conditions:
156146
- merged

‎CHANGELOG.asciidoc‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,99 @@ Changes will be described in a later alpha / beta.
1212
=== Beats version 8.0.0-alpha1
1313

1414
Changes will be described in a later alpha / beta.
15+
[[release-notes-7.15.0]]
16+
=== Beats version 7.15.0
17+
https://github.com/elastic/beats/compare/v7.14.2...v7.15.0[View commits]
18+
19+
==== Breaking changes
20+
21+
*Affecting all Beats*
22+
23+
- Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dashboards using at least Kibana 7.15. {issue}20672[20672] {pull}27220[27220]
24+
25+
*Filebeat*
26+
27+
- Remove all alias fields pointing to ECS fields from modules. This affects the Suricata and Traefik modules. {issue}10535[10535] {pull}26627[26627]
28+
- Fix Crowdstrike ingest pipeline that was creating flattened `process` fields. {issue}27622[27622] {pull}27623[27623]
29+
- Rename `log.path` to `log.file.path` in filestream to be consistent with `log` input and ECS. {pull}27761[27761]
30+
31+
*Heartbeat*
32+
- Remove long deprecated `watch_poll` functionality. {pull}27166[27166]
33+
- Fix inconsistency in `event.dataset` values between heartbeat and fleet by always setting this value to the monitor type / fleet dataset. {pull}27535[27535]
34+
35+
*Metricbeat*
36+
37+
- Fix Elasticsearch jvm.gc.collectors.old being exposed as young {issue}19636[19636] {pull}26616[26616]
38+
39+
==== Bugfixes
40+
41+
*Affecting all Beats*
42+
43+
- Improve `perfmon` metricset performance. {pull}26886[26886]
44+
- Preserve annotations in a kubernetes namespace metadata {pull}27045[27045]
45+
- Fix build constraint that caused issues with doc builds. {pull}27381[27381]
46+
- Do not try to load ILM policy if `check_exists` is `false`. {pull}27508[27508] {issue}26322[26322]
47+
- Fix bug with cgroups hierarchy override path in cgroups {pull}27620[27620]
48+
- Beat `setup kibana` command may use the elasticsearch API key defined in `output.elasticsearch.api_key`. {issue}24015[24015] {pull}27540[27540]
49+
- Fix `decode_xml` handling of array merging when using `to_lower: true`. {pull}27922[27922]
50+
- Separate namespaces for V1 and V2 controller paths {pull}27676[27676]
51+
- Do not try to load ILM policy if `check_exists` is `false`. {pull}27508[27508] {issue}26322[26322]
52+
- Kubernetes autodiscover fails in node scope if node name cannot be discovered {pull}26947[26947]
53+
54+
*Auditbeat*
55+
56+
- File Integrity Module: Honor `include_files` when doing initial scan. {issue}27273[27273] {pull}27722[27722]
57+
58+
*Filebeat*
59+
60+
- Update Filebeat compatibility function to remove processor description field on ES < 7.9.0 {pull}27774[27774]
61+
- Make filestream events ECS compliant. {issue}27776[27776]
62+
63+
*Metricbeat*
64+
65+
- Allow metric prefix override per service in gcp module. {pull}26960[26960]
66+
- Update metrics configuration and dashboards after changes in the Azure Monitor {pull}27520[27520]
67+
68+
*Winlogbeat*
69+
70+
- Fix an issue with message template caching in the `wineventlog-experimental` API implementation. {pull}26826[26826]
71+
72+
==== Added
73+
74+
*Affecting all Beats*
75+
76+
- Add proxy support for AWS functions. {pull}26832[26832]
77+
- Added policies to the Elasticsearch output for non indexible events {pull}26952[26952]
78+
- Add `logging.metrics.namespaces` config option to control what metric groups are reported in logs. {pull}25727[25727]
79+
- Add sha256 digests to RPM packages. {issue}23670[23670]
80+
- Add new 'offline' docker image for Elastic Agent. {pull}27052[27052]
81+
- Add cgroups V2 support {pull}27242[27242]
82+
- Update ECS field definitions to ECS 1.11.0. {pull}27107[27107]
83+
- The disk queue is now GA. {pull}27515[27515]
84+
- Add `daemonset.name` in pods controlled by DaemonSets {pull}26808[26808], {issue}25816[25816]
85+
86+
*Filebeat*
87+
88+
- Add new template functions and `value_type` parameter to `httpjson` transforms. {pull}26847[26847]
89+
- Add support to merge registry updates in the filestream input across multiple ACKed batches in case of backpressure in the registry or disk. {pull}25976[25976]
90+
- Add support to `decode_cef` for MAC addresses that do not contain separator characters. {issue}27050[27050] {pull}27109[27109]
91+
- Add new `hmac` template function for httpjson input {pull}27168[27168]
92+
- Update `tags` and `threatintel.indicator.provider` fields in `threatintel.anomali` ingest pipeline {issue}24746[24746] {pull}27141[27141]
93+
- Move AWS module and filesets to GA. {pull}27428[27428]
94+
- Update ecs.version to ECS 1.11.0. {pull}27107[27107]
95+
- Add option for S3 input to work without SQS notification {issue}18205[18205] {pull}27332[27332]
96+
97+
*Metricbeat*
98+
99+
- Move openmetrics module to oss. {pull}26561[26561]
100+
- Fix release state of kubernetes metricsets. {pull}26864[26864]
101+
- Add `gke` metricset collection to `gcp` module {pull}26824[26824]
102+
- Added `statsd.mappings` configuration for Statsd module {pull}26220[26220]
103+
- Added Airflow lightweight module {pull}26220[26220]
104+
- Add state_job metricset to Kubernetes module{pull}26479[26479]
105+
- Bump AWS SDK version to v0.24.0 for WebIdentity authentication flow {issue}19393[19393] {pull}27126[27126]
106+
107+
15108
[[release-notes-7.14.2]]
16109
=== Beats version 7.14.2
17110
https://github.com/elastic/beats/compare/v7.14.1...v7.14.2[View commits]

‎CHANGELOG.next.asciidoc‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
1919
- Remove the non-ECS `agent.hostname` field. Use the `agent.name` or `agent.id` fields for an identifier. {issue}16377[16377] {pull}18328[18328]
2020
- Make error message about locked data path actionable. {pull}18667[18667]
2121
- Remove the deprecated `xpack.monitoring.*` settings. Going forward only `monitoring.*` settings may be used. {issue}9424[9424] {pull}18608[18608]
22-
- Add daemonset.name in pods controlled by DaemonSets {pull}26808[26808], {issue}25816[25816]
23-
- Kubernetes autodiscover fails in node scope if node name cannot be discovered {pull}26947[26947]
24-
- Loading Kibana assets (dashboards, index templates) rely on Saved Object API. So to provide a reliable service, Beats can only import and export dasbhboards using at least Kibana 7.15. {issue}20672[20672] {pull}27220[27220]
2522
- Skip add_kubernetes_metadata processor when kubernetes metadata are already present {pull}27689[27689]
2623
- Remove deprecated/undocumented IncludeCreatorMetadata setting from kubernetes metadata config options {pull}28006[28006]
2724
- Remove deprecated fields from kubernetes module {pull}28046[28046]
@@ -94,8 +91,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
9491
- Remove deprecated fields in Kafka module. {pull}27938[27938]
9592

9693
*Heartbeat*
97-
- Remove long deprecated `watch_poll` functionality. {pull}27166[27166]
98-
- Fix inconsistency in `event.dataset` values between heartbeat and fleet by always setting this value to the monitor type / fleet dataset. {pull}27535[27535]
9994

10095
*Journalbeat*
10196

@@ -109,10 +104,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
109104
- Move service config under metrics and simplify metric types. {pull}18691[18691]
110105
- Fix ECS compliance of user.id field in system/users metricset {pull}19019[19019]
111106
- Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457]
112-
- Added `statsd.mappings` configuration for Statsd module {pull}26220[26220]
113-
- Added Airflow lightweight module {pull}26220[26220]
114-
- Add state_job metricset to Kubernetes module{pull}26479[26479]
115-
- Bump AWS SDK version to v0.24.0 for WebIdentity authentication flow {issue}19393[19393] {pull}27126[27126]
116107
- Add Linux pressure metricset {pull}27355[27355]
117108
- Add support for kube-state-metrics v2.0.0 {pull}27552[27552]
118109
- Add User-Agent header to HTTP requests. {issue}18160[18160] {pull}27509[27509]
@@ -212,14 +203,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
212203
- Fix index template loading when the new index format is selected. {issue}22482[22482] {pull}22682[22682]
213204
- Periodic metrics in logs will now report `libbeat.output.events.active` and `beat.memstats.rss`
214205
as gauges (rather than counters). {pull}22877[22877]
215-
- Improve `perfmon` metricset performance. {pull}26886[26886]
216-
- Preserve annotations in a kubernetes namespace metadata {pull}27045[27045]
217-
- Fix build constraint that caused issues with doc builds. {pull}27381[27381]
218-
- Do not try to load ILM policy if `check_exists` is `false`. {pull}27508[27508] {issue}26322[26322]
219-
- Fix bug with cgroups hierarchy override path in cgroups {pull}27620[27620]
220-
- Beat `setup kibana` command may use the elasticsearch API key defined in `output.elasticsearch.api_key`. {issue}24015[24015] {pull}27540[27540]
221-
- Fix `decode_xml` handling of array merging when using `to_lower: true`. {pull}27922[27922]
222-
- Seperate namespaces for V1 and V2 controller paths {pull}27676[27676]
223206
- Beats dashboards use custom index when `setup.dashboards.index` is set. {issue}21232[21232] {pull}27901[27901]
224207

225208
*Auditbeat*
@@ -230,7 +213,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
230213
- system/package: Fix an error that can occur while trying to persist package metadata. {issue}18536[18536] {pull}18887[18887]
231214
- system/socket: Fix dataset using 100% CPU and becoming unresponsive in some scenarios. {pull}19033[19033] {pull}19764[19764]
232215
- system/socket: Fixed tracking of long-running connections. {pull}19033[19033]
233-
- file_integrity: honor include_files when doing initial scan. {issue}27273[27273] {pull}27722[27722]
234216

235217
*Filebeat*
236218

@@ -316,11 +298,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
316298
- Fix Zeek dashboard reference to `zeek.ssl.server.name` field. {pull}21696[21696]
317299
- Fix for `field [source] not present as part of path [source.ip]` error in azure pipelines. {pull}22377[22377]
318300
- Drop aws.vpcflow.pkt_srcaddr and aws.vpcflow.pkt_dstaddr when equal to "-". {pull}22721[22721] {issue}22716[22716]
319-
- Fixes the Snyk module to work with the new API changes. {pull}27358[27358]
320-
- Fixes a bug in `http_endpoint` that caused numbers encoded as strings. {issue}27382[27382] {pull}27480[27480]
321301
- Update indentation for azure filebeat configuration. {pull}26604[26604]
322-
- Update Filebeat compatibility function to remove processor description field on ES < 7.9.0 {pull}27774[27774]
323-
- Make filestream events ECS compliant. {issue}27776[27776]
324302
- Update Sophos xg module pipeline to deal with missing `date` and `time` fields. {pull}27834[27834]
325303

326304
*Heartbeat*
@@ -426,8 +404,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
426404
- Fix remote_write flaky test. {pull}21173[21173]
427405
- Remove io.time from windows {pull}22237[22237]
428406
- Change vsphere.datastore.capacity.used.pct value to betweeen 0 and 1. {pull}23148[23148]
429-
- Allow metric prefix override per service in gcp module. {pull}26960[26960]
430-
- Update metrics configuration and dashboards after changes in the Azure Monitor {pull}27520[27520]
431407

432408
*Packetbeat*
433409

@@ -439,7 +415,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
439415
- Add source.ip validation for event ID 4778 in the Security module. {issue}19627[19627]
440416
- Protect against accessing undefined variables in Sysmon module. {issue}22219[22219] {pull}22236[22236]
441417
- Protect against accessing an undefined variable in Security module. {pull}22937[22937]
442-
- Fix an issue with message template caching in the `wineventlog-experimental` API implementation. {pull}26826[26826]
443418

444419
*Functionbeat*
445420

@@ -522,14 +497,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
522497
- Added "add_network_direction" processor for determining perimeter-based network direction. {pull}23076[23076]
523498
- Added new `rate_limit` processor for enforcing rate limits on event throughput. {pull}22883[22883]
524499
- Allow node/namespace metadata to be disabled on kubernetes metagen and ensure add_kubernetes_metadata honors host {pull}23012[23012]
525-
- Add proxy support for AWS functions. {pull}26832[26832]
526-
- Added policies to the elasticsearch output for non indexible events {pull}26952[26952]
527-
- Add `logging.metrics.namespaces` config option to control what metric groups are reported in logs. {pull}25727[25727]
528-
- Add sha256 digests to RPM packages. {issue}23670[23670]
529-
- Add new 'offline' docker image for Elastic Agent. {pull}27052[27052]
530-
- Add cgroups V2 support {pull}27242[27242]
531-
- update ECS field definitions to ECS 1.11.0. {pull}27107[27107]
532-
- The disk queue is now GA. {pull}27515[27515]
533500
- Allow non-padded base64 data to be decoded by decode_base64_field {pull}27311[27311], {issue}27021[27021]
534501
- The Kafka support library Sarama has been updated to 1.29.1. {pull}27717[27717]
535502
- Kafka is now supported up to version 2.8.0. {pull}27720[27720]
@@ -747,15 +714,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
747714
- Add Google Workspace module and mark Gsuite module as deprecated {pull}22950[22950]
748715
- Mark m365 defender, defender atp, okta and google workspace modules as GA {pull}23113[23113]
749716
- Added `alternative_host` option to google pubsub input {pull}23215[23215]
750-
- Add new template functions and `value_type` parameter to `httpjson` transforms. {pull}26847[26847]
751-
- Add support to merge registry updates in the filestream input across multiple ACKed batches in case of backpressure in the registry or disk. {pull}25976[25976]
752-
- Add support to `decode_cef` for MAC addresses that do not contain separator characters. {issue}27050[27050] {pull}27109[27109]
753-
- Add new `hmac` template function for httpjson input {pull}27168[27168]
754717
- Add `timezone` config option to the `decode_cef` processor. {issue}27232[27232] {pull}27727[27727]
755718
- Add `timezone` config option to the `syslog` input. {pull}27727[27727]
756-
- Update `tags` and `threatintel.indicator.provider` fields in `threatintel.anomali` ingest pipeline {issue}24746[24746] {pull}27141[27141]
757-
- Move AWS module and filesets to GA. {pull}27428[27428]
758-
- update ecs.version to ECS 1.11.0. {pull}27107[27107]
759719
- Added support for parsing syslog dates containing a leading 0 (e.g. `Sep 01`) rather than a space. {pull}27775[27775]
760720
- Add base64 Encode functionality to httpjson input. {pull}27681[27681]
761721
- Add `join` and `sprintf` functions to `httpjson` input. {pull}27735[27735]

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pipeline {
3636
rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
3737
}
3838
triggers {
39-
issueCommentTrigger('(?i)(.*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*|^/test(?:\\W+.*)?$)')
39+
issueCommentTrigger("${obltGitHubComments()}")
4040
}
4141
parameters {
4242
booleanParam(name: 'allCloudTests', defaultValue: false, description: 'Run all cloud integration tests.')

‎libbeat/docs/release.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ upgrade.
1010

1111
* <<release-notes-8.0.0-alpha2>>
1212
* <<release-notes-8.0.0-alpha1>>
13+
* <<release-notes-7.15.0>>
1314
* <<release-notes-7.14.2>>
1415
* <<release-notes-7.14.1>>
1516
* <<release-notes-7.14.0>>

‎x-pack/metricbeat/module/ibmmq/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ version: '2.3'
22

33
services:
44
ibmmq:
5-
image: docker.elastic.co/integrations-ci/beats-ibmmq:${IBMMQ_VERSION:-9.1.4.0-r1-amd64}-1
5+
image: docker.elastic.co/integrations-ci/beats-ibmmq:${IBMMQ_VERSION:-9.1.5.0-r2-amd64}-1
66
build:
77
context: ./_meta
88
args:
9-
IBMMQ_VERSION: ${IBMMQ_VERSION:-9.1.4.0-r1-amd64}
9+
IBMMQ_VERSION: ${IBMMQ_VERSION:-9.1.5.0-r2-amd64}
1010
ports:
1111
- 9157

0 commit comments

Comments
 (0)