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

[Filebeat] Ensure Kibana audit event.category and event.type are still processed as strings. #25101

Merged
merged 2 commits into from
Apr 20, 2021
Merged

[Filebeat] Ensure Kibana audit event.category and event.type are still processed as strings. #25101

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
8e8a59d
Ensure event.category and event.type are still processed as strings.
lukeelmers Apr 15, 2021
84e3f9b
Check that category and type are a list & update tests.
lukeelmers Apr 15, 2021
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
12 changes: 10 additions & 2 deletions filebeat/module/kibana/audit/ingest/pipeline-json.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,23 @@ processors:
field: event.action
value: "{{kibana._audit_temp.event.action}}"
- set:
if: ctx.kibana._audit_temp.event.category != null
if: ctx.kibana._audit_temp.event.category != null && ctx.kibana._audit_temp.event.category instanceof List
field: event.category
value: "{{kibana._audit_temp.event.category.0}}"
- set:
if: ctx.kibana._audit_temp.event.category != null && ctx.kibana._audit_temp.event.category instanceof String
field: event.category
value: "{{kibana._audit_temp.event.category}}"
- set:
if: ctx.kibana._audit_temp.event.outcome != null
field: event.outcome
value: "{{kibana._audit_temp.event.outcome}}"
- set:
if: ctx.kibana._audit_temp.event.type != null
if: ctx.kibana._audit_temp.event.type != null && ctx.kibana._audit_temp.event.type instanceof List
field: event.type
value: "{{kibana._audit_temp.event.type.0}}"
- set:
if: ctx.kibana._audit_temp.event.type != null && ctx.kibana._audit_temp.event.type instanceof String
field: event.type
value: "{{kibana._audit_temp.event.type}}"
lukeelmers marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
4 changes: 4 additions & 0 deletions filebeat/module/kibana/audit/test/test-audit-713.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{"@timestamp":"2020-12-09T11:57:34.870-05:00","message":"User is requesting [/foo/spaces/enter] endpoint","log":{"level":"INFO","logger":"plugins.security.audit.ecs"},"process":{"pid":20699},"ecs":{"version":"1.9.0"},"event":{"action":"http_request","category":["web"],"outcome":"unknown"},"http":{"request":{"method":"get"}},"url":{"domain":"0.0.0.0","path":"/foo/spaces/enter","port":5603,"scheme":"https:"},"user":{"name":"elastic","roles":["superuser"]},"kibana":{"space_id":"default"},"trace":{"id":"71a7d4d1-e9ba-474c-a844-9d9c1dc11ba5"}}
{"@timestamp":"2020-12-09T11:59:21.458-05:00","message":"User [elastic] has logged in using basic provider [name=basic]","log":{"level":"INFO","logger":"plugins.security.audit.ecs"},"process":{"pid":20699},"ecs":{"version":"1.9.0"},"event":{"action":"user_login","category":["authentication"],"outcome":"success"},"user":{"name":"elastic","roles":["superuser"]},"kibana":{"authentication_provider":"basic","authentication_type":"basic","authentication_realm":"reserved","lookup_realm":"reserved"},"trace":{"id":"a400bdb7-d279-44c1-b009-bc803809872f"}}
{"@timestamp":"2020-12-09T12:01:36.210-05:00","message":"User is creating index-pattern [id=325b1500-3a40-11eb-a93c-7bbeae51ac96]","log":{"level":"INFO","logger":"plugins.security.audit.ecs"},"process":{"pid":20699},"ecs":{"version":"1.9.0"},"event":{"action":"saved_object_create","category":["database"],"type":["creation"],"outcome":"unknown"},"kibana":{"space_id":"default","saved_object":{"type":"index-pattern","id":"325b1500-3a40-11eb-a93c-7bbeae51ac96"}},"user":{"name":"elastic","roles":["superuser"]},"trace":{"id":"b1c237a9-5edd-4653-92bc-350feb8e1530"}}
{"@timestamp":"2020-12-09T12:01:37.281-05:00","message":"User has accessed index-pattern [id=325b1500-3a40-11eb-a93c-7bbeae51ac96]","log":{"level":"INFO","logger":"plugins.security.audit.ecs"},"process":{"pid":20699},"ecs":{"version":"1.9.0"},"event":{"action":"saved_object_get","category":"database","type":"access","outcome":"success"},"kibana":{"space_id":"default","saved_object":{"type":"index-pattern","id":"325b1500-3a40-11eb-a93c-7bbeae51ac96"}},"user":{"name":"elastic","roles":["superuser"]},"trace":{"id":"17819e5b-187a-4107-944e-6295925d08be"}}
113 changes: 113 additions & 0 deletions filebeat/module/kibana/audit/test/test-audit-713.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
[
{
"@timestamp": "2020-12-09T11:57:34.870-05:00",
"event.action": "http_request",
"event.category": "web",
"event.dataset": "kibana.audit",
"event.kind": "event",
"event.module": "kibana",
"event.outcome": "unknown",
"event.timezone": "-02:00",
"fileset.name": "audit",
"http.request.method": "get",
"input.type": "log",
"kibana.space_id": "default",
"log.offset": 0,
"message": "User is requesting [/foo/spaces/enter] endpoint",
"process.pid": 20699,
"related.user": [
"elastic"
],
"service.type": "kibana",
"trace.id": "71a7d4d1-e9ba-474c-a844-9d9c1dc11ba5",
"url.domain": "0.0.0.0",
"url.original": "/foo/spaces/enter",
"url.path": "/foo/spaces/enter",
"url.port": 5603,
"url.scheme": "https:",
"user.name": "elastic",
"user.roles": [
"superuser"
]
},
{
"@timestamp": "2020-12-09T11:59:21.458-05:00",
"event.action": "user_login",
"event.category": "authentication",
"event.dataset": "kibana.audit",
"event.kind": "event",
"event.module": "kibana",
"event.outcome": "success",
"event.timezone": "-02:00",
"fileset.name": "audit",
"input.type": "log",
"log.offset": 545,
"message": "User [elastic] has logged in using basic provider [name=basic]",
"process.pid": 20699,
"related.user": [
"elastic"
],
"service.type": "kibana",
"trace.id": "a400bdb7-d279-44c1-b009-bc803809872f",
"user.name": "elastic",
"user.roles": [
"superuser"
]
},
{
"@timestamp": "2020-12-09T12:01:36.210-05:00",
"event.action": "saved_object_create",
"event.category": "database",
"event.dataset": "kibana.audit",
"event.kind": "event",
"event.module": "kibana",
"event.outcome": "unknown",
"event.timezone": "-02:00",
"event.type": "creation",
"fileset.name": "audit",
"input.type": "log",
"kibana.saved_object.id": "325b1500-3a40-11eb-a93c-7bbeae51ac96",
"kibana.saved_object.type": "index-pattern",
"kibana.space_id": "default",
"log.offset": 1097,
"message": "User is creating index-pattern [id=325b1500-3a40-11eb-a93c-7bbeae51ac96]",
"process.pid": 20699,
"related.user": [
"elastic"
],
"service.type": "kibana",
"trace.id": "b1c237a9-5edd-4653-92bc-350feb8e1530",
"user.name": "elastic",
"user.roles": [
"superuser"
]
},
{
"@timestamp": "2020-12-09T12:01:37.281-05:00",
"event.action": "saved_object_get",
"event.category": "database",
"event.dataset": "kibana.audit",
"event.kind": "event",
"event.module": "kibana",
"event.outcome": "success",
"event.timezone": "-02:00",
"event.type": "access",
"fileset.name": "audit",
"input.type": "log",
"kibana.saved_object.id": "325b1500-3a40-11eb-a93c-7bbeae51ac96",
"kibana.saved_object.type": "index-pattern",
"kibana.space_id": "default",
"log.offset": 1663,
"message": "User has accessed index-pattern [id=325b1500-3a40-11eb-a93c-7bbeae51ac96]",
"process.pid": 20699,
"related.user": [
"elastic"
],
"service.type": "kibana",
"trace.id": "17819e5b-187a-4107-944e-6295925d08be",
"user.name": "elastic",
"user.roles": [
"superuser"
]
}
]