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

docs: Fix prometheus port regex #32030

Merged
merged 1 commit into from
Apr 24, 2024
Merged

docs: Fix prometheus port regex #32030

merged 1 commit into from
Apr 24, 2024

Conversation

JBodkin-Amphora
Copy link
Contributor

The example documentation in prometheus has a different regex pattern compared cilium. In some instances, prometheus or the opentelemetry collector is not picking up the correct port, because the relabel config is not applying since the regex doesn't match.

@maintainer-s-little-helper
Copy link

Commit 8e7a979 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 17, 2024
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Apr 17, 2024
Signed-off-by: James Bodkin <james.bodkin@amphora.net>
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Apr 17, 2024
@lambdanis lambdanis added area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 19, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 19, 2024
@lambdanis lambdanis added needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch and removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 19, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 19, 2024
@lambdanis lambdanis added release-note/misc This PR makes changes that have no direct user impact. and removed area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 19, 2024
@lambdanis
Copy link
Contributor

/test

Copy link
Contributor

@lambdanis lambdanis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @JBodkin-Amphora.

It looks like the original examples come from some ancient version of Prometheus like v0.19.0. On a side note, Cilium docs around Prometheus could use a general refresh IMO, hopefully one day :)

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Apr 23, 2024
@ti-mo ti-mo added this pull request to the merge queue Apr 24, 2024
Merged via the queue into cilium:main with commit 49334a5 Apr 24, 2024
62 checks passed
@gandro gandro mentioned this pull request Apr 29, 2024
18 tasks
@gandro gandro added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Apr 29, 2024
@gandro gandro mentioned this pull request Apr 30, 2024
13 tasks
@gandro gandro added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Apr 30, 2024
@gandro gandro mentioned this pull request Apr 30, 2024
10 tasks
@gandro gandro added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Apr 30, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants