SWATCH-3295: Normalize the payg metrics to use the same tags and format #4159
+249
−165
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
Sgitario
force-pushed
the
jcarvaja/SWATCH-3295
branch
from
4ca3d92 to
baee756
Compare
Sgitario
changed the title
|
I prefer the formatting we use in our config files: |
I also prefer the same formatting we use in our config files, will change it for all the payg metrics. |
Sgitario
force-pushed
the
jcarvaja/SWATCH-3295
branch
2 times, most recently
from
371d2c8 to
6c44867
Compare
The counter "swatch_metrics_ingested_usage_total" is being displaying the metric as:
```
swatch_metrics_ingested_usage_total{billing_provider="aws",metric_id="Instance-hours",product="rosa"} 609.8702973568641
```
And it should be using the upper format:
```
swatch_metrics_ingested_usage_total{billing_provider="aws",metric_id="INSTANCE_HOURS",product="rosa"} 609.8702973568641
```
This is to work as the other metrics/counters.
Sgitario
force-pushed
the
jcarvaja/SWATCH-3295
branch
from
6cf175e to
86c863e
Compare
This reverts commit d831fdc.
Sgitario
force-pushed
the
jcarvaja/SWATCH-3295
branch
from
86c863e to
2f400ac
Compare
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.
Jira issue: SWATCH-3295
Depends on #4157
Description
All the payg metrics should have the same tags, units and use the same format to be used in the grafana dashboard.
This pull request addresses the following changes:
Change format of metric ID to use the metric ID code instead of the uppercase format
Some metrics were using one format or the another. All the metrics should use the same one.
Wrong billing_provider_id in "swatch_tally_tallied_usage_total", it should be "billing_provider"
The metric "swatch_tally_tallied_usage_total" was double counting. Fixed by reusing the logic to exclude duplicate snaps.
The metrics "swatch_contract_usage_total", "swatch_billable_usage_total" and "swatch_producer_metered_total" were expressed in billing units instead of metric units. We need to use the metric units, so the numbers in the grafana dashboard are consistent.
Reverts commit d831fdc. We're not using the json format anylonger in tests.
Testing
IQE Test MR: https://gitlab.cee.redhat.com/insights-qe/iqe-rhsm-subscriptions-plugin/-/merge_requests/1040