Skip to content

o365: tolerate changed API next page URI behaviour #15325

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
merged 1 commit into from
Sep 16, 2025
Merged

o365: tolerate changed API next page URI behaviour #15325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions packages/o365/_dev/deploy/docker/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,17 @@ rules:
Content-Type:
- "application/json"
NextPageUri:
- 'http://{{ hostname }}:{{ env "PORT" }}/api/v1.0/test-cel-tenant-id/activity/feed/subscriptions/content?contentType=Audit.SharePoint&startTime={{ .request.vars.startTime }}&endTime={{ .request.vars.endTime }}&nextPage=2023071100R022885001761'
- 'http://{{ hostname }}:{{ env "PORT" }}/api/v1.0/test-cel-tenant-id/activity/feed/subscriptions/content?contenttype=Audit.SharePoint&starttime={{ .request.vars.startTime }}&endtime={{ .request.vars.endTime }}&nextpage=2023071100R022885001761'
body: |-
[{"contentType": "Audit.Sharepoint","contentId": "celid1","contentUri": "http://{{ hostname }}:{{ env "PORT" }}/api/v1.0/celsp1/activity/feed/audit/celid1","contentCreated": "{{ .request.vars.endTime }}","contentExpiration": "2199-05-30T17:35:00.000Z"}]
- path: /api/v1.0/test-cel-tenant-id/activity/feed/subscriptions/content
methods: [GET]
query_params:
contentType: "Audit.SharePoint"
startTime: "{startTime:.*}"
endTime: "{endTime:.*}"
nextPage: "2023071100R022885001761"
# New, undocumented, syntax returned in NextPageUri.
contenttype: "Audit.SharePoint"
starttime: "{startTime:.*}"
endtime: "{endTime:.*}"
nextpage: "2023071100R022885001761"
request_headers:
Authorization:
- "Bearer CELtoken"
Expand Down
5 changes: 5 additions & 0 deletions 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.29.0"
changes:
- description: Tolerate undocumented API changes in request parameter syntax.
type: enhancement
link: https://github.com/elastic/integrations/pull/15325
- version: "2.28.0"
changes:
- description: Improvements in the integration UI layout, highlight deprecated data stream.
Expand Down
7 changes: 6 additions & 1 deletion packages/o365/data_stream/audit/agent/stream/cel.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ program: |-
:
e.with(
{
"endTime": state.work.next_list.parse_url().RawQuery.parse_query().endTime[0],
"endTime": state.work.next_list.parse_url().RawQuery.parse_query().as(q,
[
?q.?endTime[0],
?q.?endtime[0],
]
)[?0].orValue(now),
}
)
).as(list, (size(list) != 0) ?
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.28.0"
version: "2.29.0"
description: Collect logs from Microsoft Office 365 with Elastic Agent.
type: integration
format_version: "3.2.3"
Expand Down