Skip to content

Commit 8b53395

Browse files
authored
Adding separate whitelist for ROSA HCP OBO derived remote-write billing metrics that are specific to ROSA/HCP. (#916)
Context: https://redhat-internal.slack.com/archives/C010A637DGB/p1746440313578859 Signed-off-by: Moad Zardab <[email protected]>
1 parent 98a7c27 commit 8b53395

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# ROSA HCP Billing Metrics
2+
There are a set of ROSA metrics that are federated from OBO into `telemeter-staging`, `telemeter-int` and `telemeter-prod`. These metrics are used for Subwatch billing of ROSA clusters via telemetry.
3+
4+
The remote-write config can be found [here](https://gitlab.cee.redhat.com/service/osd-fleet-manager/-/blob/main/config/resources/managed-cluster-monitoring-stack.yaml). *Do not modify* without express approval from the ROSA team in the #sd-rosa-hcp channel.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[
2+
"{__name__=\"hostedcluster:hypershift_cluster_vcpus:max\"}"
3+
]

resources/services/telemeter-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ objects:
296296
- --whitelist={__name__="workload:cpu_usage_cores:sum"}
297297
- --whitelist={__name__="workload:memory_usage_bytes:sum"}
298298
- --whitelist={__name__=~"cluster:usage:.*"}
299+
- --whitelist={__name__="hostedcluster:hypershift_cluster_vcpus:max"}
299300
- --elide-label=prometheus_replica
300301
- --log-level=${TELEMETER_LOG_LEVEL}
301302
- --token-expire-seconds=${TELEMETER_SERVER_TOKEN_EXPIRE_SECONDS}
@@ -596,6 +597,7 @@ objects:
596597
- --whitelist={__name__="workload:cpu_usage_cores:sum"}
597598
- --whitelist={__name__="workload:memory_usage_bytes:sum"}
598599
- --whitelist={__name__=~"cluster:usage:.*"}
600+
- --whitelist={__name__="hostedcluster:hypershift_cluster_vcpus:max"}
599601
- --elide-label=prometheus_replica
600602
- --log-level=${TELEMETER_LOG_LEVEL}
601603
- --token-expire-seconds=${TELEMETER_SERVER_TOKEN_EXPIRE_SECONDS}

services/telemeter-template.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ local telemeter = (import 'telemeter.libsonnet') {
1414
tokenExpireSeconds: '${TELEMETER_SERVER_TOKEN_EXPIRE_SECONDS}',
1515
telemeterForwardURL: '${TELEMETER_FORWARD_URL}',
1616

17-
whitelist+: (import '../configuration/telemeter/metrics.json'),
17+
whitelist+: (import '../configuration/telemeter/metrics.json') + (import '../configuration/telemeter-rosa/metrics.json'),
1818
elideLabels+: ['prometheus_replica'],
1919
resourceLimits:: {
2020
cpu: '${TELEMETER_SERVER_CPU_LIMIT}',

0 commit comments

Comments
 (0)