Alerting: adapt sum of gauges to use options #584
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
alexweav
approved these changes
Sep 20, 2024
pstibrany
reviewed
Sep 23, 2024
| for _, tenantEntry := range d { | ||
| if tenantEntry.tenant == "" { | ||
| continue | ||
| } | ||
|
|
||
| result := singleValueWithLabelsMap{} | ||
| tenantEntry.metrics.sumOfSingleValuesWithLabels(metric, labelNames, gaugeValue, result.aggregateFn, false) | ||
| tenantEntry.metrics.sumOfSingleValuesWithLabels(metric, opts.labelNames, gaugeValue, result.aggregateFn, opts.skipZeroValueMetrics) |
There was a problem hiding this comment.
Could you please add unit test showing that skipping of zero values works?
pstibrany
reviewed
Sep 23, 2024
|
|
||
| // SendSumOfGaugesPerTenantWithLabels provides metrics with the provided label names on a per-tenant basis. This function assumes that `tenant` is the | ||
| // first label on the provided metric Desc | ||
| func (d MetricFamiliesPerTenant) SendSumOfGaugesPerTenantWithLabels(out chan<- prometheus.Metric, desc *prometheus.Desc, metric string, labelNames ...string) { |
There was a problem hiding this comment.
To avoid breaking clients, can we keep this function and reimplement it using SendSumOfGaugesPerTenant + WithLabels option? (We can mark it as deprecated if we want to get rid of it)
We can then also revert changes in the unit tests, to prove that function still works as before.
There was a problem hiding this comment.
Good point, no breaking changes then. Added it now and reverted unit tests also 👍
pstibrany
approved these changes
Sep 23, 2024
Co-authored-by: Peter Štibraný <pstibrany@gmail.com>
Added now. Thanks for the review 🙌 |
|
Thank you. |
4 tasks
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.
To be able to filter 0 value gauges per tenant, we need to adapt the helper as it was done already before for other metrics.
Trying to follow the name convention, but not sure if we should introduce a new function instead. Despite being simple to adapt, it would require changes