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

Support SASL/SCRAM authentication in the Kafka input. #31167

Merged
merged 12 commits into from
Apr 5, 2022

Conversation

faec
Copy link
Contributor

@faec faec commented Apr 5, 2022

What does this PR do?

This is a clone of #30791 by @lpflpf, which enables SASL/SCRAM authentication in the Kafka input. This PR is identical to the previous one except it adds:

  • an integration test exercising the new flags
  • a reference configuration for the Kafka input (which was apparently missing from the documentation)

(...since the original PR was idle for a while and I don't have permission to edit that branch directly.)

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

This test uses the Kafka test container. To try it without running the full integration test suite, start the container by itself:

docker build -t kafka testing/environments/docker/kafka
docker run -p 127.0.0.1:9092:9092/tcp -p 127.0.0.1:9093:9093/tcp --rm --name kafkatest -d kafka

and remove the //go:build integration guards on the test file before running go test.

Closes #31086.

@faec faec added enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Apr 5, 2022
@faec faec requested a review from rdner April 5, 2022 17:15
@faec faec requested a review from a team as a code owner April 5, 2022 17:15
@faec faec self-assigned this Apr 5, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@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 5, 2022
@mergify
Copy link
Contributor

mergify bot commented Apr 5, 2022

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 kafka-input-sasl upstream/kafka-input-sasl
git merge upstream/main
git push upstream kafka-input-sasl

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@faec faec changed the title Kafka input sasl Support SASL/SCRAM authentication in the Kafka input. Apr 5, 2022
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 5, 2022

💚 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: 2022-04-05T19:40:07.435+0000

  • Duration: 70 min 20 sec

Test stats 🧪

Test Results
Failed 0
Passed 6192
Skipped 728
Total 6920

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@faec faec merged commit 5b95a86 into elastic:main Apr 5, 2022
@faec faec deleted the kafka-input-sasl branch April 5, 2022 20:53
emilioalvap pushed a commit to emilioalvap/beats that referenced this pull request Apr 6, 2022
kush-elastic pushed a commit to kush-elastic/beats that referenced this pull request May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create integration tests for Filebeat Kafka input with SASL auth
4 participants