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

Fix: docker compose pip dependencies #36122

Conversation

kuisathaverat
Copy link
Contributor

What does this PR do?

Ti changes the version of PyYAML to 5.4.1 due to dependency conflicts with docker-compose 1.29.2. The version of PyYAML must be 6< to fix the conflict.

Why is it important?

Several targets are broken because of this conflict.

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

cd beats/x-pack/heartbea
make -C ironbank package
cd metricbeat
mage goIntegTest
cd metricbeat
mage pythonIntegTest
cd x-pack/metricbeat
mage goIntegTest
cd x-pack/metricbeat
mage pythonIntegTest

elasticmachine and others added 30 commits April 26, 2023 12:59
Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit 320d822)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
…c#35241)

(cherry picked from commit af115f0)

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
…tic#35156) (elastic#35243)

* fix: update elasticsearch reporter with valid memqueue settings

* test: add elasticsearch reporter config test

* test: stop the reporter once we are finished

* lint: fix goimports errors

(cherry picked from commit aa17523)

Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit c80b6dd)

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
…5273)

* IIS and MYSQL  json update

* Update changelog

* Updating the snapshot version for CI/CD

---------

Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit f5ace09)

Co-authored-by: Ishleen Kaur <102962586+ishleenk17@users.noreply.github.com>
Co-authored-by: Denis <denis.rechkunov@elastic.co>
…lastic#35261)

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

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

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

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: Denis <denis.rechkunov@elastic.co>
…stic#35257) (elastic#35296)

(cherry picked from commit 7524a41)

Co-authored-by: Anderson Queiroz <anderson.queiroz@elastic.co>
…stic#35335)

We really only test against / have confirmed this working well with
`setcap`. This PR updates the docs to reflect our recommended usage.

(cherry picked from commit c0b84e4)

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
…ovider (elastic#35300) (elastic#35347)

* add cloud.region field for GCE cloud provider

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* instead of relyin on assumed length of <zone>, remove last element after '-' separators

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 42ca469)

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
…lastic#35340)

(cherry picked from commit a23610d)

Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com>
…lastic#35280)

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

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

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

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…) (elastic#35337)

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
(cherry picked from commit f9f03fd)

Co-authored-by: Michael Montgomery <mmontg1@gmail.com>
… run (elastic#35268) (elastic#35332)

* Fix conditions to decode_json_fields and which pipeline to run

* Fix pipeline condition

* Propery merge ingest log content

(cherry picked from commit 3ee25d0)

Co-authored-by: Carlos Crespo <crespocarlos@users.noreply.github.com>
…el (elastic#35317) (elastic#35358)

- After the first occurrence of a channel not found log, subsequent
logs for this message will be logged at debug level. Once there are
no errors, the flag will be reset.

(cherry picked from commit 7e3bd7c)

Co-authored-by: Taylor Swanson <90622908+taylor-swanson@users.noreply.github.com>
…stic#35302) (elastic#35366)

* update azure metadata api version

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* fix linter

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 25e882f)

Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
…lastic#35361)

* [Heartbeat] Fix run from location in states loader

The states loader currently does not correctly read the location from
the `heartbeat.run_from.id` config option. It's currently only applied
to the `observer.*` fields. This patch fixes that.

* Fix errcheck

* Add tests

* Fixes

* Add changelog

* More nil checks

---------

Co-authored-by: Vignesh Shanmugam <vignesh.shanmugam22@gmail.com>
(cherry picked from commit 3550280)

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
…... (elastic#35381)

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…9.9 (elastic#35385)

* [Automation] Bump Golang version to 1.19.9 (elastic#35367)

* chore: 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"
Updated the content of the file "/tmp/updatecli/github/elastic/beats/x-pack/functionbeat/Dockerfile"

Made with ❤️️ by updatecli

* 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

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
(cherry picked from commit f65554f)

# Conflicts:
#	libbeat/docs/version.asciidoc

* Resolve conflicts in version.asciidoc

---------

Co-authored-by: apmmachine <58790750+apmmachine@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
…35374)

(cherry picked from commit c722b96)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
)

Co-authored-by: Josh Dover <1813008+joshdover@users.noreply.github.com>
Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
…... (elastic#35402)

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…#35405)

* [Heartbeat] Fix NPE on reloads with run_from

we incorrectly always read from the beat location which may be null,
this fixes that.

* add tests

(cherry picked from commit 9072ba6)

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
…... (elastic#35413)

... /beats/testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…5417)

We currently allow any chars in state location names, this normalizes
them to [A-Za-z0-9_-_] for easier handling.

(cherry picked from commit b0ce603)

Co-authored-by: Andrew Cholakian <andrewvc@elastic.co>
…ic#35386) (elastic#35422)

(cherry picked from commit 0aca373)

Co-authored-by: DeDe Morton <dede.morton@elastic.co>
elastic#35414)

* Clean up config file

* Fix zero duration panic

* Add changelog

* Address feedback

(cherry picked from commit 29fcd59)

Co-authored-by: Emilio Alvarez Piñeiro <95703246+emilioalvap@users.noreply.github.com>
* Remove unnecessary logging

The log line remove by this commit is unnecessary, it is not an actual
error in the sense something will not work. It only means the
harvester is already running for this file so another one does not
need to be started. Keeping this log line will only spam our log files
and make users worried.

* PR improvements

* Restoring the error context.

(cherry picked from commit a070ea1)

Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co>
apmmachine and others added 8 commits July 6, 2023 09:44
…ml" (elastic#36002)

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
(cherry picked from commit e5db103)

Co-authored-by: Alessandro Stoltenberg <alstolten@gmail.com>
…lastic#36039)

* chore: Updated to content "" in file "testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

* chore: Updated to content "" in file "testing/environments/snapshot.yml"

Made with ❤️️ by updatecli

---------

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…ml" (elastic#36059)

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
…ml" (elastic#36069)

Made with ❤️️ by updatecli

Co-authored-by: apmmachine <apmmachine@users.noreply.github.com>
Upgrading to 6.0.1 did not work because there is a dependency conflict with docker-compose.

When using the version 5.4.1 the following error message appears when trying to run `pip install -r requirements.txt`

```
AttributeError: cython_source
```

Related issue: yaml/pyyaml#601
@kuisathaverat kuisathaverat requested review from a team as code owners July 20, 2023 07:54
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 20, 2023
@botelastic botelastic bot added Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 20, 2023
@mergify
Copy link
Contributor

mergify bot commented Jul 20, 2023

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 fix/docker-compose-pip-dependencies upstream/fix/docker-compose-pip-dependencies
git merge upstream/main
git push upstream fix/docker-compose-pip-dependencies

@mergify
Copy link
Contributor

mergify bot commented Jul 20, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @kuisathaverat? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@mergify
Copy link
Contributor

mergify bot commented Jul 20, 2023

⚠️ The sha of the head commit of this PR conflicts with #36123. Mergify cannot evaluate rules on this PR. ⚠️

@shmsr
Copy link
Member

shmsr commented Jul 21, 2023

Not possible to pin 5.4.1 as of now. See: #36119 I've written about this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants