Skip to content

[Snyk and Cloudflare] Fix indefinite pagination #3651

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
P1llus merged 2 commits into from
Jul 5, 2022
Merged

[Snyk and Cloudflare] Fix indefinite pagination #3651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c2a491
adding fixes for snyk and cloudflare for indefinite pagination
P1llus Jul 5, 2022
771ab4b
update changelog
P1llus Jul 5, 2022
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/cloudflare/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.1.1"
changes:
- description: Fixing possible indefinite pagination
type: bugfix
link: https://github.com/elastic/integrations/pull/3651
- version: "2.1.0"
changes:
- description: Update package to ECS 8.3.0.
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/data_stream/audit/agent/stream/httpjson.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ response.split:
response.pagination:
- set:
target: url.params.page
value: '[[add .last_response.page 1]]'
value: '[[if (ne (len .last_response.body.response) 0)]][[add .last_response.page 1]][[end]]'
fail_on_template_error: true

cursor:
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: cloudflare
title: Cloudflare
version: "2.1.0"
version: "2.1.1"
release: ga
description: Collect and parse logs from Cloudflare API with Elastic Agent.
type: integration
Expand Down
5 changes: 5 additions & 0 deletions packages/snyk/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: "1.3.1"
changes:
- description: Fixes possible indefinite pagination
type: bugfix
link: https://github.com/elastic/integrations/pull/3651
- version: "1.3.0"
changes:
- description: Update package to ECS 8.3.0.
Expand Down
2 changes: 1 addition & 1 deletion packages/snyk/data_stream/audit/agent/stream/httpjson.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ response.request_body_on_pagination: true
response.pagination:
- set:
target: url.params.page
value: '[[add .last_response.page 1]]'
value: '[[if (ne (len .last_response.body.response) 0)]][[add .last_response.page 1]][[end]]'
fail_on_template_error: true
tags:
{{#if preserve_original_event}}
Expand Down
2 changes: 1 addition & 1 deletion packages/snyk/data_stream/vulnerabilities/agent/stream/httpjson.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ response.request_body_on_pagination: true
response.pagination:
- set:
target: url.params.page
value: '[[add .last_response.page 1]]'
value: '[[if (ne (len .last_response.body.response) 0)]][[add .last_response.page 1]][[end]]'
fail_on_template_error: true

response.split:
Expand Down
2 changes: 1 addition & 1 deletion packages/snyk/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: snyk
title: "Snyk"
version: "1.3.0"
version: "1.3.1"
license: basic
description: "Collect logs from Snyk API with Elastic Agent."
type: integration
Expand Down