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.

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] Improve ECS categorization field mappings for azure module #19376

Merged
merged 4 commits into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Changed the panw module to pass through (rather than drop) message types other than threat and traffic. {issue}16815[16815] {pull}19375[19375]
- Add support for timezone offsets and `Z` to decode_cef timestamp parser. {pull}19346[19346]
- Improve ECS categorization field mappings in traefik module. {issue}16183[16183] {pull}19379[19379]
- Improve ECS categorization field mappings in azure module. {issue}16155[16155] {pull}19376[19376]

*Heartbeat*

Expand Down
50 changes: 50 additions & 0 deletions filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2335,6 +2335,16 @@ type: keyword
Operation name


type: keyword

--

*`azure.activitylogs.result_type`*::
+
--
Result type


type: keyword

--
Expand All @@ -2355,6 +2365,16 @@ type: keyword
Category


type: keyword

--

*`azure.activitylogs.event_category`*::
+
--
Event Category


type: keyword

--
Expand Down Expand Up @@ -2393,6 +2413,16 @@ Fields for Azure audit logs.



*`azure.auditlogs.category`*::
+
--
The category of the operation. Currently, Audit is the only supported value.


type: keyword

--

*`azure.auditlogs.operation_name`*::
+
--
Expand Down Expand Up @@ -2788,6 +2818,16 @@ type: keyword
Result description


type: keyword

--

*`azure.signinlogs.result_type`*::
+
--
Result type


type: keyword

--
Expand All @@ -2798,6 +2838,16 @@ type: keyword
Identity


type: keyword

--

*`azure.signinlogs.category`*::
+
--
Category


type: keyword

--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
"default_timefield": "@timestamp",
"filter": {
"language": "kuery",
"query": "event.dataset :\"azure.activitylogs\" and event.category : \"Alert\""
"query": "event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"Alert\""
},
"id": "61ca57f0-469d-11e7-af02-69e470af7417",
"index_pattern": "filebeat-*",
Expand All @@ -259,7 +259,7 @@
"fill": 0.5,
"filter": {
"language": "kuery",
"query": "event.outcome: \"Activated\""
"query": "azure.activitylogs.result_type: \"Activated\""
},
"formatter": "number",
"hide_in_legend": 0,
Expand All @@ -283,7 +283,7 @@
"fill": 0.5,
"filter": {
"language": "kuery",
"query": "event.outcome: \"Resolved\" or event.outcome: \"Succeeded\""
"query": "azure.activitylogs.result_type: \"Resolved\" or azure.activitylogs.result_type: \"Succeeded\""
},
"formatter": "number",
"hide_in_legend": 0,
Expand Down Expand Up @@ -328,7 +328,7 @@
"indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index",
"query": {
"language": "kuery",
"query": "event.dataset :\"azure.activitylogs\" and event.category : \"Alert\" "
"query": "event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"Alert\" "
}
}
},
Expand All @@ -354,21 +354,21 @@
{
"input": {
"language": "kuery",
"query": "event.outcome : \"Activated\""
"query": "azure.activitylogs.result_type : \"Activated\""
},
"label": "Activated"
},
{
"input": {
"language": "kuery",
"query": "event.outcome : \"Resolved\""
"query": "azure.activitylogs.result_type : \"Resolved\""
},
"label": "Resolved"
},
{
"input": {
"language": "kuery",
"query": "event.outcome : \"Succeeded\""
"query": "azure.activitylogs.result_type : \"Succeeded\""
},
"label": "Succeeded"
}
Expand Down Expand Up @@ -455,7 +455,7 @@
"indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index",
"query": {
"language": "kuery",
"query": "event.dataset :\"azure.activitylogs\" and event.category : \"Alert\" "
"query": "event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"Alert\" "
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
"default_timefield":"@timestamp",
"filter":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category :\"Administrative\" "
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category :\"Administrative\" "
},
"id":"61ca57f0-469d-11e7-af02-69e470af7417",
"index_pattern":"filebeat-*",
Expand Down Expand Up @@ -874,7 +874,7 @@
"default_timefield":"@timestamp",
"filter":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category : \"Alert\""
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"Alert\""
},
"id":"61ca57f0-469d-11e7-af02-69e470af7417",
"index_pattern":"filebeat-*",
Expand All @@ -888,7 +888,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome: \"Activated\""
"query":"azure.activitylogs.result_type: \"Activated\""
},
"formatter":"number",
"hide_in_legend":0,
Expand All @@ -912,7 +912,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome: \"Resolved\" or event.outcome: \"Succeeded\""
"query":"azure.activitylogs.result_type: \"Resolved\" or azure.activitylogs.result_type: \"Succeeded\""
},
"formatter":"number",
"hide_in_legend":0,
Expand Down Expand Up @@ -981,7 +981,7 @@
"default_timefield":"@timestamp",
"filter":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category : \"ServiceHealth\""
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"ServiceHealth\""
},
"id":"61ca57f0-469d-11e7-af02-69e470af7417",
"index_pattern":"filebeat-*",
Expand All @@ -995,7 +995,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome: \"Active\""
"query":"azure.activitylogs.result_type: \"Active\""
},
"formatter":"number",
"hide_in_legend":0,
Expand All @@ -1019,7 +1019,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome: \"Resolved\" "
"query":"azure.activitylogs.result_type: \"Resolved\" "
},
"formatter":"number",
"hide_in_legend":0,
Expand Down Expand Up @@ -1243,7 +1243,7 @@
"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index",
"query":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category : \"Alert\" "
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"Alert\" "
}
}
},
Expand Down Expand Up @@ -1271,21 +1271,21 @@
{
"input":{
"language":"kuery",
"query":"event.outcome : \"Activated\""
"query":"azure.activitylogs.result_type : \"Activated\""
},
"label":"Activated"
},
{
"input":{
"language":"kuery",
"query":"event.outcome : \"Resolved\""
"query":"azure.activitylogs.result_type : \"Resolved\""
},
"label":"Resolved"
},
{
"input":{
"language":"kuery",
"query":"event.outcome : \"Succeeded\""
"query":"azure.activitylogs.result_type : \"Succeeded\""
},
"label":"Succeeded"
}
Expand Down Expand Up @@ -1378,7 +1378,7 @@
"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index",
"query":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category : \"ServiceHealth\" "
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category : \"ServiceHealth\" "
}
}
},
Expand Down Expand Up @@ -1406,14 +1406,14 @@
{
"input":{
"language":"kuery",
"query":"event.outcome : \"Active\""
"query":"azure.activitylogs.result_type : \"Active\""
},
"label":"Active"
},
{
"input":{
"language":"kuery",
"query":"event.outcome : \"Resolved\""
"query":"azure.activitylogs.result_type : \"Resolved\""
},
"label":"Resolved"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
"default_timefield":"@timestamp",
"filter":{
"language":"kuery",
"query":"event.dataset :\"azure.activitylogs\" and event.category :\"Administrative\" and azure.activitylogs.identity.claims_initiated_by_user.fullname :*"
"query":"event.dataset :\"azure.activitylogs\" and azure.activitylogs.event_category :\"Administrative\" and azure.activitylogs.identity.claims_initiated_by_user.fullname :*"
},
"id":"61ca57f0-469d-11e7-af02-69e470af7417",
"index_pattern":"filebeat-*",
Expand Down Expand Up @@ -880,7 +880,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome : \"Success\" "
"query":"azure.activitylogs.result_type : \"Success\" "
},
"formatter":"number",
"id":"61ca57f1-469d-11e7-af02-69e470af7417",
Expand All @@ -896,7 +896,7 @@
"separate_axis":0,
"split_mode":"filter",
"stacked":"none",
"terms_field":"event.outcome"
"terms_field":"azure.activitylogs.result_type"
},
{
"axis_position":"right",
Expand All @@ -905,7 +905,7 @@
"fill":0.5,
"filter":{
"language":"kuery",
"query":"event.outcome : \"Fail\" "
"query":"azure.activitylogs.result_type : \"Fail\" "
},
"formatter":"number",
"id":"78e85470-f0cb-11e9-bf79-0db2fc8554f1",
Expand Down
9 changes: 9 additions & 0 deletions x-pack/filebeat/module/azure/activitylogs/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- name: activitylogs
type: group
release: beta
default_field: false
description: >
Fields for Azure activity logs.
fields:
Expand Down Expand Up @@ -86,6 +87,10 @@
type: keyword
description: >
Operation name
- name: result_type
type: keyword
description: >
Result type
- name: result_signature
type: keyword
description: >
Expand All @@ -94,6 +99,10 @@
type: keyword
description: >
Category
- name: event_category
type: keyword
description: >
Event Category
- name: properties
type: group
description: >
Expand Down
Loading