Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into test_independent_ag…
Browse files Browse the repository at this point in the history 
…ents
  • Loading branch information
@mrodm
mrodm committed May 2, 2024
2 parents 05c3368 + d3cc731 commit e58f18e
Show file tree
Hide file tree
Showing 33 changed files with 981 additions and 308 deletions.
6 changes: 0 additions & 6 deletions .buildkite/hooks/pre-command
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-publish" ]]; then
fi

if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations" ]]; then
if [[ "${BUILDKITE_STEP_KEY}" == "trigger-publish" ]]; then
# TODO: To be removed
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token ${BUILDKITE_API_TOKEN_PATH})
export BUILDKITE_API_TOKEN
fi

if [[ "${BUILDKITE_STEP_KEY}" == "test-integrations" ]]; then
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
export BUILDKITE_API_TOKEN
Expand Down
3 changes: 1 addition & 2 deletions .buildkite/pipeline.publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ env:
JQ_VERSION: '1.7'
# Elastic package settings
# Manage docker output/logs
ELASTIC_PACKAGE_COMPOSE_DISABLE_ANSI: "true"
ELASTIC_PACKAGE_COMPOSE_DISABLE_PULL_PROGRESS_INFORMATION: "true"
ELASTIC_PACKAGE_COMPOSE_DISABLE_VERBOSE_OUTPUT: "true"
# Default license to use by `elastic-package build`
ELASTIC_PACKAGE_REPOSITORY_LICENSE: "licenses/Elastic-2.0.txt"
# Link definitions path (full path to be set in the corresponding step)
Expand Down
5 changes: 5 additions & 0 deletions packages/azure/changelog.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.11.3"
changes:
- description: Update Azure Audit Logs pipeline with support for initiated_by user fields.
type: bugfix
link: https://github.com/elastic/integrations/pull/9701
- version: "1.11.2"
changes:
- description: Add missing ECS field definitions.
Expand Down
2 changes: 1 addition & 1 deletion packages/azure/data_stream/auditlogs/_dev/test/pipeline/test-audit-logs-sample.log
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ "time": "2022-01-22T18:15:02.5168093Z", "resourceId": "/tenants/4bbb79f7-5724-4c9e-95f3-de075f6ec090/providers/Microsoft.aadiam", "operationName": "Add service principal credentials", "operationVersion": "1.0", "category": "AuditLogs", "tenantId": "4bbb79f7-5724-4c9e-95f3-de075f6ec090", "resultSignature": "None", "durationMs": 0, "callerIpAddress": "1.128.3.4", "correlationId": "53161141-e3f4-4944-85b6-7b953f17265e", "identity": "Managed Service Identity", "Level": 4, "properties": {"id":"Directory_53161141-e3f4-4944-85b6-7b953f17265e_6X649_134684731","category":"ApplicationManagement","correlationId":"53161141-e3f4-4944-85b6-7b953f17265e","result":"success","resultReason":"","activityDisplayName":"Add service principal credentials","activityDateTime":"2022-01-22T18:15:02.5168093+00:00","loggedByService":"Core Directory","operationType":"Update","userAgent":null,"initiatedBy":{"app":{"appId":null,"displayName":"Managed Service Identity","servicePrincipalId":"b9814691-9ca1-4e55-a1ac-8ef5dd010ec0","servicePrincipalName":null}},"targetResources":[{"id":"a7d5dcbe-0627-4ddf-a2f4-86b6785bcc42","displayName":"billing-test-wus","type":"ServicePrincipal","modifiedProperties":[{"displayName":"KeyDescription","oldValue":"[\"[KeyIdentifier=7dffcdc5-f2d5-43ae-86f1-682561befd4b,KeyType=AsymmetricX509Cert,KeyUsage=Verify,DisplayName=CN=a70a7931-c387-4dce-9f35-fbf95bdcc91e]\",\"[KeyIdentifier=c9c0b961-a80a-4a71-9c3a-b67b33edf874,KeyType=AsymmetricX509Cert,KeyUsage=Verify,DisplayName=CN=a70a7931-c387-4dce-9f35-fbf95bdcc91e]\"]","newValue":"[\"[KeyIdentifier=c9c0b961-a80a-4a71-9c3a-b67b33edf874,KeyType=AsymmetricX509Cert,KeyUsage=Verify,DisplayName=CN=a70a7931-c387-4dce-9f35-fbf95bdcc91e]\",\"[KeyIdentifier=7dffcdc5-f2d5-43ae-86f1-682561befd4b,KeyType=AsymmetricX509Cert,KeyUsage=Verify,DisplayName=CN=a70a7931-c387-4dce-9f35-fbf95bdcc91e]\",\"[KeyIdentifier=d747da7e-e11b-4af2-aede-0487c44067af,KeyType=AsymmetricX509Cert,KeyUsage=Verify,DisplayName=CN=a70a7931-c387-4dce-9f35-fbf95bdcc91e]\"]"},{"displayName":"Included Updated Properties","oldValue":null,"newValue":"\"KeyDescription\""},{"displayName":"TargetId.ServicePrincipalNames","oldValue":null,"newValue":"\"a70a7931-c387-4dce-9f35-fbf95bdcc91e;https://identity.azure.net/N8CUySpCeRFU3iB/PEuFlON4zd8+n8d3qgzrF1MviSY=\""}],"administrativeUnits":[]}],"additionalDetails":[{"key":"User-Agent","value":"Microsoft Azure Graph Client Library 2.1.17-internal"},{"key":"AppId","value":"a70a7931-c387-4dce-9f35-fbf95bdcc91e"}]}}
{ "time": "2022-01-22T18:15:02.5168093Z", "resourceId": "/tenants/4bbb79f7-5724-4c9e-95f3-de075f6ec090/providers/Microsoft.aadiam", "operationName": "Update service principal", "operationVersion": "1.0", "category": "AuditLogs", "tenantId": "4bbb79f7-5724-4c9e-95f3-de075f6ec090", "resultSignature": "None", "durationMs": 0, "callerIpAddress": "1.128.3.4", "correlationId": "53161141-e3f4-4944-85b6-7b953f17265e", "identity": "Managed Service Identity", "Level": 4, "properties": {"id":"Directory_53161141-e3f4-4944-85b6-7b953f17265e_6X649_134684743","category":"ApplicationManagement","correlationId":"53161141-e3f4-4944-85b6-7b953f17265e","result":"success","resultReason":"","activityDisplayName":"Update service principal","activityDateTime":"2022-01-22T18:15:02.5168093+00:00","loggedByService":"Core Directory","operationType":"Update","userAgent":null,"initiatedBy":{"app":{"appId":null,"displayName":"Managed Service Identity","servicePrincipalId":"b9814691-9ca1-4e55-a1ac-8ef5dd010ec0","servicePrincipalName":null}},"targetResources":[{"id":"a7d5dcbe-0627-4ddf-a2f4-86b6785bcc42","displayName":"billing-test-wus","type":"ServicePrincipal","modifiedProperties":[{"displayName":"TargetId.ServicePrincipalNames","oldValue":null,"newValue":"\"a70a7931-c387-4dce-9f35-fbf95bdcc91e;https://identity.azure.net/N8CUySpCeRFU3iB/PEuFlON4zd8+n8d3qgzrF1MviSY=\""},{"displayName":"Included Updated Properties","oldValue":null,"newValue":"\"KeyDescription\""}],"administrativeUnits":[]}],"additionalDetails":[{"key":"User-Agent","value":"Microsoft Azure Graph Client Library 2.1.17-internal"},{"key":"AppId","value":"a70a7931-c387-4dce-9f35-fbf95bdcc91e"}]}}
{ "time": "2022-01-22T18:15:02.3875429Z", "resourceId": "/tenants/4bbb79f7-5724-4c9e-95f3-de075f6ec090/providers/Microsoft.aadiam", "operationName": "Update service principal", "operationVersion": "1.0", "category": "AuditLogs", "tenantId": "4bbb79f7-5724-4c9e-95f3-de075f6ec090", "resultSignature": "None", "durationMs": 0, "callerIpAddress": "1.128.3.4", "correlationId": "87979703-118b-498f-99c2-ccd1a56f1a5a", "identity": "Managed Service Identity", "Level": 4, "properties": {"id":"Directory_87979703-118b-498f-99c2-ccd1a56f1a5a_ULAYA_144938566","category":"ApplicationManagement","correlationId":"87979703-118b-498f-99c2-ccd1a56f1a5a","result":"success","resultReason":"","activityDisplayName":"Update service principal","activityDateTime":"2022-01-22T18:15:02.3875429+00:00","loggedByService":"Core Directory","operationType":"Update","userAgent":null,"initiatedBy":{"app":{"appId":null,"displayName":"Managed Service Identity","servicePrincipalId":"b9814691-9ca1-4e55-a1ac-8ef5dd010ec0","servicePrincipalName":null}},"targetResources":[{"id":"a7d5dcbe-0627-4ddf-a2f4-86b6785bcc42","displayName":"billing-test-wus","type":"ServicePrincipal","modifiedProperties":[{"displayName":"TargetId.ServicePrincipalNames","oldValue":null,"newValue":"\"a70a7931-c387-4dce-9f35-fbf95bdcc91e;https://identity.azure.net/N8CUySpCeRFU3iB/PEuFlON4zd8+n8d3qgzrF1MviSY=\""}],"administrativeUnits":[]}],"additionalDetails":[{"key":"User-Agent","value":"Microsoft Azure Graph Client Library 2.1.17-internal"},{"key":"AppId","value":"a70a7931-c387-4dce-9f35-fbf95bdcc91e"}]}}
{ "time": "2022-01-22T18:15:02.3875429Z", "resourceId": "/tenants/4bbb79f7-5724-4c9e-95f3-de075f6ec090/providers/Microsoft.aadiam", "operationName": "Update service principal", "operationVersion": "1.0", "category": "AuditLogs", "tenantId": "4bbb79f7-5724-4c9e-95f3-de075f6ec090", "resultSignature": "None", "durationMs": 0, "callerIpAddress": "1.128.3.4", "correlationId": "87979703-118b-498f-99c2-ccd1a56f1a5a", "identity": "Managed Service Identity", "Level": 4, "properties": {"id":"Directory_87979703-118b-498f-99c2-ccd1a56f1a5a_ULAYA_144938566","category":"ApplicationManagement","correlationId":"87979703-118b-498f-99c2-ccd1a56f1a5a","result":"success","resultReason":"","activityDisplayName":"Update service principal","activityDateTime":"2022-01-22T18:15:02.3875429+00:00","loggedByService":"Core Directory","operationType":"Update","userAgent":null,"initiatedBy":{"app":{"appId":null,"displayName":"Managed Service Identity","servicePrincipalId":"b9814691-9ca1-4e55-a1ac-8ef5dd010ec0","servicePrincipalName":null}},"targetResources":[{"id":"a7d5dcbe-0627-4ddf-a2f4-86b6785bcc42","displayName":"billing-test-wus","type":"ServicePrincipal","modifiedProperties":[{"displayName":"TargetId.ServicePrincipalNames","oldValue":null,"newValue":"\"a70a7931-c387-4dce-9f35-fbf95bdcc91e;https://identity.azure.net/N8CUySpCeRFU3iB/PEuFlON4zd8+n8d3qgzrF1MviSY=\""}],"administrativeUnits":[]}],"additionalDetails":[{"key":"User-Agent","value":"Microsoft Azure Graph Client Library 2.1.17-internal"},{"key":"AppId","value":"a70a7931-c387-4dce-9f35-fbf95bdcc91e"}]}}
4 changes: 3 additions & 1 deletion packages/azure/data_stream/auditlogs/_dev/test/pipeline/test-auditlogs-raw.log
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{"category":"AuditLogs","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","durationMs":0,"identity":"Device Registration Service","level":"Informational","operationName":"Update device","operationVersion":"1.0","properties":{"activityDateTime":"2019-10-18T15:30:51.0273716+00:00","activityDisplayName":"Update device","category":"Device","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","id":"Directory_ESQ","initiatedBy":{"app":{"appId":"id","displayName":"Device Registration Service","servicePrincipalId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","servicePrincipalName":"Core"}},"loggedByService":"Core Directory","operationType":"Update","result":"success","resultReason":"","targetResources":[{"displayName":"LAPTOP-12","id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","modifiedProperties":[{"displayName":"Included Updated Properties","newValue":"\"\"","oldValue":""}],"type":"Device"}]},"resourceId":"/tenants/8a4de8b5-095c-47d0-a96f-a75130c61d53/providers/Microsoft.aadiam","resultSignature":"None","tenantId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","time":"2019-10-18T15:30:51.0273716Z"}
{"category":"AuditLogs","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","durationMs":0,"identity":"Device Registration Service","level":"Informational","operationName":"Update device","operationVersion":"1.0","properties":{"activityDateTime":"2019-10-18T15:30:51.0273716+00:00","activityDisplayName":"Update device","category":"Device","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","id":"Directory_ESQ","initiatedBy":{"app":{"appId":"id","displayName":"Device Registration Service","servicePrincipalId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","servicePrincipalName":"Core"}},"loggedByService":"Core Directory","operationType":"Update","result":"success","resultReason":"","targetResources":[{"displayName":"LAPTOP-12","id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","modifiedProperties":[{"displayName":"Included Updated Properties","newValue":"\"\"","oldValue":""}],"type":"Device"}]},"resourceId":"/tenants/8a4de8b5-095c-47d0-a96f-a75130c61d53/providers/Microsoft.aadiam","resultSignature":"None","tenantId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","time":"2019-10-18T15:30:51.0273716Z"}
{"category":"AuditLogs","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","durationMs":0,"identity":"Device Registration Service","level":"Informational","operationName":"Update device","operationVersion":"1.0","properties":{"activityDateTime":"2019-10-18T15:30:51.0273716+00:00","activityDisplayName":"Update device","category":"Device","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","id":"Directory_ESQ","initiatedBy":{"user":{"userPrincipalName":"UserName","displayName":"User Registration Service","id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","ipAddress":"0.0.0.0", "roles": "admin"}},"loggedByService":"Core Directory","operationType":"Update","result":"success","resultReason":"","targetResources":[{"displayName":"LAPTOP-12","id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","modifiedProperties":[{"displayName":"Included Updated Properties","newValue":"\"\"","oldValue":""}],"type":"Device"}]},"resourceId":"/tenants/8a4de8b5-095c-47d0-a96f-a75130c61d53/providers/Microsoft.aadiam","resultSignature":"None","tenantId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","time":"2019-10-18T15:30:51.0273716Z"}
{"category":"AuditLogs","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","durationMs":0,"identity":"Device Registration Service","level":"Informational","operationName":"Update device","operationVersion":"1.0","properties":{"activityDateTime":"2019-10-18T15:30:51.0273716+00:00","activityDisplayName":"Update device","category":"Device","correlationId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","id":"Directory_ESQ","initiatedBy":{"user":{"userPrincipalName":"UserName","displayName": null,"id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","ipAddress":"0.0.0.0", "roles": "admin"}},"loggedByService":"Core Directory","operationType":"Update","result":"success","resultReason":"","targetResources":[{"displayName":"LAPTOP-12","id":"8a4de8b5-095c-47d0-a96f-a75130c61d53","modifiedProperties":[{"displayName":"","newValue":"\"\"","oldValue":""}],"type":"Device"}]},"resourceId":"/tenants/8a4de8b5-095c-47d0-a96f-a75130c61d53/providers/Microsoft.aadiam","resultSignature":"None","tenantId":"8a4de8b5-095c-47d0-a96f-a75130c61d53","time":"2019-10-18T15:30:51.0273716Z"}
Loading

0 comments on commit e58f18e

Please sign in to comment.