All the payg metrics should have the same tags and use the same format to be used in the grafana dashboard.

I found the following issues:

• Wrong format for metric_id in counter "swatch_metrics_ingested_usage_total"

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

When the rest of the metrics, use the upper case metric ID format:

swatch_tally_tallied_usage_total{billing_provider_id="aws",metric_id="CORES",product="rosa"} 4992.0209073375845

We need to change all the metrics ID format to use the one that is configured in our config files.

• Wrong billing_provider_id in "swatch_tally_tallied_usage_total"

Found:

swatch_tally_tallied_usage_total{billing_provider_id="aws",metric_id="CORES",product="rosa"} 4992.0209073375845

And it should be:

swatch_tally_tallied_usage_total{billing_provider="aws",metric_id="CORES",product="rosa"} 4992.0209073375845

• The metric "swatch_tally_tallied_usage_total" is counted double