Skip to content
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

Jump to bottom

[filebeat] Use fail_on_template_error on google_workspace and okta pagination #24967

Merged
merged 2 commits into from
Apr 12, 2021
Merged

[filebeat] Use fail_on_template_error on google_workspace and okta pagination #24967

merged 2 commits into from
Apr 12, 2021

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Apr 7, 2021 •
edited
Loading

What does this PR do?

Uses fail_on_template_error option for google_workspace and okta modules pagination.

Why is it important?

In some cases, the expected value used to paginate might not be there, and we want this to interrupt the execution instead of doing a request with an unexpected empty value.

Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation

  • I have made corresponding change to the default configuration files
    - [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@marc-gr marc-gr added bug needs_backport PR is waiting to be backported to other branches. Team:Security-External Integrations needs_integration_sync Changes in this PR need synced to elastic/integrations. labels Apr 7, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 7, 2021
@marc-gr marc-gr force-pushed the fix_fail_on_template_error branch from b6b5fe4 to f69cebf Compare April 7, 2021 13:05
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 7, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #24967 updated

  • Start Time: 2021-04-12T07:42:15.130+0000

  • Duration: 49 min 6 sec

  • Commit: e97208f

Test stats 🧪

Test Results
Failed 0
Passed 6910
Skipped 1185
Total 8095

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6910
Skipped 1185
Total 8095

@marc-gr marc-gr added backport-v7.12.0 Automated backport with mergify backport-v7.13.0 Automated backport with mergify and removed needs_integration_sync Changes in this PR need synced to elastic/integrations. labels Apr 8, 2021
adriansr
adriansr approved these changes Apr 8, 2021
View reviewed changes
Copy link
Contributor

@adriansr adriansr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor suggestion for CHANGELOG otherwise LGTM

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@marc-gr marc-gr force-pushed the fix_fail_on_template_error branch from f69cebf to 717c48c Compare April 8, 2021 14:33
@mergify
Copy link
Contributor

mergify bot commented Apr 9, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b fix_fail_on_template_error upstream/fix_fail_on_template_error
git merge upstream/master
git push upstream fix_fail_on_template_error

@marc-gr marc-gr merged commit 312d5a5 into elastic:master Apr 12, 2021
@marc-gr marc-gr deleted the fix_fail_on_template_error branch April 12, 2021 08:38
mergify bot pushed a commit that referenced this pull request Apr 12, 2021
@marc-gr
[filebeat] Use fail_on_template_error on google_workspace and okta pa…
944dc0f 
…gination (#24967)

* Use fail_on_template_error on google_workspace and okta pagination

* Change changelog message

(cherry picked from commit 312d5a5)
@mergify mergify bot mentioned this pull request Apr 12, 2021
Merged
mergify bot pushed a commit that referenced this pull request Apr 12, 2021
@marc-gr
[filebeat] Use fail_on_template_error on google_workspace and okta pa…
0cb5b68 
…gination (#24967)

* Use fail_on_template_error on google_workspace and okta pagination

* Change changelog message

(cherry picked from commit 312d5a5)
@mergify mergify bot mentioned this pull request Apr 12, 2021
Merged
marc-gr added a commit that referenced this pull request Apr 12, 2021
@mergify @marc-gr
[filebeat] Use fail_on_template_error on google_workspace and okta pa…
71e2fe9 
…gination (#24967) (#25013)

* Use fail_on_template_error on google_workspace and okta pagination

* Change changelog message

(cherry picked from commit 312d5a5)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
marc-gr added a commit that referenced this pull request Apr 12, 2021
@mergify @marc-gr
[filebeat] Use fail_on_template_error on google_workspace and okta pa…
5b3122f 
…gination (#24967) (#25014)

* Use fail_on_template_error on google_workspace and okta pagination

* Change changelog message

(cherry picked from commit 312d5a5)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
v1v added a commit to v1v/beats that referenced this pull request Apr 14, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-debian-9
1de2782 
* upstream/master: (308 commits)
  [winlogbeat] Add support for sysmon v13 events 24 and 25 (elastic#24945)
  mergify: add backport label (elastic#25050)
  Add pod.ip in k8s metadata (elastic#25037)
  [elastic-agent] Use fleet.url for container cmd (elastic#25026)
  disable TestXPackEnabled flaky test in logstash metricbeat module (elastic#25034)
  Leverege leader election in agent  k8s manifests (elastic#25016)
  libbeat/publisher/pipeline: expand monitoring (elastic#24700)
  libbeat: fix decode_json_fields config validation (elastic#24862)
  Remove make docs-preview instructions (elastic#25001)
  [Filebeat] Fix IPtables pipeline (elastic#24928)
  [DOCS] cd into correct directory before invoking mage. (elastic#17679)
  Add -buildmode=pie for supported platform (elastic#24964)
  Add agent's direcotry in k8s manifest generator (elastic#24987)
  [mergify] assign the original author (elastic#25007)
  Fix AWS module flaky tests (elastic#24852)
  [filebeat] Use fail_on_template_error on google_workspace and okta pagination (elastic#24967)
  Updated config to match defaults (elastic#25004)
  [Filebeat] Fix hardcoded amazonaws.com endpoint (elastic#24861)
  Add cloud.service.name to add_cloud_metadata (elastic#24993)
  [Ingest Manager] Expose processes and their metrics (elastic#24788)
  ...
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify @marc-gr
[filebeat] Use fail_on_template_error on google_workspace and okta pa…
280732e 
…gination (elastic#24967) (elastic#25014)

* Use fail_on_template_error on google_workspace and okta pagination

* Change changelog message

(cherry picked from commit 8c9397f)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adriansr adriansr adriansr approved these changes

Assignees
No one assigned
Labels
backport-v7.12.0 Automated backport with mergify backport-v7.13.0 Automated backport with mergify bug needs_backport PR is waiting to be backported to other branches.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marc-gr @elasticmachine @adriansr