Skip to content

Commit ff75472

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into offline-to-complete
2 parents cc10638 + 1bfdf95 commit ff75472

56 files changed

Lines changed: 455 additions & 315 deletions

Some content is hidden

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

‎CHANGELOG.next.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
293293
- Convert the o365 module's `client.port` and `source.port` to numbers (from strings) in events. {pull}22939[22939]
294294
- Fix gcp/vpcflow module error where input type was defaulting to file. {pull}24719[24719]
295295
- Fix s3 input when there is a blank line in the log file. {pull}25357[25357]
296+
- Fixes the Snyk module to work with the new API changes. {pull}27358[27358]
296297

297298
*Heartbeat*
298299

@@ -497,8 +498,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
497498
- Allow node/namespace metadata to be disabled on kubernetes metagen and ensure add_kubernetes_metadata honors host {pull}23012[23012]
498499
- Add proxy support for AWS functions. {pull}26832[26832]
499500
- Added policies to the elasticsearch output for non indexible events {pull}26952[26952]
501+
- Add `logging.metrics.namespaces` config option to control what metric groups are reported in logs. {pull}25727[25727]
500502
- Add sha256 digests to RPM packages. {issue}23670[23670]
501503
- Add new 'offline' docker image for Elastic Agent. {pull}27052[27052]
504+
- Add cgroups V2 support {pull}27242[27242]
502505

503506
*Auditbeat*
504507

‎NOTICE.txt‎

Lines changed: 35 additions & 105 deletions
Large diffs are not rendered by default.

‎auditbeat/auditbeat.reference.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ auditbeat.modules:
161161
# Maximum duration after which events are available to the outputs,
162162
# if the number of events stored in the queue is < `flush.min_events`.
163163
#flush.timeout: 1s
164-
164+
165165
# The disk queue stores incoming events on disk until the output is
166166
# ready for them. This allows a higher event limit than the memory-only
167167
# queue and lets pending events persist through a restart.
168168
#disk:
169169
# The directory path to store the queue's data.
170170
#path: "${path.data}/diskqueue"
171-
171+
172172
# The maximum space the queue should occupy on disk. Depending on
173173
# input settings, events that exceed this limit are delayed or discarded.
174174
#max_size: 10GB
@@ -1405,6 +1405,11 @@ setup.kibana:
14051405
# The period after which to log the internal metrics. The default is 30s.
14061406
#logging.metrics.period: 30s
14071407

1408+
# A list of metrics namespaces to report in the logs. Defaults to [stats].
1409+
# `stats` contains general Beat metrics. `dataset` may be present in some
1410+
# Beats and contains module or input metrics.
1411+
#logging.metrics.namespaces: [stats]
1412+
14081413
# Logging to rotating files. Set logging.to_files to false to disable logging to
14091414
# files.
14101415
logging.to_files: true

‎filebeat/filebeat.reference.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,14 +1073,14 @@ filebeat.inputs:
10731073
# Maximum duration after which events are available to the outputs,
10741074
# if the number of events stored in the queue is < `flush.min_events`.
10751075
#flush.timeout: 1s
1076-
1076+
10771077
# The disk queue stores incoming events on disk until the output is
10781078
# ready for them. This allows a higher event limit than the memory-only
10791079
# queue and lets pending events persist through a restart.
10801080
#disk:
10811081
# The directory path to store the queue's data.
10821082
#path: "${path.data}/diskqueue"
1083-
1083+
10841084
# The maximum space the queue should occupy on disk. Depending on
10851085
# input settings, events that exceed this limit are delayed or discarded.
10861086
#max_size: 10GB
@@ -2317,6 +2317,11 @@ setup.kibana:
23172317
# The period after which to log the internal metrics. The default is 30s.
23182318
#logging.metrics.period: 30s
23192319

2320+
# A list of metrics namespaces to report in the logs. Defaults to [stats].
2321+
# `stats` contains general Beat metrics. `dataset` may be present in some
2322+
# Beats and contains module or input metrics.
2323+
#logging.metrics.namespaces: [stats]
2324+
23202325
# Logging to rotating files. Set logging.to_files to false to disable logging to
23212326
# files.
23222327
logging.to_files: true

‎filebeat/input/mqtt/client_mocked.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ func (m *mockedToken) WaitTimeout(time.Duration) bool {
101101
return m.timeout
102102
}
103103

104+
func (m *mockedToken) Done() <-chan struct{} {
105+
ch := make(chan struct{})
106+
close(ch)
107+
return ch
108+
}
109+
104110
func (m *mockedToken) Error() error {
105111
return nil
106112
}

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6
6161
github.com/dustin/go-humanize v1.0.0
6262
github.com/eapache/go-resiliency v1.2.0
63-
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2
63+
github.com/eclipse/paho.mqtt.golang v1.3.5
6464
github.com/elastic/ecs v1.10.0
6565
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6
6666
github.com/elastic/go-concert v0.2.0
@@ -114,7 +114,6 @@ require (
114114
github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd
115115
github.com/jpillora/backoff v1.0.0 // indirect
116116
github.com/kardianos/service v1.2.1-0.20210728001519-a323c3813bc7
117-
github.com/kolide/osquery-go v0.0.0-20200604192029-b019be7063ac
118117
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
119118
github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01
120119
github.com/magefile/mage v1.11.0
@@ -131,6 +130,7 @@ require (
131130
github.com/olekukonko/tablewriter v0.0.5
132131
github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483 // indirect
133132
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect
133+
github.com/osquery/osquery-go v0.0.0-20210622151333-99b4efa62ec5
134134
github.com/otiai10/copy v1.2.0
135135
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
136136
github.com/pkg/errors v0.9.1

‎go.sum‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8
241241
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
242242
github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
243243
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
244-
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2 h1:DW6WrARxK5J+o8uAKCiACi5wy9EK1UzrsCpGBPsKHAA=
245-
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
244+
github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y=
245+
github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc=
246246
github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqrj3lotWinO9+jFmeDXIC4gvIQs=
247247
github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY=
248248
github.com/elastic/ecs v1.10.0 h1:C+0ZidF/eh5DKYAZBir3Hq9Q6aMXcwpgEuQnj4bRzKA=
@@ -412,8 +412,9 @@ github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVf
412412
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA=
413413
github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I=
414414
github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
415-
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
416415
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
416+
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
417+
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
417418
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
418419
github.com/grpc-ecosystem/grpc-gateway v1.13.0 h1:sBDQoHXrOlfPobnKw69FIKa1wg9qsLLvvQ/Y19WtFgI=
419420
github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c=
@@ -496,8 +497,6 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
496497
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
497498
github.com/klauspost/compress v1.11.0 h1:wJbzvpYMVGG9iTI9VxpnNZfd4DzMPoCWze3GgSqz8yg=
498499
github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
499-
github.com/kolide/osquery-go v0.0.0-20200604192029-b019be7063ac h1:TI5z/itepBADxlaodO5U9mmrMHPu8Wb8Jt9Gea6vK4Y=
500-
github.com/kolide/osquery-go v0.0.0-20200604192029-b019be7063ac/go.mod h1:rp36fokOKgd/5mOgbvv4fkpdaucQ43mnvb+8BR62Xo8=
501500
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
502501
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
503502
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -598,6 +597,8 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm
598597
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
599598
github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
600599
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
600+
github.com/osquery/osquery-go v0.0.0-20210622151333-99b4efa62ec5 h1:E275nJIUAvIK/RSN8cq9MAcRLk23jaZq+s24B0I8bEw=
601+
github.com/osquery/osquery-go v0.0.0-20210622151333-99b4efa62ec5/go.mod h1:JKR5QhjsYdnIPY7hakgas5sxf8qlA/9wQnLqaMfWdcg=
601602
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
602603
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
603604
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -833,6 +834,7 @@ golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLL
833834
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
834835
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
835836
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
837+
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
836838
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
837839
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
838840
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
@@ -853,7 +855,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
853855
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
854856
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
855857
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
856-
golang.org/x/sys v0.0.0-20180815093151-14742f9018cd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
857858
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
858859
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
859860
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -893,6 +894,7 @@ golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7w
893894
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
894895
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
895896
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
897+
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
896898
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
897899
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
898900
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎heartbeat/heartbeat.reference.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,14 @@ heartbeat.scheduler:
292292
# Maximum duration after which events are available to the outputs,
293293
# if the number of events stored in the queue is < `flush.min_events`.
294294
#flush.timeout: 1s
295-
295+
296296
# The disk queue stores incoming events on disk until the output is
297297
# ready for them. This allows a higher event limit than the memory-only
298298
# queue and lets pending events persist through a restart.
299299
#disk:
300300
# The directory path to store the queue's data.
301301
#path: "${path.data}/diskqueue"
302-
302+
303303
# The maximum space the queue should occupy on disk. Depending on
304304
# input settings, events that exceed this limit are delayed or discarded.
305305
#max_size: 10GB
@@ -1536,6 +1536,11 @@ setup.kibana:
15361536
# The period after which to log the internal metrics. The default is 30s.
15371537
#logging.metrics.period: 30s
15381538

1539+
# A list of metrics namespaces to report in the logs. Defaults to [stats].
1540+
# `stats` contains general Beat metrics. `dataset` may be present in some
1541+
# Beats and contains module or input metrics.
1542+
#logging.metrics.namespaces: [stats]
1543+
15391544
# Logging to rotating files. Set logging.to_files to false to disable logging to
15401545
# files.
15411546
logging.to_files: true

‎journalbeat/journalbeat.reference.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ setup.template.settings:
104104
# Maximum duration after which events are available to the outputs,
105105
# if the number of events stored in the queue is < `flush.min_events`.
106106
#flush.timeout: 1s
107-
107+
108108
# The disk queue stores incoming events on disk until the output is
109109
# ready for them. This allows a higher event limit than the memory-only
110110
# queue and lets pending events persist through a restart.
111111
#disk:
112112
# The directory path to store the queue's data.
113113
#path: "${path.data}/diskqueue"
114-
114+
115115
# The maximum space the queue should occupy on disk. Depending on
116116
# input settings, events that exceed this limit are delayed or discarded.
117117
#max_size: 10GB
@@ -1348,6 +1348,11 @@ setup.kibana:
13481348
# The period after which to log the internal metrics. The default is 30s.
13491349
#logging.metrics.period: 30s
13501350

1351+
# A list of metrics namespaces to report in the logs. Defaults to [stats].
1352+
# `stats` contains general Beat metrics. `dataset` may be present in some
1353+
# Beats and contains module or input metrics.
1354+
#logging.metrics.namespaces: [stats]
1355+
13511356
# Logging to rotating files. Set logging.to_files to false to disable logging to
13521357
# files.
13531358
logging.to_files: true

‎libbeat/_meta/config/general.reference.yml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
# Maximum duration after which events are available to the outputs,
4242
# if the number of events stored in the queue is < `flush.min_events`.
4343
#flush.timeout: 1s
44-
44+
4545
# The disk queue stores incoming events on disk until the output is
4646
# ready for them. This allows a higher event limit than the memory-only
4747
# queue and lets pending events persist through a restart.
4848
#disk:
4949
# The directory path to store the queue's data.
5050
#path: "${path.data}/diskqueue"
51-
51+
5252
# The maximum space the queue should occupy on disk. Depending on
5353
# input settings, events that exceed this limit are delayed or discarded.
5454
#max_size: 10GB

0 commit comments

Comments
 (0)