SWATCH-3295: Normalize the payg metrics to use the same tags and format #4159
Conversation
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
| "product", | ||
| "rosa", | ||
| "metric_id", | ||
| MetricIdUtils.getInstanceHours().getValue(), |
There was a problem hiding this comment.
Why are some of these toUpperCaseFormatted while others are getValue? Shouldn't it be the same call?
There was a problem hiding this comment.
Not sure what toUpperCaseFormatted do you exactly mean, but in general:
- the only logic that does change is about processing the payg metrics, where we'll use the metric format as shown in our configuration files (not the upper case format)
- the rest of the existing logic does not change, it keeps using the format that was using before (regardless if it's the upper case formatted or the value)
There was a problem hiding this comment.
OK. I thought we were standardizing the metric values across all usages.
|
/retest |
2 similar comments
|
/retest |
|
/retest |
|
/retest |
1 similar comment
|
/retest |
IQE Tests Summary Report |
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