diff --git a/go.mod b/go.mod index 5b80b2acf..1a51ea1f4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/go-logr/logr v1.4.1 github.com/go-logr/zapr v1.3.0 github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230710120526-cc1644c90b64 - github.com/machadovilaca/operator-observability v0.0.17 + github.com/machadovilaca/operator-observability v0.0.18 github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.32.0 github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible diff --git a/go.sum b/go.sum index 2dafa0530..21b5f5490 100644 --- a/go.sum +++ b/go.sum @@ -1343,8 +1343,8 @@ github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H7 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= -github.com/machadovilaca/operator-observability v0.0.17 h1:XHL+YHkCv5WN5MKMR+/ld5pOnRnLVzxVX2b5OvSfhzs= -github.com/machadovilaca/operator-observability v0.0.17/go.mod h1:e4Z3VhOXb9InkmSh00JjqBBijE+iD+YMzynBpKB3+gE= +github.com/machadovilaca/operator-observability v0.0.18 h1:Lm//YRWsxL3RXZs39zd/c1UGIDs8L1Wob2Yf+Y7ylXk= +github.com/machadovilaca/operator-observability v0.0.18/go.mod h1:e4Z3VhOXb9InkmSh00JjqBBijE+iD+YMzynBpKB3+gE= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go b/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go index bcf0e5ee4..35015f51a 100644 --- a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go +++ b/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go @@ -20,9 +20,10 @@ type Collector struct { } type CollectorResult struct { - Metric Metric - Labels []string - Value float64 + Metric Metric + Labels []string + ConstLabels map[string]string + Value float64 } func (c Collector) hash() string { @@ -73,11 +74,19 @@ func collectValue(ch chan<- prometheus.Metric, metric Metric, cr CollectorResult return fmt.Errorf("encountered unsupported type for collector %v", metric.GetType()) } + labels := map[string]string{} + for k, v := range cr.ConstLabels { + labels[k] = v + } + for k, v := range metric.GetOpts().ConstLabels { + labels[k] = v + } + desc := prometheus.NewDesc( metric.GetOpts().Name, metric.GetOpts().Help, metric.GetOpts().labels, - metric.GetOpts().ConstLabels, + labels, ) cm, err := prometheus.NewConstMetric(desc, mType, cr.Value, cr.Labels...) diff --git a/vendor/modules.txt b/vendor/modules.txt index f932b8976..72af8a47f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -107,7 +107,7 @@ github.com/json-iterator/go # github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230710120526-cc1644c90b64 ## explicit; go 1.20 github.com/kubevirt/monitoring/pkg/metrics/parser -# github.com/machadovilaca/operator-observability v0.0.17 +# github.com/machadovilaca/operator-observability v0.0.18 ## explicit; go 1.21 github.com/machadovilaca/operator-observability/pkg/docs github.com/machadovilaca/operator-observability/pkg/operatormetrics