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

[Automation] Bump Golang version to 1.19.10 #35751

Merged
merged 6 commits into from
Jun 14, 2023
Merged

Conversation

apmmachine
Copy link
Contributor

Generated automatically with https://github.com/elastic/beats/actions/runs/5231696591


Bump golang-version to latest version

Update .golangci.yml
1.19.10
Release published on the 2023-06-10 22:37:09 +0000 UTC at the url https://github.com/elastic/golang-crossbuild/releases/tag/v1.19.10

## Go 1.19.10

- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-arm` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armel` - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armhf` - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-base`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips` - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips32` - linux/mips, linux/mipsle
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-ppc` - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-s390x` - linux/s390x

### Changes

- [Automation] Bump Golang version to 1.19.10 @apmmachine (#297)
- [1.19](backport #287) mergify automation @mergify (#294)
- [Automation] Bump Golang version to 1.19.9 @apmmachine (#289)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.20.4...v1.19.10
Update version.asciidoc
1.19.10
Release published on the 2023-06-10 22:37:09 +0000 UTC at the url https://github.com/elastic/golang-crossbuild/releases/tag/v1.19.10

## Go 1.19.10

- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-arm` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armel` - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armhf` - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-base`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips` - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips32` - linux/mips, linux/mipsle
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-ppc` - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-s390x` - linux/s390x

### Changes

- [Automation] Bump Golang version to 1.19.10 @apmmachine (#297)
- [1.19](backport #287) mergify automation @mergify (#294)
- [Automation] Bump Golang version to 1.19.9 @apmmachine (#289)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.20.4...v1.19.10
Update from dockerfiles
1.19.10
Release published on the 2023-06-10 22:37:09 +0000 UTC at the url https://github.com/elastic/golang-crossbuild/releases/tag/v1.19.10

## Go 1.19.10

- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-arm` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armel` - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armhf` - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-base`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips` - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips32` - linux/mips, linux/mipsle
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-ppc` - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-s390x` - linux/s390x

### Changes

- [Automation] Bump Golang version to 1.19.10 @apmmachine (#297)
- [1.19](backport #287) mergify automation @mergify (#294)
- [Automation] Bump Golang version to 1.19.9 @apmmachine (#289)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.20.4...v1.19.10
Update .go-version
1.19.10
Release published on the 2023-06-10 22:37:09 +0000 UTC at the url https://github.com/elastic/golang-crossbuild/releases/tag/v1.19.10

## Go 1.19.10

- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-arm` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armel` - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-armhf` - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-base`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-darwin` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian7` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian8` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian9` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian10` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-main-debian11` - linux/i386, linux/amd64, windows/386, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips` - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-mips32` - linux/mips, linux/mipsle
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-ppc` - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.19.10-s390x` - linux/s390x

### Changes

- [Automation] Bump Golang version to 1.19.10 @apmmachine (#297)
- [1.19](backport #287) mergify automation @mergify (#294)
- [Automation] Bump Golang version to 1.19.9 @apmmachine (#289)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.20.4...v1.19.10

Updatecli options Most of Updatecli configuration is done via Updatecli manifest.
  • If you close this pullrequest, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pullrequest, and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Action triggered automatically by Updatecli.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository github.com/updatecli/updatecli as a sign of appreciation.
Or tell us directly on our chat

Updatecli logo

... /beats/libbeat/docs/version.asciidoc"

Made with ❤️️ by updatecli
... /beats/.golangci.yml"

Made with ❤️️ by updatecli
... /beats/.go-version"

Made with ❤️️ by updatecli
... /beats/x-pack/functionbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/auditbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/heartbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/metricbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/packetbeat/Dockerfile"

Made with ❤️️ by updatecli
@apmmachine apmmachine requested review from a team as code owners June 12, 2023 19:46
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2023
@apmmachine apmmachine added the backport-skip Skip notification from the automated backport with mergify label Jun 12, 2023
@cmacknz cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jun 12, 2023
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2023
@cmacknz cmacknz added the backport-v8.8.0 Automated backport with mergify label Jun 13, 2023
@elasticmachine
Copy link
Collaborator

💚 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: 2023-06-13T21:07:03.322+0000

  • Duration: 129 min 31 sec

Test stats 🧪

Test Results
Failed 0
Passed 27336
Skipped 2013
Total 29349

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@cmacknz cmacknz merged commit e1c1f3a into main Jun 14, 2023
@cmacknz cmacknz deleted the updatecli_bump-golang-version branch June 14, 2023 00:32
mergify bot pushed a commit that referenced this pull request Jun 14, 2023
* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/libbeat/docs/version.asciidoc"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/.golangci.yml"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/.go-version"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/x-pack/functionbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/auditbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/heartbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/metricbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/packetbeat/Dockerfile"

Made with ❤️️ by updatecli

* Add changelog entry.

---------

Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit e1c1f3a)

# Conflicts:
#	libbeat/docs/version.asciidoc
cmacknz added a commit that referenced this pull request Jun 14, 2023
…35764)

* [Automation] Bump Golang version to 1.19.10 (#35751)

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/libbeat/docs/version.asciidoc"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/.golangci.yml"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/.go-version"

Made with ❤️️ by updatecli

* chore: Updated the content of the file "/tmp/updatecli/github/elastic...

... /beats/x-pack/functionbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/auditbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/heartbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/metricbeat/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/packetbeat/Dockerfile"

Made with ❤️️ by updatecli

* Add changelog entry.

---------

Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit e1c1f3a)

# Conflicts:
#	libbeat/docs/version.asciidoc

* Resolve conflict in version.asciidoc

---------

Co-authored-by: apmmachine <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
cmacknz added a commit to cmacknz/beats that referenced this pull request Jun 15, 2023
cmacknz added a commit to cmacknz/beats that referenced this pull request Jun 15, 2023
cmacknz added a commit that referenced this pull request Jun 15, 2023
cmacknz added a commit that referenced this pull request Jun 15, 2023
cmacknz added a commit to cmacknz/beats that referenced this pull request Jun 15, 2023
cmacknz added a commit that referenced this pull request Jun 20, 2023
…35780)

* Explicitly install netcat-openbsd everywhere.

The plain netcat package appears to have been removed in the latest
golang:1.19.10 base image.

* Setup a virtualenv in Docker containers.

This fixes the PEP668 error about "externally managed environments"
which prevents modifying the system python installation.

* Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)"

This reverts commit 27b1799.

* Reword CHANGELOG.next.asciidoc

Co-authored-by: subham sarkar <[email protected]>

* Improve PEP668 comments.

* Install latest PyYAML in test containers.

* Add check to see if already in a venv.

* Upgrade pytest and py.

Remove dependency on pytest-otel as it prevented upgrading pytest.

* Check for pre-set virtualenv earlier.

* Always create a fresh virtualenv in Docker.

Remove duplicate dependencies from the docker files.

* Fix metricbeat integration tests.

* Force install Python dependencies for Metricbeat.

---------

Co-authored-by: subham sarkar <[email protected]>
mergify bot pushed a commit that referenced this pull request Jun 20, 2023
…35780)

* Explicitly install netcat-openbsd everywhere.

The plain netcat package appears to have been removed in the latest
golang:1.19.10 base image.

* Setup a virtualenv in Docker containers.

This fixes the PEP668 error about "externally managed environments"
which prevents modifying the system python installation.

* Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)"

This reverts commit 27b1799.

* Reword CHANGELOG.next.asciidoc

Co-authored-by: subham sarkar <[email protected]>

* Improve PEP668 comments.

* Install latest PyYAML in test containers.

* Add check to see if already in a venv.

* Upgrade pytest and py.

Remove dependency on pytest-otel as it prevented upgrading pytest.

* Check for pre-set virtualenv earlier.

* Always create a fresh virtualenv in Docker.

Remove duplicate dependencies from the docker files.

* Fix metricbeat integration tests.

* Force install Python dependencies for Metricbeat.

---------

Co-authored-by: subham sarkar <[email protected]>
(cherry picked from commit 62374dd)

# Conflicts:
#	dev-tools/mage/pytest.go
#	libbeat/docs/version.asciidoc
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile
mergify bot pushed a commit that referenced this pull request Jun 20, 2023
…35780)

* Explicitly install netcat-openbsd everywhere.

The plain netcat package appears to have been removed in the latest
golang:1.19.10 base image.

* Setup a virtualenv in Docker containers.

This fixes the PEP668 error about "externally managed environments"
which prevents modifying the system python installation.

* Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)"

This reverts commit 27b1799.

* Reword CHANGELOG.next.asciidoc

Co-authored-by: subham sarkar <[email protected]>

* Improve PEP668 comments.

* Install latest PyYAML in test containers.

* Add check to see if already in a venv.

* Upgrade pytest and py.

Remove dependency on pytest-otel as it prevented upgrading pytest.

* Check for pre-set virtualenv earlier.

* Always create a fresh virtualenv in Docker.

Remove duplicate dependencies from the docker files.

* Fix metricbeat integration tests.

* Force install Python dependencies for Metricbeat.

---------

Co-authored-by: subham sarkar <[email protected]>
(cherry picked from commit 62374dd)

# Conflicts:
#	libbeat/docs/version.asciidoc
cmacknz added a commit that referenced this pull request Jun 20, 2023
…lang Debian base image (#35841)

* Upgrade to Go 1.19.10 and handle changes in golang Debian base image (#35780)

* Explicitly install netcat-openbsd everywhere.

The plain netcat package appears to have been removed in the latest
golang:1.19.10 base image.

* Setup a virtualenv in Docker containers.

This fixes the PEP668 error about "externally managed environments"
which prevents modifying the system python installation.

* Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)"

This reverts commit 27b1799.

* Reword CHANGELOG.next.asciidoc

Co-authored-by: subham sarkar <[email protected]>

* Improve PEP668 comments.

* Install latest PyYAML in test containers.

* Add check to see if already in a venv.

* Upgrade pytest and py.

Remove dependency on pytest-otel as it prevented upgrading pytest.

* Check for pre-set virtualenv earlier.

* Always create a fresh virtualenv in Docker.

Remove duplicate dependencies from the docker files.

* Fix metricbeat integration tests.

* Force install Python dependencies for Metricbeat.

---------

Co-authored-by: subham sarkar <[email protected]>
(cherry picked from commit 62374dd)

# Conflicts:
#	libbeat/docs/version.asciidoc

* Fix conflict in version.asciidoc

* Remove extra entry in CHANGELOG.next.asciidoc

---------

Co-authored-by: Craig MacKenzie <[email protected]>
cmacknz added a commit that referenced this pull request Jun 21, 2023
…olang Debian base image (#35840)

* ci: use ubuntu:22 workers (#34315)

(cherry picked from commit a5f15b6)

# Conflicts:
#	.ci/beats-tester.groovy
#	.ci/build-docker-images.groovy
#	.ci/heartbeat-synthetics.groovy
#	x-pack/filebeat/Jenkinsfile.yml
#	x-pack/metricbeat/Jenkinsfile.yml

* remove unexisting files in 7.17 when backporting another PR

* fix merge conflicts

* Upgrade to Go 1.19.10 and handle changes in golang Debian base image (#35780)

* Explicitly install netcat-openbsd everywhere.

The plain netcat package appears to have been removed in the latest
golang:1.19.10 base image.

* Setup a virtualenv in Docker containers.

This fixes the PEP668 error about "externally managed environments"
which prevents modifying the system python installation.

* Revert "Revert "[Automation] Bump Golang version to 1.19.10 (#35751)" (#35784)"

This reverts commit 27b1799.

* Reword CHANGELOG.next.asciidoc

Co-authored-by: subham sarkar <[email protected]>

* Improve PEP668 comments.

* Install latest PyYAML in test containers.

* Add check to see if already in a venv.

* Upgrade pytest and py.

Remove dependency on pytest-otel as it prevented upgrading pytest.

* Check for pre-set virtualenv earlier.

* Always create a fresh virtualenv in Docker.

Remove duplicate dependencies from the docker files.

* Fix metricbeat integration tests.

* Force install Python dependencies for Metricbeat.

---------

Co-authored-by: subham sarkar <[email protected]>
(cherry picked from commit 62374dd)

# Conflicts:
#	dev-tools/mage/pytest.go
#	libbeat/docs/version.asciidoc
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile

* Remove extra entry in CHANGELOG.next.asciidoc

* Fix conflict in version.asciidoc

* Fix conflict in requirements.txt

* Fix conflict in requirements_aix.txt

* Fix conflict in metricbeat Dockerfile

* Fix conflict in pytest.go

* Add missing force create virtual env option.

* python tests: compatibility and stability improvements (#31588)

This commit improves the compatibility and stability of Python tests
for Filebeat. It addresses two main probmes:
1. Some deprecated TLS functions are now raising deprecation
exceptions (since Python 3.10.0)
2. Some tests, on failure, leave Filebeat running and bound to port
8080, this creates a cascading failure of the subsequent tests that
require the same port to be available.

The main changes are:
 - Ensuring Filebeat process is always terminated, even if the test
 fails
 - Using the replacement methods/objects for the deprecated TLS
 functions.

(cherry picked from commit 682045a)

# Conflicts:
#	libbeat/tests/system/beat/beat.py

* Remove duplicate entries in CHANGELOG-developer.next.asciidoc

* Resolve conflicts in beat.py

---------

Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Craig MacKenzie <[email protected]>
Co-authored-by: Tiago Queiroz <[email protected]>
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify backport-v8.8.0 Automated backport with mergify 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.

3 participants