Skip to content

Commit bd1e4b4

Browse files
committed
Merge remote-tracking branch 'origin/master' into nomad-watcher-fix-allocation-update
2 parents 0184402 + 668da78 commit bd1e4b4

1,361 files changed

Lines changed: 64655 additions & 59571 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.

.ci/jobs/beats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
discover-pr-forks-strategy: 'merge-current'
1818
discover-pr-forks-trust: 'permission'
1919
discover-pr-origin: 'merge-current'
20-
head-filter-regex: '(master|6\.[89]|7\.[x789]|7\.1\d|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
20+
head-filter-regex: '(master|6\.[89]|7\.16|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
2121
discover-tags: true
2222
notification-context: "beats-ci"
2323
repo: 'beats'

.ci/schedule-daily.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ pipeline {
2121
stage('Nighly beats builds') {
2222
steps {
2323
runBuild(quietPeriod: 0, job: 'Beats/beats/master')
24-
runBuild(quietPeriod: 2000, job: 'Beats/beats/7.16')
25-
runBuild(quietPeriod: 4000, job: 'Beats/beats/7.15')
24+
// This should be `current_8` bump.getCurrentMinorReleaseFor8
25+
runBuild(quietPeriod: 2000, job: 'Beats/beats/8.0')
26+
// This should be `current_7` bump.getCurrentMinorReleaseFor7 or
27+
// `next_minor_7` bump.getNextMinorReleaseFor7
28+
runBuild(quietPeriod: 4000, job: 'Beats/beats/7.16')
2629
}
2730
}
2831
}

.ci/schedule-weekly.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ pipeline {
2121
stage('Weekly beats builds') {
2222
steps {
2323
runBuild(quietPeriod: 0, job: 'Beats/beats/master')
24-
runBuild(quietPeriod: 1000, job: 'Beats/beats/7.16')
25-
runBuild(quietPeriod: 2000, job: 'Beats/beats/7.15')
24+
// This should be `current_8` bump.getCurrentMinorReleaseFor8
25+
runBuild(quietPeriod: 1000, job: 'Beats/beats/8.0')
26+
// This should be `current_7` bump.getCurrentMinorReleaseFor7 or
27+
// `next_minor_7` bump.getNextMinorReleaseFor7
28+
runBuild(quietPeriod: 2000, job: 'Beats/beats/7.16')
2629
}
2730
}
2831
}

.mergify.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,24 @@ pull_request_rules:
101101
- files~=^\.mergify\.yml$
102102
actions:
103103
delete_head_branch:
104+
- name: notify the backport has not been merged yet
105+
conditions:
106+
- -merged
107+
- -closed
108+
- author=mergify[bot]
109+
- "#check-success>0"
110+
- schedule=Mon-Mon 06:00-10:00[Europe/Paris]
111+
- "#assignee>=1"
112+
actions:
113+
comment:
114+
message: |
115+
This pull request has not been merged yet. Could you please review and merge it @{{ assignee | join(', @') }}? 🙏
104116
- name: notify the backport policy
105117
conditions:
106118
- -label~=^backport
107119
- base=master
120+
- -merged
121+
- -closed
108122
actions:
109123
comment:
110124
message: |
@@ -120,6 +134,8 @@ pull_request_rules:
120134
- name: remove-backport label
121135
conditions:
122136
- label~=backport-v
137+
- -merged
138+
- -closed
123139
actions:
124140
label:
125141
remove:

CHANGELOG-developer.next.asciidoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
5656
- Remove Metricbeat EventFetcher and EventsFetcher interface. Use the reporter interface instead. {pull}25093[25093]
5757
- Update Darwin build image to a debian 10 base that increases the MacOS SDK and minimum supported version used in build to 10.14. {issue}24193[24193]
5858
- Removed the `common.Float` type. {issue}28279[28279] {pull}28280[28280] {pull}28376[28376]
59+
- Removed Beat generators. {pull}28816[28816]
60+
- libbeat.logp package forces ECS compliant logs. Logs are JSON formatted. Options to enable ECS/JSON have been removed. {issue}15544[15544] {pull}28573[28573]
5961

6062
==== Bugfixes
6163

@@ -129,3 +131,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
129131
==== Deprecated
130132

131133
- Deprecated the `common.Float` type. {issue}28279[28279] {pull}28280[28280]
134+
- Deprecate Beat generators. {pull}28814[28814]

CHANGELOG.asciidoc

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
:issue: https://github.com/elastic/beats/issues/
44
:pull: https://github.com/elastic/beats/pull/
55

6+
[[release-notes-8.0.0-beta1]]
7+
=== Beats version 8.0.0-beta1
8+
9+
Changes will be described in a later RC / GA.
10+
611
[[release-notes-8.0.0-alpha2]]
712
=== Beats version 8.0.0-alpha2
813

@@ -12,6 +17,37 @@ Changes will be described in a later alpha / beta.
1217
=== Beats version 8.0.0-alpha1
1318

1419
Changes will be described in a later alpha / beta.
20+
[[release-notes-7.15.2]]
21+
=== Beats version 7.15.2
22+
https://github.com/elastic/beats/compare/v7.15.1...v7.15.2[View commits]
23+
24+
==== Bugfixes
25+
26+
*Affecting all Beats*
27+
28+
- Beats dashboards use custom index when `setup.dashboards.index` is set. {issue}21232[21232] {pull}27901[27901]
29+
- Fix handling of float data types within processors. {issue}28279[28279] {pull}28280[28280]
30+
- Allow `clone3` syscall in seccomp filters. {pull}28117[28117]
31+
- Remove unnecessary escaping step in dashboard loading, so they can be displayed in Kibana. {pull}28395[28395]
32+
- Fix AWS proxy_url config from url to string type. {pull}28725[28725]
33+
- Fix `fingerprint` processor to give it access to the `@timestamp` field. {issue}28683[28683]
34+
35+
*Filebeat*
36+
37+
- Fix initialization of http client in Cloudfoundry input. {issue}28271[28271] {pull}28277[28277]
38+
- Fix aws-s3 input by checking if GetObject API call response content type exists. {pull}28457[28457]
39+
- Set `url` as a pointer in the `httpjson` template context to ensure access to all methods. {pull}28695[28695]
40+
- Fix `google_workspace` documentation links. {pull}28657[28657]
41+
42+
*Metricbeat*
43+
44+
- Divide RDS metric cpu.total.pct by 100. {pull}28456[28456]
45+
46+
*Packetbeat*
47+
48+
- Handle truncated DNS records more gracefully. {issue}21495[21495] {pull}28297[28297]
49+
- Fix data stream name for network flows when running under Elastic Agent and Fleet. {pull}28408[28408]
50+
1551
[[release-notes-7.15.1]]
1652
=== Beats version 7.15.1
1753
https://github.com/elastic/beats/compare/v7.15.0...v7.15.1[View commits]
@@ -69,7 +105,6 @@ https://github.com/elastic/beats/compare/v7.14.2...v7.15.0[View commits]
69105
*Auditbeat*
70106

71107
- File Integrity Module: Honor `include_files` when doing initial scan. {issue}27273[27273] {pull}27722[27722]
72-
- Fix handling of root and relative paths {issue}24430[24430] {pull}28354[28354]
73108

74109
*Filebeat*
75110

0 commit comments

Comments
 (0)