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] Add more complete tests for opt parameters in ES output #18393

Merged
merged 2 commits into from
May 12, 2020
Merged

[Libbeat] Add more complete tests for opt parameters in ES output #18393

merged 2 commits into from
May 12, 2020

Conversation

ph
Copy link
Contributor

@ph ph commented May 8, 2020 •
edited
Loading

This PR add additionnal test over the usager of the parameters options
in the Elasticsearch output:

  • When preconfigured params are set without local params
  • When preconfigured params are set with local params
  • When no preconfigured params are configured but local are.
  • When no preconfigured or local params are set.

The merge is also done close to the actual calls and will not be
executed if anything fails before the bulk request.

The test assertion is now more solid and take into consideration any
errors.

See discussion in #18318 and #18326

What does this PR do?

Why is it important?

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.

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@ph
[Libbeat] Add more complete tests for opt parameters in ES output
ebc2a44 
This PR add additionnal test over the usager of the `parameters` options
in the Elasticsearch output:

- When preconfigured params are set without local params
- When preconfigured params are set with local params
- When no preconfigured params are configured but local are.
- When no preconfigured or local params are set.

The merge is also done close to the actual calls and will not be
executed if anything fails before the bulk request.

The test assertion is now more solid and take into consideration any
errors.

See discussion in #18318 and #18326
@ph ph requested review from urso and ruflin May 8, 2020 17:51
@elasticmachine
Copy link
Collaborator

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 8, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 8, 2020 •
edited
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 7764
Skipped 1236
Total 9000

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Result: FAILURE

    • Duration: 1 min 28 sec

    • Start Time: 2020-05-11T16:26:34.371+0000

    • log

@andresrc andresrc removed the needs_team Indicates that the issue/PR needs a Team:* label label May 9, 2020
michalpristas
michalpristas approved these changes May 11, 2020
View reviewed changes
Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

LGTM

ruflin
ruflin approved these changes May 11, 2020
View reviewed changes
Copy link
Collaborator

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. We should also backport these to 7.x to make sure we don't break things there.

@ph ph added the needs_backport PR is waiting to be backported to other branches. label May 11, 2020
urso
urso reviewed May 11, 2020
View reviewed changes
libbeat/esleg/eslegclient/bulkapi_mock_test.go

for k, v := range test.expected {
assert.Equal(t, recParams.Get(k), v)
}
Copy link

Choose a reason for hiding this comment

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

assert.Equal(t, test.expected, recParams) should actually work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

+/- the url.Values is a map[string][]string, which I find a bit weird, where every accessor only deals with key/value.. :

Copy link

Choose a reason for hiding this comment

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

Does it make sense to add another check that recParams does not include additional fields not found in test.exptected?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We already do that by comparing the len of the map, so the len all items need to match.
https://github.com/elastic/beats/pull/18393/files#diff-7bf553dedc14bb868bc139267101d16cR248

@ph ph merged commit 9c8bbaa into elastic:master May 12, 2020
@ph ph mentioned this pull request May 13, 2020
Merged
6 tasks
@ph ph added v7.9.0 and removed needs_backport PR is waiting to be backported to other branches. labels May 13, 2020
@ph ph mentioned this pull request May 13, 2020
Merged
6 tasks
@ph ph added the v7.8.0 label May 13, 2020
ph added a commit that referenced this pull request May 14, 2020
@ph
[Libbeat] Add more complete tests for opt parameters in ES output (#1…
ca0bf8d 
…8393) (#18491)

* [Libbeat] Add more complete tests for opt parameters in ES output

This PR add additionnal test over the usager of the `parameters` options
in the Elasticsearch output:

- When preconfigured params are set without local params
- When preconfigured params are set with local params
- When no preconfigured params are configured but local are.
- When no preconfigured or local params are set.

The merge is also done close to the actual calls and will not be
executed if anything fails before the bulk request.

The test assertion is now more solid and take into consideration any
errors.

See discussion in #18318 and #18326

(cherry picked from commit 9c8bbaa)
ph added a commit that referenced this pull request May 19, 2020
@ph
[Libbeat] Add more complete tests for opt parameters in ES output (#1…
b1c70b0 
…8393) (#18492)

* [Libbeat] Add more complete tests for opt parameters in ES output

This PR add additionnal test over the usager of the `parameters` options
in the Elasticsearch output:

- When preconfigured params are set without local params
- When preconfigured params are set with local params
- When no preconfigured params are configured but local are.
- When no preconfigured or local params are set.

The merge is also done close to the actual calls and will not be
executed if anything fails before the bulk request.

The test assertion is now more solid and take into consideration any
errors.

See discussion in #18318 and #18326

(cherry picked from commit 9c8bbaa)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@urso urso urso approved these changes

@ruflin ruflin ruflin approved these changes

@michalpristas michalpristas michalpristas approved these changes

Assignees
No one assigned
Labels
review v7.8.0 v7.9.0 [zube]: In Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ph @elasticmachine @urso @ruflin @michalpristas @andresrc