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

libbeat: fix decode_json_fields config validation #24862

Merged
merged 3 commits into from
Apr 13, 2021
Merged

libbeat: fix decode_json_fields config validation #24862

merged 3 commits into from
Apr 13, 2021

Conversation

axw
Copy link
Member

@axw axw commented Mar 31, 2021 •
edited
Loading

What does this PR do?

Add expand_keys to the list of allowed config fields for the decode_json_fields processor, and add a test that ensures all fields defined in the config struct are allowed.

Why is it important?

Because it should be allowed.

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.

How to test this PR locally

See #24345

Related issues

Closes #24345

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 31, 2021
@axw
libbeat: fix decode_json_fields config validation
63c86c7 
Add "expand_keys" to the list of allowed config fields,
and add a test that ensures all fields defined in the
config struct are allowed.
@axw axw added the Team:Integrations Label for the Integrations team label Mar 31, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 31, 2021
@axw
Copy link
Member Author

axw commented Mar 31, 2021

Tests are failing due to introduction of a new user_agent.device.type field in elastic/elasticsearch#69322, unrelated to my change.

@axw axw marked this pull request as ready for review March 31, 2021 05:28
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 31, 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: urso commented: /test

  • Start Time: 2021-04-12T21:22:21.625+0000

  • Duration: 31 min 55 sec

  • Commit: cc3f66c

Test stats 🧪

Test Results
Failed 0
Passed 15
Skipped 16
Total 31

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 15
Skipped 16
Total 31

@mergify
Copy link
Contributor

mergify bot commented Apr 7, 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-decode-json-fields upstream/fix-decode-json-fields
git merge upstream/master
git push upstream fix-decode-json-fields

@axw axw added the backport-v7.13.0 Automated backport with mergify label Apr 12, 2021
blakerouse
blakerouse approved these changes Apr 12, 2021
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good.

@urso
Copy link

urso commented Apr 12, 2021

/test

@axw axw merged commit abd6a93 into elastic:master Apr 13, 2021
@axw axw deleted the fix-decode-json-fields branch April 13, 2021 03:13
mergify bot pushed a commit that referenced this pull request Apr 13, 2021
@axw
libbeat: fix decode_json_fields config validation (#24862)
9a28c9d 
Add "expand_keys" to the list of allowed config fields,
and add a test that ensures all fields defined in the
config struct are allowed.

(cherry picked from commit abd6a93)
@mergify mergify bot mentioned this pull request Apr 13, 2021
Merged
axw added a commit that referenced this pull request Apr 13, 2021
@mergify @axw
libbeat: fix decode_json_fields config validation (#24862) (#25031)
b684a65 
Add "expand_keys" to the list of allowed config fields,
and add a test that ensures all fields defined in the
config struct are allowed.

(cherry picked from commit abd6a93)

Co-authored-by: Andrew Wilkins <axw@elastic.co>
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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvch kvch kvch approved these changes

@blakerouse blakerouse blakerouse approved these changes

Assignees
No one assigned
Labels
backport-v7.13.0 Automated backport with mergify bug Team:Integrations Label for the Integrations team v7.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Filebeat] - unexpected expand_keys option in processors.0.decode_json_fields
5 participants
@axw @elasticmachine @urso @blakerouse @kvch