Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change event.type to auditd.message_type #10536

Merged
merged 2 commits into from
Feb 5, 2019
Merged

Change event.type to auditd.message_type #10536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ac3343
Change event.type to auditd.message_type
andrewkroh Feb 4, 2019
dfb52cc
Update ecs-migration.yml
andrewkroh Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
FIM module. {pull}10195[10195]
- Field `file.origin` changed type from `text` to `keyword`. {pull}10544[10544]
- Rename user fields to ECS in auditd module. {pull}10456[10456]
- Rename `event.type` to `auditd.message_type` in auditd module because event.type is reserved for future use by ECS. {pull}10536[10536]

*Filebeat*

Expand Down
1 change: 1 addition & 0 deletions auditbeat/docs/breaking.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ In version 7.0 the following fields were renamed.
[frame="topbot",options="header"]
|======================
|Old Field|New Field
|`event.type` |`auditd.message_type`
|`process.cwd` |`process.working_directory`
|`source.hostname` |`source.domain`
|`user.auid` |`user.audit.id`
Expand Down
12 changes: 12 additions & 0 deletions auditbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,18 @@ This is the path associated with a unix socket.
--


*`auditd.message_type`*::
+
--
type: keyword

example: syscall

The audit message type (e.g. syscall or apparmor_denied).


--

*`auditd.sequence`*::
+
--
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/module/auditd/_meta/accept.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"syscall": "accept",
"tty": "(none)"
},
"message_type": "syscall",
"result": "success",
"sequence": 8832,
"session": "unset",
Expand All @@ -34,8 +35,7 @@
"event": {
"action": "accepted-connection-from",
"category": "audit-rule",
"module": "auditd",
"type": "syscall"
"module": "auditd"
},
"network": {
"direction": "incoming"
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/module/auditd/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"op": "login",
"terminal": "sshd"
},
"message_type": "user_login",
"result": "fail",
"sequence": 19955,
"session": "unset",
Expand All @@ -29,8 +30,7 @@
"event": {
"action": "logged-in",
"category": "user-login",
"module": "auditd",
"type": "user_login"
"module": "auditd"
},
"network": {
"direction": "incoming"
Expand Down
4 changes: 2 additions & 2 deletions auditbeat/module/auditd/_meta/execve.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"syscall": "execve",
"tty": "pts0"
},
"message_type": "syscall",
"paths": [
{
"dev": "08:01",
Expand Down Expand Up @@ -53,8 +54,7 @@
"event": {
"action": "executed",
"category": "audit-rule",
"module": "auditd",
"type": "syscall"
"module": "auditd"
},
"file": {
"device": "00:00",
Expand Down
5 changes: 5 additions & 0 deletions auditbeat/module/auditd/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@
- name: auditd
type: group
fields:
- name: message_type
type: keyword
example: syscall
description: >
The audit message type (e.g. syscall or apparmor_denied).
- name: sequence
type: long
description: >
Expand Down
10 changes: 5 additions & 5 deletions auditbeat/module/auditd/audit_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,15 +472,15 @@ func buildMetricbeatEvent(msgs []*auparse.AuditMessage, config Config) mb.Event
RootFields: common.MapStr{
"event": common.MapStr{
"category": auditEvent.Category.String(),
"type": strings.ToLower(auditEvent.Type.String()),
"action": auditEvent.Summary.Action,
},
},
ModuleFields: common.MapStr{
"sequence": auditEvent.Sequence,
"result": auditEvent.Result,
"session": auditEvent.Session,
"data": createAuditdData(auditEvent.Data),
"message_type": strings.ToLower(auditEvent.Type.String()),
"sequence": auditEvent.Sequence,
"result": auditEvent.Result,
"session": auditEvent.Session,
"data": createAuditdData(auditEvent.Data),
},
}

Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/auditd/fields.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions dev-tools/ecs-migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,12 @@
alias: true
beat: auditbeat

- from: event.type
to: auditd.message_type
alias: false
beat: auditbeat
comment: event.type is reserved for future use by ECS.

# Metricbeat

## Metricbeat base fields
Expand Down