Fix single-tenant metrics not to filter by tenant #7385
Merged
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
msullivan
approved these changes
May 23, 2024
|
Though there is also the question of: should we be removing the tenant label when filtering by tenant at all? |
I would prefer not to - if querying metrics for tenant X does not include the tenant label, then at the point where we scrape the metrics, we would have to go out of our way to add the tenant label back in, so that in our metrics storage system per-tenant metrics are queryable. since the server already knows the per-tenant metrics, there's very little point in stripping the label out only to immediately add it back. |
zackelan
approved these changes
May 23, 2024
|
Sounds good, I'll add the label back. |
msullivan
added
backported-5.x
msullivan
pushed a commit
that referenced
this pull request
Jul 1, 2024
* Fix single-tenant metrics not to filter by tenant * Always print all labels in /metrics
msullivan
pushed a commit
that referenced
this pull request
Jul 1, 2024
* Fix single-tenant metrics not to filter by tenant * Always print all labels in /metrics
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.
This is a bug introduced in #7024 that
/metricsreturns different results using HTTP or HTTPS protocol under single-tenant mode. This PR fixes so that/metricsnever filter by tenant under single-tenant mode.This PR also fixes the test to
fetch_metrics()with TLS certificate and adds a test to make sureedgedb_server_compiler_processes_current- as an example - is not filtered out.