Skip to content

Commit

Permalink
Merge origin/master
Browse files Browse the repository at this point in the history
  • Loading branch information
marclop committed Nov 4, 2021
2 parents b272591 + 0d7f8a4 commit 453ba0e
Show file tree
Hide file tree
Showing 17 changed files with 1,526 additions and 253 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Enable IMDSv2 support for `add_cloud_metadata` processor on AWS. {issue}22101[22101] {pull}28285[28285]
- Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917]
- Previously, RE2 and thus Golang had a bug where `(|a)*` matched more characters than `(|a)+`. To stay consistent with PCRE, the bug was fixed. Configurations that rely on the old, buggy behaviour has to be adjusted. See more about Golang bug: https://github.com/golang/go/issues/46123 {pull}27543[27543]
- Update docker client. {pull}28716[28716]
- Remove `auto` from the available options of `setup.ilm.enabled` and set the default value to `true`. {pull}28671[28671]

*Auditbeat*
Expand Down Expand Up @@ -129,6 +130,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix handling of float data types within processors. {issue}28279[28279] {pull}28280[28280]
- Allow `clone3` syscall in seccomp filters. {pull}28117[28117]
- Remove unnecessary escaping step in dashboard loading, so they can be displayed in Kibana. {pull}28395[28395]
- Fix AWS proxy_url config from url to string type. {pull}28725[28725]
- Fix `fingerprint` processor to give it access to the `@timestamp` field. {issue}28683[28683]

*Auditbeat*
Expand Down Expand Up @@ -263,6 +265,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update cloud.google.com/go library. {pull}28229[28229]
- Add additional metadata to the root HTTP endpoint. {pull}28265[28265]
- Upgrade k8s.io/client-go library. {pull}28228[28228]
- Upgrade prometheus library. {pull}28716[28716]
- Name all k8s workqueue. {pull}28085[28085]
- Update kubernetes scheduler and controllermanager endpoints in elastic-agent-standalone-kubernetes.yaml with secure ports {pull}28675[28675]
- Add options to configure k8s client qps/burst. {pull}28151[28151]
Expand Down
670 changes: 554 additions & 116 deletions NOTICE.txt

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions auditbeat/module/file_integrity/flatbuffers.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// Requires the Google flatbuffer compiler.
//go:generate flatc --go schema.fbs

var actionMap = map[Action]byte{
var actionMap = map[Action]schema.Action{
AttributesModified: schema.ActionAttributesModified,
Created: schema.ActionCreated,
Deleted: schema.ActionDeleted,
Expand Down Expand Up @@ -113,7 +113,7 @@ func fbWriteHash(b *flatbuffers.Builder, hashes map[HashType]Digest) flatbuffers
case SHA512_256:
schema.HashAddSha512256(b, offset)
case XXH64:
schema.HashAddXx64(b, offset)
schema.HashAddXxh64(b, offset)
}
}
return schema.HashEnd(b)
Expand Down Expand Up @@ -189,9 +189,9 @@ func fbWriteEvent(b *flatbuffers.Builder, e *Event) flatbuffers.UOffsetT {
schema.EventAddTargetPath(b, targetPathOffset)
}

var action byte
var action schema.Action
for k, v := range actionMap {
if 0 != e.Action&k {
if e.Action&k != 0 {
action |= v
}
}
Expand Down Expand Up @@ -227,7 +227,7 @@ func fbDecodeEvent(path string, buf []byte) *Event {

action := e.Action()
for k, v := range actionMap {
if 0 != action&v {
if action&v != 0 {
rtn.Action |= k
}
}
Expand Down Expand Up @@ -329,8 +329,8 @@ func fbDecodeHash(e *schema.Event) map[HashType]Digest {
length = hash.Sha512256Length()
producer = hash.Sha512256
case XXH64:
length = hash.Xx64Length()
producer = hash.Xx64
length = hash.Xxh64Length()
producer = hash.Xxh64
default:
panic(errors.Errorf("unhandled hash type: %v", hashType))
}
Expand Down
36 changes: 28 additions & 8 deletions auditbeat/module/file_integrity/schema/Action.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 20 additions & 13 deletions auditbeat/module/file_integrity/schema/Event.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 453ba0e

Please sign in to comment.