Skip to content

[BugFix] O365 - Fix OperationCount Mapping #15796

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
w0rk3r merged 6 commits into from
Oct 29, 2025
Merged

[BugFix] O365 - Fix OperationCount Mapping #15796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfb483d
[BugFix] O365 - Fix OperationCount Mapping
w0rk3r Oct 29, 2025
63137a9
Apply code suggestions
w0rk3r Oct 29, 2025
61c4ed1
Update packages/o365/changelog.yml
w0rk3r Oct 29, 2025
43b22de
Merge branch 'main' into fix_opcount_o365
w0rk3r Oct 29, 2025
a7913b7
Update default.yml
w0rk3r Oct 29, 2025
9d49b80
Update packages/o365/data_stream/audit/elasticsearch/ingest_pipeline/…
w0rk3r Oct 29, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/o365/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.33.1"
changes:
- description: Reverts earlier `o365.audit.OperationCount` mapping change to ensure that the field remains a long.
type: enhancement
link: https://github.com/elastic/integrations/pull/15796
- version: "2.33.0"
changes:
- description: >-
Expand All @@ -24,7 +29,7 @@
changes:
- description: Improve documentation.
type: enhancement
link: https://github.com/elastic/integrations/pull/1
link: https://github.com/elastic/integrations/pull/15660
- version: "2.30.0"
changes:
- description: >-
Expand Down
4 changes: 2 additions & 2 deletions ...s/o365/data_stream/audit/_dev/test/pipeline/test-exchange-access-event.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"MailboxGuid": "8b46a639-c47f-4634-b90c-2accecd337e3",
"MailboxOwnerSid": "S-1-5-21-1234567890-123456789-1234567890-12345678",
"MailboxOwnerUPN": "user@example.com",
"OperationCount": "6",
"OperationCount": 6,
"OperationProperties": [
{
"Name": "AttachmentAccessType",
Expand Down Expand Up @@ -716,7 +716,7 @@
"MailboxGuid": "eeeeeeee-aaaa-1234-bbbb-123456789012",
"MailboxOwnerSid": "S-1-5-21-1234567890-1234567890-123456789012-88888888",
"MailboxOwnerUPN": "user@example.com",
"OperationCount": "6",
"OperationCount": 6,
"OperationProperties": [
{
"Name": "MailAccessType",
Expand Down
6 changes: 2 additions & 4 deletions packages/o365/data_stream/audit/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,13 +1414,11 @@ processors:
}
- script:
tag: convert_operationcount
description: Ensure that OperationCount is not rendered with e-notation or other numeric
description: Ensure that OperationCount is rendered as a long
if: ctx.o365audit?.OperationCount != null
source: |-
if (ctx.o365audit.OperationCount instanceof Number) {
ctx.o365audit.OperationCount = ((long)ctx.o365audit.OperationCount).toString();
} else {
ctx.o365audit.OperationCount = ctx.o365audit.OperationCount.toString();
ctx.o365audit.OperationCount = ((Number)ctx.o365audit.OperationCount).longValue();
}
- append:
field: email.message_id
Expand Down
2 changes: 1 addition & 1 deletion packages/o365/data_stream/audit/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@
- name: Operation
type: keyword
- name: OperationCount
type: keyword
type: long
- name: OperationId
type: keyword
- name: OperationProperties
Expand Down
2 changes: 1 addition & 1 deletion packages/o365/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ An example event for `audit` looks as following:
| o365.audit.ObjectId | | keyword |
| o365.audit.ObjectType | | keyword |
| o365.audit.Operation | | keyword |
| o365.audit.OperationCount | | keyword |
| o365.audit.OperationCount | | long |
| o365.audit.OperationId | | keyword |
| o365.audit.OperationProperties | | object |
| o365.audit.OrganizationId | | keyword |
Expand Down
2 changes: 1 addition & 1 deletion packages/o365/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: o365
title: Microsoft Office 365
version: "2.33.0"
version: "2.33.1"
description: Collect logs from Microsoft Office 365 with Elastic Agent.
type: integration
format_version: "3.2.3"
Expand Down