From 280732e86c65749ea775b8c4fc7b9da6e6573492 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 12 Apr 2021 11:44:15 +0200 Subject: [PATCH] [filebeat] Use fail_on_template_error on google_workspace and okta pagination (#24967) (#25014) * Use fail_on_template_error on google_workspace and okta pagination * Change changelog message (cherry picked from commit 8c9397fe4ce1c217fb9b84efe9270c374959b967) Co-authored-by: Marc Guasch --- CHANGELOG.next.asciidoc | 1 + x-pack/filebeat/module/google_workspace/admin/config/config.yml | 1 + x-pack/filebeat/module/google_workspace/drive/config/config.yml | 1 + x-pack/filebeat/module/google_workspace/groups/config/config.yml | 1 + x-pack/filebeat/module/google_workspace/login/config/config.yml | 1 + x-pack/filebeat/module/google_workspace/saml/config/config.yml | 1 + .../module/google_workspace/user_accounts/config/config.yml | 1 + x-pack/filebeat/module/okta/system/config/input.yml | 1 + 8 files changed, 8 insertions(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 9893f72aa62e..fe8e40b80f89 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -207,6 +207,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix gcp/vpcflow module error where input type was defaulting to file. {pull}24719[24719] - Improve PanOS parsing and ingest pipeline. {issue}22413[22413] {issue}22748[22748] {pull}24799[24799] - Fix S3 input validation for non amazonaws.com domains. {issue}24420[24420] {pull}24861[24861] +- Fix google_workspace and okta modules pagination when next page template is empty. {pull}24967[24967] *Heartbeat* diff --git a/x-pack/filebeat/module/google_workspace/admin/config/config.yml b/x-pack/filebeat/module/google_workspace/admin/config/config.yml index 1b992f50d132..0583adf7bfda 100644 --- a/x-pack/filebeat/module/google_workspace/admin/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/admin/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/google_workspace/drive/config/config.yml b/x-pack/filebeat/module/google_workspace/drive/config/config.yml index e88aecca5280..5d91ff55a270 100644 --- a/x-pack/filebeat/module/google_workspace/drive/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/drive/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/google_workspace/groups/config/config.yml b/x-pack/filebeat/module/google_workspace/groups/config/config.yml index d40347b89fbc..259b21e65533 100644 --- a/x-pack/filebeat/module/google_workspace/groups/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/groups/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/google_workspace/login/config/config.yml b/x-pack/filebeat/module/google_workspace/login/config/config.yml index 6f1249bd1950..05176e364dd8 100644 --- a/x-pack/filebeat/module/google_workspace/login/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/login/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/google_workspace/saml/config/config.yml b/x-pack/filebeat/module/google_workspace/saml/config/config.yml index d69484c939fe..ef7aa1c9fca7 100644 --- a/x-pack/filebeat/module/google_workspace/saml/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/saml/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/google_workspace/user_accounts/config/config.yml b/x-pack/filebeat/module/google_workspace/user_accounts/config/config.yml index f67eb4208331..ff93bcc75fa4 100644 --- a/x-pack/filebeat/module/google_workspace/user_accounts/config/config.yml +++ b/x-pack/filebeat/module/google_workspace/user_accounts/config/config.yml @@ -25,6 +25,7 @@ response.pagination: - set: target: url.params.pageToken value: "[[.last_response.body.nextPageToken]]" + fail_on_template_error: true cursor: last_execution_datetime: value: "[[formatDate now]]" diff --git a/x-pack/filebeat/module/okta/system/config/input.yml b/x-pack/filebeat/module/okta/system/config/input.yml index 05ff819fad0a..5fffcee581ec 100644 --- a/x-pack/filebeat/module/okta/system/config/input.yml +++ b/x-pack/filebeat/module/okta/system/config/input.yml @@ -31,6 +31,7 @@ response.pagination: - set: target: url.value value: '[[ getRFC5988Link "next" .last_response.header.Link ]]' + fail_on_template_error: true cursor: published: