File tree 3 files changed +6
-2
lines changed
3 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -112,7 +112,8 @@ whitelisted_metrics: $(GOJSONTOYAML) $(GOJQ) configuration/telemeter/metrics.jso
112
112
configuration/telemeter/metrics.json :
113
113
@echo " >>>>> Running whitelisted_metrics"
114
114
# Download the latest metrics file to extract the new added metrics.
115
- # NOTE: Because old clusters could still send metrics the whitelisting is append only
115
+ # NOTE: Because old clusters could still send metrics the whitelisting is append only.
116
+ # This is also applicable to clusters using direct write requests instead of the telemeter client.
116
117
# (configuration/telemeter/metrics.json).
117
118
curl -q https://raw.githubusercontent.com/openshift/cluster-monitoring-operator/master/manifests/0000_50_cluster-monitoring-operator_04-config.yaml | \
118
119
$(GOJSONTOYAML ) -yamltojson | \
Original file line number Diff line number Diff line change 192
192
" {__name__=\" vendor_model:node_accelerator_cards:sum\" ,vendor=~\" NVIDIA|AMD|GAUDI|INTEL|QUALCOMM\" }" ,
193
193
" {__name__=\" workload:cpu_usage_cores:sum\" }" ,
194
194
" {__name__=\" workload:memory_usage_bytes:sum\" }" ,
195
- " {__name__=~\" cluster:usage:.*\" }"
195
+ " {__name__=~\" cluster:usage:.*\" }" ,
196
+ " {__name__=\" microshift_version\" }"
196
197
]
Original file line number Diff line number Diff line change @@ -287,6 +287,7 @@ objects:
287
287
- --whitelist={__name__="workload:cpu_usage_cores:sum"}
288
288
- --whitelist={__name__="workload:memory_usage_bytes:sum"}
289
289
- --whitelist={__name__=~"cluster:usage:.*"}
290
+ - --whitelist={__name__="microshift_version"}
290
291
- --elide-label=prometheus_replica
291
292
- --log-level=${TELEMETER_LOG_LEVEL}
292
293
- --token-expire-seconds=${TELEMETER_SERVER_TOKEN_EXPIRE_SECONDS}
@@ -578,6 +579,7 @@ objects:
578
579
- --whitelist={__name__="workload:cpu_usage_cores:sum"}
579
580
- --whitelist={__name__="workload:memory_usage_bytes:sum"}
580
581
- --whitelist={__name__=~"cluster:usage:.*"}
582
+ - --whitelist={__name__="microshift_version"}
581
583
- --elide-label=prometheus_replica
582
584
- --log-level=${TELEMETER_LOG_LEVEL}
583
585
- --token-expire-seconds=${TELEMETER_SERVER_TOKEN_EXPIRE_SECONDS}
You can’t perform that action at this time.
0 commit comments