Upgrade agent to prometheus 2.51 #6754
Closed
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
…ork with prom 0.51.0
|
Had to use two forks:
|
thampiotr
force-pushed
the
6580-upgrade-agent-to-prometheus-250
branch
from
7b405c3 to
2f5e452
Compare
mattdurham
reviewed
Mar 26, 2024
| //TODO(ptodev): It looks messy to have a refresh metrics separate from the other SD metrics. | ||
| // Can we make this cleaner? The reason it was made like this currently, | ||
| // is so that metrics exposed by Prometheus executables don't change. | ||
| refreshMetrics := discovery.NewRefreshMetrics(o.Registerer) |
There was a problem hiding this comment.
This feels ugly, so we dont have to Register the the refreshMetrics but we do need to unregister them? And then since we can get a newdiscover on the channel we have to unregister there. The fact they aren't balanced from looking at the code makes it rough.
mattdurham
reviewed
Mar 26, 2024
| wg.Add(1) | ||
| go func() { | ||
| c.runDiscovery(newCtx, disc) | ||
| c.sdMetrics.Unregister() |
There was a problem hiding this comment.
This feels like it should break if we create the discovering multiple time in the Update.
mattdurham
reviewed
Mar 26, 2024
| @@ -48,14 +48,14 @@ Name | Type | Description | Default | Required | |||
| `forward_to` | `list(MetricsReceiver)` | List of receivers to send scraped metrics to. | | yes | |||
| `job_name` | `string` | The value to use for the job label if not already set. | component name | no | |||
| `extra_metrics` | `bool` | Whether extra metrics should be generated for scrape targets. | `false` | no | |||
| `enable_protobuf_negotiation` | `bool` | Whether to enable protobuf negotiation with the client. | `false` | no | |||
There was a problem hiding this comment.
Should this go into breaking changes documentation?
rfratto
added
variant/static
|
This is replaced now with grafana/alloy#794 in Alloy. |
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR Description
Upgrading to Prometheus 0.51.0.
Which issue(s) this PR fixes
Fixes grafana/alloy#227
Notes to the Reviewer
There are various TODOs in the code many of which need to be looked into. I'm also not sure how to implement this change. It seems like the default list of
scrape_protocolschanges if you enable native histograms.When I start static mode, I get an error such as this:
This seems to be because feature gate code from OTel was copied to the Prometheus codebase. I tried to resolve this by replacing...
...with...
...but it didn't work.
A big part of this PR is not using globally registered metrics for Prometheus Scrape and Service Discovery. The way we initialise the SD and scrape managers has changed. When testing this, it's important that we catch issues with double metric registrations and with improper unregistrations. Try this:
For example, maybe something like this is a good start: static.yml.txt
I also haven't checked if there are any other config options which we need to add.
PR Checklist