diff --git a/go.mod b/go.mod index d47481be..b8293d9a 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,11 @@ require ( github.com/kubernetes-csi/csi-lib-utils v0.16.0 github.com/kubernetes-csi/csi-test/v4 v4.4.0 github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230710120526-cc1644c90b64 - github.com/machadovilaca/operator-observability v0.0.26 github.com/onsi/gomega v1.31.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.71.2 github.com/prometheus/client_golang v1.22.0 github.com/prometheus/client_model v0.6.1 + github.com/rhobs/operator-observability-toolkit v0.0.29 golang.org/x/net v0.39.0 golang.org/x/sys v0.32.0 golang.org/x/time v0.9.0 diff --git a/go.sum b/go.sum index 9375d821..e51b0ddb 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,6 @@ github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230710120526-cc1644c9 github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230710120526-cc1644c90b64/go.mod h1:qGj2agzgwQ27nYhP3xhLs+IBzE5+ALNUg8bDfMcwPqo= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/machadovilaca/operator-observability v0.0.26 h1:bSwjBQ5Ua4Y9jukLn4HY2ajUfkWraPRAUcn7eRq079g= -github.com/machadovilaca/operator-observability v0.0.26/go.mod h1:trC+BjI6zhvZMBcX0q7vHrKKRX3lWZdwJxgVUmRJCfw= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -272,6 +270,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rhobs/operator-observability-toolkit v0.0.29 h1:C6Z+Qk8OCgHwnIYg7eVfqAkgFy6vFQiYdo2K1r6FZF0= +github.com/rhobs/operator-observability-toolkit v0.0.29/go.mod h1:a6bL5LZGNVA32pGsfMY74HYgfftQL7/90BD7rCCf1lI= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/pkg/monitoring/metrics/metrics.go b/pkg/monitoring/metrics/metrics.go index 40577693..27968f12 100644 --- a/pkg/monitoring/metrics/metrics.go +++ b/pkg/monitoring/metrics/metrics.go @@ -1,6 +1,6 @@ package metrics -import "github.com/machadovilaca/operator-observability/pkg/operatormetrics" +import "github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics" func SetupMetrics() error { return operatormetrics.RegisterMetrics( diff --git a/pkg/monitoring/metrics/operator_metrics.go b/pkg/monitoring/metrics/operator_metrics.go index 49cf97ac..9c79706b 100644 --- a/pkg/monitoring/metrics/operator_metrics.go +++ b/pkg/monitoring/metrics/operator_metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/machadovilaca/operator-observability/pkg/operatormetrics" + "github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics" ioprometheusclient "github.com/prometheus/client_model/go" ) diff --git a/tools/metricsdocs/metricsdocs.go b/tools/metricsdocs/metricsdocs.go index f780dd87..240ffbd3 100644 --- a/tools/metricsdocs/metricsdocs.go +++ b/tools/metricsdocs/metricsdocs.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/machadovilaca/operator-observability/pkg/docs" + "github.com/rhobs/operator-observability-toolkit/pkg/docs" "kubevirt.io/hostpath-provisioner/pkg/monitoring/metrics" ) diff --git a/vendor/github.com/machadovilaca/operator-observability/LICENSE b/vendor/github.com/rhobs/operator-observability-toolkit/LICENSE similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/LICENSE rename to vendor/github.com/rhobs/operator-observability-toolkit/LICENSE diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/docs/alerts.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/docs/alerts.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/docs/alerts.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/docs/alerts.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/docs/metrics.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/docs/metrics.go similarity index 95% rename from vendor/github.com/machadovilaca/operator-observability/pkg/docs/metrics.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/docs/metrics.go index c61db134..32d50177 100644 --- a/vendor/github.com/machadovilaca/operator-observability/pkg/docs/metrics.go +++ b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/docs/metrics.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "github.com/machadovilaca/operator-observability/pkg/operatormetrics" - "github.com/machadovilaca/operator-observability/pkg/operatorrules" + "github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics" + "github.com/rhobs/operator-observability-toolkit/pkg/operatorrules" ) const defaultMetricsTemplate = `# Operator Metrics diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/collector.go similarity index 91% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/collector.go index 6cbbd4a3..9f528f85 100644 --- a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector.go +++ b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/collector.go @@ -2,6 +2,7 @@ package operatormetrics import ( "fmt" + "log" "strings" "github.com/prometheus/client_golang/prometheus" @@ -41,12 +42,12 @@ func (c Collector) Collect(ch chan<- prometheus.Metric) { for _, cr := range collectedMetrics { metric, ok := operatorRegistry.registeredCollectorMetrics[cr.Metric.GetOpts().Name] if !ok { - fmt.Printf("metric %s not found in registry", cr.Metric.GetOpts().Name) + log.Printf("metric %s not found in registry", cr.Metric.GetOpts().Name) continue } if err := collectValue(ch, metric, cr); err != nil { - fmt.Printf("error collecting metric %s: %v", cr.Metric.GetOpts().Name, err) + log.Printf("error collecting metric %s: %v", cr.Metric.GetOpts().Name, err) } } } @@ -68,11 +69,17 @@ func collectValue(ch chan<- prometheus.Metric, metric Metric, cr CollectorResult } labels := map[string]string{} + for k, v := range cr.ConstLabels { - labels[k] = v + if v != "" { + labels[k] = v + } } + for k, v := range metric.GetOpts().ConstLabels { - labels[k] = v + if v != "" { + labels[k] = v + } } desc := prometheus.NewDesc( diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector_result.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/collector_result.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/collector_result.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/collector_result.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/counter.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/counter.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/counter.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/counter.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/counter_vec.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/counter_vec.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/counter_vec.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/counter_vec.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/gauge.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/gauge.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/gauge.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/gauge.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/gauge_vec.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/gauge_vec.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/gauge_vec.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/gauge_vec.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/histogram.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/histogram.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/histogram.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/histogram.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/histogram_vec.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/histogram_vec.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/histogram_vec.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/histogram_vec.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/metric.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/metric.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/metric.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/metric.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/registry.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/registry.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/registry.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/registry.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/summary.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/summary.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/summary.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/summary.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/summary_vec.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/summary_vec.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/summary_vec.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/summary_vec.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/wrapper_registry.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/wrapper_registry.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics/wrapper_registry.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics/wrapper_registry.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/compatibility.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/compatibility.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/compatibility.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/compatibility.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/prometheusrules.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/prometheusrules.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/prometheusrules.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/prometheusrules.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/rbac.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/rbac.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/rbac.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/rbac.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/recordingrule.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/recordingrule.go similarity index 90% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/recordingrule.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/recordingrule.go index 8dfc50c3..fe42f5e5 100644 --- a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/recordingrule.go +++ b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/recordingrule.go @@ -3,7 +3,7 @@ package operatorrules import ( "k8s.io/apimachinery/pkg/util/intstr" - "github.com/machadovilaca/operator-observability/pkg/operatormetrics" + "github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics" ) // RecordingRule is a struct that represents a Prometheus recording rule. diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/registry.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/registry.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/registry.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/registry.go diff --git a/vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/schema.go b/vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/schema.go similarity index 100% rename from vendor/github.com/machadovilaca/operator-observability/pkg/operatorrules/schema.go rename to vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatorrules/schema.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 2c062874..4688e264 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -90,11 +90,6 @@ github.com/kubernetes-csi/csi-test/v4/utils # 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.26 -## explicit; go 1.21 -github.com/machadovilaca/operator-observability/pkg/docs -github.com/machadovilaca/operator-observability/pkg/operatormetrics -github.com/machadovilaca/operator-observability/pkg/operatorrules # github.com/mailru/easyjson v0.7.7 ## explicit; go 1.12 github.com/mailru/easyjson/buffer @@ -184,6 +179,11 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util +# github.com/rhobs/operator-observability-toolkit v0.0.29 +## explicit; go 1.21 +github.com/rhobs/operator-observability-toolkit/pkg/docs +github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics +github.com/rhobs/operator-observability-toolkit/pkg/operatorrules # github.com/spf13/pflag v1.0.5 => github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag