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

[8.x](backport #42286) update kafka version used in testing to 3.6.0 #42689

Merged
merged 6 commits into from
Feb 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 13, 2025

Proposed commit message

Updated kafka version used in our integration tests

Based on #41833

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.

Disruptive User Impact

Kafka version 4.0 will not be compatible with client libraries using protocol version less than 2.1.0

Related issues

Closes #41654


This is an automatic backport of pull request #42286 done by Mergify.

* update kafka version used in testing

* some environment changes

* boostrap

* 3.6.0 versio  change

* Update metricbeat/module/kafka/_meta/healthcheck.sh

Co-authored-by: Linu-Elias <[email protected]>

* uncomment compose waiting

* kafka 3.6.0 fix

* fix mistake in path to adminclient.properties

* fix kafka image link in docker-compose

* fix libbeats kafka docker testing image

* bump kafka to 2.13

* update kafka version in partition.go

* update kafka version in docs

---------

Co-authored-by: Khushi Jain <[email protected]>
Co-authored-by: Linu-Elias <[email protected]>
(cherry picked from commit fb79d49)

# Conflicts:
#	metricbeat/module/kafka/consumergroup/consumergroup.go
#	metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go
#	metricbeat/module/kafka/partition/partition.go
#	testing/environments/docker/kafka/Dockerfile
@mergify mergify bot requested a review from a team as a code owner February 13, 2025 10:33
@mergify mergify bot added the backport label Feb 13, 2025
@mergify mergify bot requested a review from a team as a code owner February 13, 2025 10:33
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 13, 2025
@mergify mergify bot requested review from belimawr and rdner and removed request for a team February 13, 2025 10:33
Copy link
Contributor Author

mergify bot commented Feb 13, 2025

Cherry-pick of fb79d49 has failed:

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

You are currently cherry-picking commit fb79d4957.
  (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:   libbeat/docker-compose.yml
	modified:   metricbeat/docker-compose.yml
	modified:   metricbeat/docs/modules/kafka.asciidoc
	modified:   metricbeat/module/kafka/README.md
	modified:   metricbeat/module/kafka/_meta/Dockerfile
	new file:   metricbeat/module/kafka/_meta/adminclient.properties
	modified:   metricbeat/module/kafka/_meta/docs.asciidoc
	modified:   metricbeat/module/kafka/_meta/healthcheck.sh
	modified:   metricbeat/module/kafka/_meta/run.sh
	modified:   metricbeat/module/kafka/_meta/supported-versions.yml
	modified:   metricbeat/module/kafka/broker/_meta/docs.asciidoc
	modified:   metricbeat/module/kafka/consumer/_meta/docs.asciidoc
	modified:   metricbeat/module/kafka/docker-compose.yml
	modified:   metricbeat/module/kafka/producer/_meta/docs.asciidoc
	modified:   testing/environments/docker/kafka/healthcheck.sh
	modified:   testing/environments/docker/kafka/run.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/kafka/consumergroup/consumergroup.go
	both modified:   metricbeat/module/kafka/consumergroup/consumergroup_integration_test.go
	both modified:   metricbeat/module/kafka/partition/partition.go
	both modified:   testing/environments/docker/kafka/Dockerfile

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 13, 2025
@botelastic
Copy link

botelastic bot commented Feb 13, 2025

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

@shmsr
Copy link
Member

shmsr commented Feb 13, 2025

@stefans-elastic some conflicts here.

@stefans-elastic
Copy link
Contributor

@shmsr could you approve? (I've resolved issues)

@stefans-elastic
Copy link
Contributor

@shmsr nvm, it allows me to merge it

@stefans-elastic stefans-elastic merged commit b311f8d into 8.x Feb 14, 2025
143 checks passed
@stefans-elastic stefans-elastic deleted the mergify/bp/8.x/pr-42286 branch February 14, 2025 12:47
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants