Skip to content

Conversation

@jsvd
Copy link
Member

@jsvd jsvd commented May 5, 2021

This PR changes the DLQ integration tests to not rely on default names of indices for writing data to ES.
Also ensures ES is started in a single node mode.

These changes remove some of the magic of the integration test, where we relied on a index having a template with a geoip field with geo data types already. In these commits we explicitly push a template and then use a message that clearly clashes with that template.

@jsvd jsvd force-pushed the fix_integration_tests branch from 9045fa1 to c9f68fe Compare May 6, 2021 09:36
@jsvd jsvd changed the title attempt to fix integration tests fix DLQ integration tests May 6, 2021
@jsvd jsvd marked this pull request as ready for review May 6, 2021 09:37
Copy link
Contributor

@andsel andsel left a comment

Choose a reason for hiding this comment

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

LGTM, only tiny doubt on the change of pipeline.batch.size

"dead_letter_queue.enable" => true,
"pipeline.batch.size" => 1,
"config.string" => "input { generator { message => '#{message}' codec => \"json\" count => 1000 } } filter { mutate { add_field => { \"geoip\" => \"somewhere\" } } } output { elasticsearch {} }"
"pipeline.batch.size" => 100,
Copy link
Contributor

Choose a reason for hiding this comment

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

The downsize of the batch size is it functional to the test or to the fact that now it's single node cluster?

Copy link
Contributor

Choose a reason for hiding this comment

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

don't mind my comment, I thought it passed from 100 to 1, but it's opposite and is reasonable to have a batch greater than the unit

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah having size 1 was making these tests unnecessarily slow

andsel added a commit that referenced this pull request May 6, 2021
Disable datastreams and provide explicit index name to avoid automatically creation of datastreams in ES > 8.0.
Same as in PR #12871
@jsvd jsvd merged commit 3e0c61a into elastic:master May 6, 2021
@jsvd jsvd deleted the fix_integration_tests branch May 6, 2021 12:56
kares added a commit to kares/logstash that referenced this pull request May 10, 2021
* master:
  fix DLQ integration tests (elastic#12871)
  Fix ES HOW integration tests on `master` (elastic#12872)
  Update logstash_releases.json
  Support for UTF-16 and other multi-byte-character logfiles (elastic#9702)
  change download path for geoip plugin (elastic#12863)
  Change Gradle's :logstash-integration-tests:integrationTests task to depends on copyES (elastic#12847)
  Doc: Keystore must be accessible to logstash user (elastic#12775)
  Remove json ~>1 pinning (elastic#12851)
  Adapted install/uninstall/list PluginManager's command to respect the alised plugins (elastic#12821)
  Load a plugin by alias name. (elastic#12796)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants