-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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
[kube-prometheus-stack] Added fallbackScrapeProtocol option to additionalServiceMonitors and additionalPodMonitors #5108
Merged
jkroepke
merged 6 commits into
prometheus-community:main
from
chazapp:fallback-scrape-protocol-for-additional
Jan 3, 2025
Merged
+17
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chazapp
requested review from
andrewgkew,
gianrubio,
gkarthiks,
GMartinez-Sisti,
jkroepke,
QuentinBisson,
scottrigby and
Xtigyro
as code owners
January 2, 2025 15:36
chazapp
changed the title
[kube-prometheus-stack] #5104 Added fallbackScrapeProtocol option to additionalServiceMonitors and additionalPodMonitors
[kube-prometheus-stack] Added fallbackScrapeProtocol option to additionalServiceMonitors and additionalPodMonitors
Jan 2, 2025
jkroepke
previously approved these changes
Jan 3, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! LGTM
jkroepke
reviewed
Jan 3, 2025
PLease bump the chart version! |
) * [prometheus-push-gateway] Add lifecycle hooks Fixes prometheus-community#5102 Add support for lifecycle hooks in the push-gateway deployment. * Add lifecycle hooks configuration to `charts/prometheus-pushgateway/templates/deployment.yaml` * Add lifecycle hooks configuration to `charts/prometheus-pushgateway/templates/statefulset.yaml` * Add lifecycle hooks configuration options in `charts/prometheus-pushgateway/values.yaml` Signed-off-by: Duncan Schulze <[email protected]> * address comments Signed-off-by: Duncan Schulze <[email protected]> * Correct placement of lifecycle Signed-off-by: zeritti <[email protected]> * Add CI test cases Signed-off-by: zeritti <[email protected]> --------- Signed-off-by: Duncan Schulze <[email protected]> Signed-off-by: zeritti <[email protected]> Co-authored-by: zeritti <[email protected]> Signed-off-by: Alexandre Joris <[email protected]>
…eProtocol option to additionalServiceMonitors and additionalPodMonitors Signed-off-by: Alexandre Joris <[email protected]>
Signed-off-by: Alexandre Joris <[email protected]>
…ty#5111) Signed-off-by: drfaust92 <[email protected]> Signed-off-by: Alexandre Joris <[email protected]>
Signed-off-by: Alexandre Joris <[email protected]>
chazapp
force-pushed
the
fallback-scrape-protocol-for-additional
branch
from
January 3, 2025 09:11
ff456a8
to
d9c7052
Compare
Signed-off-by: Alexandre Joris <[email protected]>
@jkroepke bumped chart to v67.7.0 ! |
jkroepke
approved these changes
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
Prometheus v3 Migration Guide :
This merge requests allows users of the
additionalServiceMonitors
andadditionalPodMonitors
configurations to set thefallbackScrapeProtocol
for theirServiceMonitor
andPodMonitor
specs.Which issue this PR fixes
(optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged)Special notes for your reviewer
Checklist
[prometheus-couchdb-exporter]
)