Skip to content

[Azure Logs] Add caller_ip_address field for sign-in logs #8813

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

Merged
lucian-ioan merged 8 commits into from
Jan 7, 2024
Merged

[Azure Logs] Add caller_ip_address field for sign-in logs #8813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86cfd6d
add callerIpAddress field
Jan 2, 2024
7303d9b
add caller_ip_address processing
Jan 4, 2024
1cdf3bb
add changelog entry
Jan 4, 2024
64b2737
better field description
Jan 4, 2024
8e13743
package build
Jan 4, 2024
3baf0a7
move caller_ip_address field
Jan 5, 2024
74e3407
fix conversion
Jan 5, 2024
dc562a1
remove redundant set processor
Jan 5, 2024
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
5 changes: 5 additions & 0 deletions packages/azure/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.8.3"
changes:
- description: Add caller_ip_address field in pipeline for Azure sign-in logs.
type: enhancement
link: https://github.com/elastic/integrations/pull/8813
- version: "1.8.2"
changes:
- description: Update Azure logs documentation.
Expand Down
4 changes: 2 additions & 2 deletions ...eam/application_gateway/_dev/test/pipeline/test-application-gateway-raw.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"network"
],
"kind": "event",
"original": "{\"resourceId\":\"/SUBSCRIPTIONS/23103928-B2CF-472A-8CDB-0146E2849129/RESOURCEGROUPS/PEERINGTEST/PROVIDERS/MICROSOFT.NETWORK/APPLICATIONGATEWAYS/Application-Gateway-Name\",\"operationName\":\"ApplicationGatewayAccess\",\"timestamp\":\"2017-04-26T19:27:38Z\",\"category\":\"ApplicationGatewayAccessLog\",\"properties\":{\"instanceId\":\"ApplicationGatewayRole_IN_0\",\"clientIP\":\"67.43.156.7\",\"clientPort\":46886,\"httpMethod\":\"GET\",\"requestUri\":\"/phpmyadmin/scripts/setup.php\",\"requestQuery\":\"X-AzureApplicationGateway-CACHE-HIT=0\u0026SERVER-ROUTED=10.4.0.4\u0026X-AzureApplicationGateway-LOG-ID=874f1f0f-6807-41c9-b7bc-f3cfa74aa0b1\u0026SERVER-STATUS=404\",\"userAgent\":\"-\",\"httpStatus\":404,\"httpVersion\":\"HTTP/1.0\",\"receivedBytes\":65,\"sentBytes\":553,\"timeTaken\":205,\"sslEnabled\":\"off\",\"host\":\"www.contoso.com\",\"originalHost\":\"www.contoso.com\"}}",
"original": "{\"resourceId\":\"/SUBSCRIPTIONS/23103928-B2CF-472A-8CDB-0146E2849129/RESOURCEGROUPS/PEERINGTEST/PROVIDERS/MICROSOFT.NETWORK/APPLICATIONGATEWAYS/Application-Gateway-Name\",\"operationName\":\"ApplicationGatewayAccess\",\"timestamp\":\"2017-04-26T19:27:38Z\",\"category\":\"ApplicationGatewayAccessLog\",\"properties\":{\"instanceId\":\"ApplicationGatewayRole_IN_0\",\"clientIP\":\"67.43.156.7\",\"clientPort\":46886,\"httpMethod\":\"GET\",\"requestUri\":\"/phpmyadmin/scripts/setup.php\",\"requestQuery\":\"X-AzureApplicationGateway-CACHE-HIT=0&SERVER-ROUTED=10.4.0.4&X-AzureApplicationGateway-LOG-ID=874f1f0f-6807-41c9-b7bc-f3cfa74aa0b1&SERVER-STATUS=404\",\"userAgent\":\"-\",\"httpStatus\":404,\"httpVersion\":\"HTTP/1.0\",\"receivedBytes\":65,\"sentBytes\":553,\"timeTaken\":205,\"sslEnabled\":\"off\",\"host\":\"www.contoso.com\",\"originalHost\":\"www.contoso.com\"}}",
"type": [
"connection"
]
Expand Down Expand Up @@ -90,7 +90,7 @@
"url": {
"domain": "www.contoso.com",
"path": "/phpmyadmin/scripts/setup.php",
"query": "X-AzureApplicationGateway-CACHE-HIT=0\u0026SERVER-ROUTED=10.4.0.4\u0026X-AzureApplicationGateway-LOG-ID=874f1f0f-6807-41c9-b7bc-f3cfa74aa0b1\u0026SERVER-STATUS=404"
"query": "X-AzureApplicationGateway-CACHE-HIT=0&SERVER-ROUTED=10.4.0.4&X-AzureApplicationGateway-LOG-ID=874f1f0f-6807-41c9-b7bc-f3cfa74aa0b1&SERVER-STATUS=404"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...azure/data_stream/platformlogs/_dev/test/pipeline/test-platformlogs-raw.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"Namespace": "obstesteventhubs",
"SubscriptionId": "7657426d-c4c3-44ac-88a2-3b2cd59e6dba",
"TrackingId": "30ed877c-a36b-491a-bd4d-ddd847fe55b8_M2CH3_M2CH3_G3S2",
"Via": "sb://obstesteventhubs.servicebus.windows.net/insights-logs-operationallogs/consumergroups?api-version=2017-04\u0026$skip=0\u0026$top=100"
"Via": "sb://obstesteventhubs.servicebus.windows.net/insights-logs-operationallogs/consumergroups?api-version=2017-04&$skip=0&$top=100"
},
"status": "Succeeded"
},
Expand Down
15 changes: 15 additions & 0 deletions ...a_stream/signinlogs/_dev/test/pipeline/test-non-interactive-user-sample.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -144,6 +145,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -278,6 +280,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -412,6 +415,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -547,6 +551,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -681,6 +686,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -815,6 +821,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -949,6 +956,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1084,6 +1092,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1218,6 +1227,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1352,6 +1362,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1486,6 +1497,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1620,6 +1632,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1755,6 +1768,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -1890,6 +1904,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "NonInteractiveUserSignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down
1 change: 1 addition & 0 deletions ...a_stream/signinlogs/_dev/test/pipeline/test-non-interactive-user-signin.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "81.2.69.143",
"category": "NonInteractiveUserSignInLogs",
"identity": "Nikhita Sethi",
"operation_name": "Sign-in activity",
Expand Down
1 change: 1 addition & 0 deletions ...ure/data_stream/signinlogs/_dev/test/pipeline/test-non-interactive-user.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "81.2.69.144",
"category": "NonInteractiveUserSignInLogs",
"identity": "Hello World",
"operation_name": "Sign-in activity",
Expand Down
7 changes: 7 additions & 0 deletions .../signinlogs/_dev/test/pipeline/test-service-principal-signinlogs-sample.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -112,6 +113,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -215,6 +217,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -318,6 +321,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -421,6 +425,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -524,6 +529,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down Expand Up @@ -627,6 +633,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down
1 change: 1 addition & 0 deletions .../azure/data_stream/signinlogs/_dev/test/pipeline/test-service-principal.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "81.2.69.144",
"category": "ServicePrincipalSignInLogs",
"operation_name": "Sign-in activity",
"operation_version": "1.0",
Expand Down
2 changes: 2 additions & 0 deletions ...ges/azure/data_stream/signinlogs/_dev/test/pipeline/test-signinlogs-raw.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "81.2.69.144",
"category": "SignInLogs",
"identity": "Test LTest",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -125,6 +126,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "81.2.69.144",
"category": "SignInLogs",
"identity": "Test LTest",
"operation_name": "Sign-in activity",
Expand Down
2 changes: 2 additions & 0 deletions .../azure/data_stream/signinlogs/_dev/test/pipeline/test-signinlogs-sample.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "SignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down Expand Up @@ -168,6 +169,7 @@
"provider": "Microsoft.aadiam"
},
"signinlogs": {
"caller_ip_address": "1.128.3.4",
"category": "SignInLogs",
"identity": "elastic testing",
"operation_name": "Sign-in activity",
Expand Down
11 changes: 5 additions & 6 deletions packages/azure/data_stream/signinlogs/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,21 @@ processors:
field: source.address
value: '{{{azure.signinlogs.properties.ip_address}}}'
ignore_empty_value: true
- set:
if: ctx?.source?.address == null
field: source.address
value: '{{{azure.signinlogs.caller_ip_address}}}'
ignore_empty_value: true
- convert:
field: source.address
target_field: source.ip
type: ip
ignore_missing: true
ignore_failure: true
- convert:
field: azure.signinlogs.caller_ip_address
type: ip
ignore_missing: true
ignore_failure: true
- remove:
field:
- azure.signinlogs.properties.ipaddress
- azure.signinlogs.properties.ip_address
- azure.signinlogs.caller_ip_address
ignore_missing: true
- append:
if: ctx?.source?.ip != null
Expand Down
4 changes: 4 additions & 0 deletions packages/azure/data_stream/signinlogs/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
type: keyword
description: |
Category
- name: caller_ip_address
type: ip
description: |
The IP address of the client that made the request.
- name: properties
type: group
# See https://docs.microsoft.com/en-au/graph/api/resources/signin
Expand Down
1 change: 1 addition & 0 deletions packages/azure/docs/adlogs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ An example event for `signinlogs` looks as following:
| azure.resource.name | Name | keyword |
| azure.resource.namespace | Resource type/namespace | keyword |
| azure.resource.provider | Resource type/namespace | keyword |
| azure.signinlogs.caller_ip_address | The IP address of the client that made the request. | ip |
| azure.signinlogs.category | Category | keyword |
| azure.signinlogs.identity | Identity | keyword |
| azure.signinlogs.operation_name | The operation name | keyword |
Expand Down
2 changes: 1 addition & 1 deletion packages/azure/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: azure
title: Azure Logs
version: 1.8.2
version: 1.8.3
description: This Elastic integration collects logs from Azure
type: integration
icons:
Expand Down