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

Suricata: Rename event.type to suricata.eve.event_type #10575

Merged
merged 4 commits into from
Feb 5, 2019
Merged

Suricata: Rename event.type to suricata.eve.event_type #10575

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0dc99a
Suricata: Rename event.type to suricata.eve.event_type
adriansr Feb 5, 2019
3a8fa9f
Reference PR in CHANGELOG
adriansr Feb 5, 2019
ad2efcf
Migrate 6.x event.type to s.e.event_type
adriansr Feb 5, 2019
57ae776
Set event.kind to event
adriansr Feb 5, 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 @@ -84,6 +84,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
still used for matcher. {issue}10505[10505] {pull}10506[10506]
- Change type of haproxy.source from text to keyword. {pull}10506[10506]
- Populate more ECS fields in the Suricata module. {pull}10006[10006]
- Rename `event.type` to `suricata.eve.event_type` in Suricata module because event.type is reserved for future use by ECS. {pull}10575[10575]

*Heartbeat*

Expand Down
11 changes: 6 additions & 5 deletions dev-tools/ecs-migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,6 @@
alias: true
beat: filebeat

- from: suricata.eve.event_type
to: event.type
alias: true
beat: filebeat

- from: suricata.eve.fileinfo.filename
to: file.path
alias: true
Expand Down Expand Up @@ -444,6 +439,12 @@
alias: true
beat: filebeat

- from: event.type
to: suricata.eve.event_type
alias: false
beat: auditbeat
comment: event.type is reserved for future use by ECS.

## System module

- from: system.syslog.hostname
Expand Down
4 changes: 1 addition & 3 deletions filebeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11324,9 +11324,7 @@ Fields exported by the EVE JSON logs
*`suricata.eve.event_type`*::
+
--
type: alias

alias to: event.type
type: keyword

--

Expand Down
4 changes: 2 additions & 2 deletions ...k/filebeat/module/suricata/_meta/kibana/7/dashboard/Filebeat-Suricata-Alert-Overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
"alias": null,
"disabled": false,
"index": "filebeat-*",
"key": "event.type",
"key": "suricata.eve.event_type",
"negate": false,
"params": {
"query": "alert",
Expand All @@ -257,7 +257,7 @@
},
"query": {
"match": {
"event.type": {
"suricata.eve.event_type": {
"query": "alert",
"type": "phrase"
}
Expand Down
14 changes: 7 additions & 7 deletions x-pack/filebeat/module/suricata/_meta/kibana/7/dashboard/Filebeat-Suricata-Overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"enabled": true,
"id": "3",
"params": {
"field": "event.type",
"field": "suricata.eve.event_type",
"missingBucket": false,
"missingBucketLabel": "Missing",
"order": "desc",
Expand Down Expand Up @@ -161,7 +161,7 @@
"enabled": true,
"id": "2",
"params": {
"field": "event.type",
"field": "suricata.eve.event_type",
"missingBucket": false,
"missingBucketLabel": "Missing",
"order": "desc",
Expand Down Expand Up @@ -396,7 +396,7 @@
"attributes": {
"columns": [
"host.name",
"event.type",
"suricata.eve.event_type",
"suricata.eve.flow_id",
"network.transport",
"source.ip",
Expand All @@ -419,7 +419,7 @@
"alias": null,
"disabled": false,
"index": "filebeat-*",
"key": "event.type",
"key": "suricata.eve.event_type",
"negate": true,
"params": {
"query": "stats",
Expand All @@ -430,7 +430,7 @@
},
"query": {
"match": {
"event.type": {
"suricata.eve.event_type": {
"query": "stats",
"type": "phrase"
}
Expand Down Expand Up @@ -691,7 +691,7 @@
"alias": null,
"disabled": false,
"index": "filebeat-*",
"key": "event.type",
"key": "suricata.eve.event_type",
"negate": false,
"params": {
"query": "stats",
Expand All @@ -702,7 +702,7 @@
},
"query": {
"match": {
"event.type": {
"suricata.eve.event_type": {
"query": "stats",
"type": "phrase"
}
Expand Down
3 changes: 1 addition & 2 deletions x-pack/filebeat/module/suricata/eve/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
Fields exported by the EVE JSON logs
fields:
- name: event_type
type: alias
path: event.type
type: keyword

- name: app_proto_orig
type: keyword
Expand Down
2 changes: 0 additions & 2 deletions x-pack/filebeat/module/suricata/eve/ingest/pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
{
"lowercase": {
"field": "suricata.eve.event_type",
"target_field": "event.type",
"ignore_missing": true
}
},
Expand Down Expand Up @@ -244,7 +243,6 @@
"remove": {
"field": [
"suricata.eve.app_proto",
"suricata.eve.event_type",
"suricata.eve.flow.end",
"suricata.eve.flow.start",
"suricata.eve.http.http_method",
Expand Down
Loading