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.

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

Filebeat: Ensure module pipelines compatibility with previous versions of Elasticsearch (backport #26737) #27841

Merged
merged 4 commits into from
Sep 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 9, 2021

This is an automatic backport of pull request #26737 done by Mergify.
Cherry-pick of 181cf69 has failed:

On branch mergify/bp/7.x/pr-26737
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 181cf692ac.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   filebeat/Jenkinsfile.yml
	modified:   filebeat/fileset/compatibility.go
	modified:   filebeat/fileset/compatibility_test.go
	modified:   filebeat/tests/system/test_modules.py
	new file:   testing/environments/7.11.yml
	modified:   x-pack/filebeat/Jenkinsfile.yml
	modified:   x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml
	both modified:   x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

…s of Elasticsearch (#26737)

Improve the pipeline/compatibility code so that all processors in a pipeline
are scanned and acted-upon to ensure compatibility. This means:
 - Scan processors in on_failure section (both the pipeline's and each
   individual processor on-failure handler).
 - Scan the inner processor in a foreach processor.

Add a new CI stage, module-compat-7.11, to filebeat/Jenkinsfile.yml
and x-pack/filebeat/Jenkinsfile.yml, in order to run Filebeat modules tests
under ES 7.11.2 to ensure that all pipelines are functional.

This test uses a new flag, TESTING_FILEBEAT_SKIP_DIFF, to instruct the
integration test to skip the comparison between the generated documents and
the golden/expected files. The test will ensure that the pipeline loads,
there are no ingest errors, the fields in the generated documents are valid
and the number of returned documents matches the expected. This is intended
to avoid having to maintain multiple versions of the golden files due to
differences between ES versions and available processors.

Also fixes the fortinet and threatintel modules pipelines so that they pass
the new test, as some fields were left behind due to the uri_parts
processor being removed.

(cherry picked from commit 181cf69)

# Conflicts:
#	x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml
#	x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 9, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@andrewkroh andrewkroh added Filebeat Filebeat needs_team Indicates that the issue/PR needs a Team:* label labels Sep 9, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@andrewkroh andrewkroh added backport needs_team Indicates that the issue/PR needs a Team:* label labels Sep 9, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2021
@botelastic
Copy link

botelastic bot commented Sep 9, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 9, 2021

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-09T15:59:42.910+0000

  • Duration: 152 min 45 sec

  • Commit: 7601b24

Test stats 🧪

Test Results
Failed 0
Passed 53901
Skipped 5268
Total 59169

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 53901
Skipped 5268
Total 59169

…beat tests (#19896)

These setting has been removed as per elastic/elasticsearch#59262 causing the ES container to not launch.

    elasticsearch_1  | java.lang.IllegalArgumentException: unknown setting [script.cache.max_size] please check that any required plugins are installed, or check the breaking changes documentation for removed settings
@andrewkroh
Copy link
Member

I added in #19896 b/c there was a dependency on it.

@andrewkroh andrewkroh merged commit a0caf04 into 7.x Sep 9, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-26737 branch September 9, 2021 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Filebeat Filebeat
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants