Skip to content

Commit 84489a4

Browse files
authored
Use github.com/rhobs/operator-observability-toolkit (#3874)
Stop use the deprecated github.com/machadovilaca/operator-observability package. Use the up-to-date github.com/rhobs/operator-observability-toolkit package instead. Signed-off-by: Shirly Radco <[email protected]>
1 parent 42df94a commit 84489a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+458
-128
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ require (
2323
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.1
2424
github.com/kubernetes-csi/lib-volume-populator v1.2.1-0.20230316163120-b62a0eee2c56
2525
github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230627123556-81a891d4462a
26-
github.com/machadovilaca/operator-observability v0.0.20
2726
github.com/onsi/ginkgo/v2 v2.19.0
2827
github.com/onsi/gomega v1.33.1
2928
github.com/openshift/api v0.0.0-20241107155230-d37bb9f7e380
@@ -38,6 +37,7 @@ require (
3837
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
3938
github.com/prometheus/client_golang v1.19.1
4039
github.com/prometheus/client_model v0.6.1
40+
github.com/rhobs/operator-observability-toolkit v0.0.29
4141
github.com/robfig/cron/v3 v3.0.1
4242
github.com/rs/cors v1.7.0
4343
github.com/ulikunitz/xz v0.5.12

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,8 +1906,6 @@ github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuz
19061906
github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
19071907
github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
19081908
github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
1909-
github.com/machadovilaca/operator-observability v0.0.20 h1:I9CLKWcaJU9KtPREhUu4yn/CLAZUpxFqEUz/ZVenkAI=
1910-
github.com/machadovilaca/operator-observability v0.0.20/go.mod h1:e4Z3VhOXb9InkmSh00JjqBBijE+iD+YMzynBpKB3+gE=
19111909
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
19121910
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
19131911
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -2128,6 +2126,8 @@ github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoG
21282126
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
21292127
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
21302128
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
2129+
github.com/rhobs/operator-observability-toolkit v0.0.29 h1:C6Z+Qk8OCgHwnIYg7eVfqAkgFy6vFQiYdo2K1r6FZF0=
2130+
github.com/rhobs/operator-observability-toolkit v0.0.29/go.mod h1:a6bL5LZGNVA32pGsfMY74HYgfftQL7/90BD7rCCf1lI=
21312131
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
21322132
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
21332133
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=

pkg/monitoring/metrics/cdi-cloner/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go_library(
99
importpath = "kubevirt.io/containerized-data-importer/pkg/monitoring/metrics/cdi-cloner",
1010
visibility = ["//visibility:public"],
1111
deps = [
12-
"//vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics:go_default_library",
1312
"//vendor/github.com/prometheus/client_model/go:go_default_library",
13+
"//vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics:go_default_library",
1414
],
1515
)

pkg/monitoring/metrics/cdi-cloner/clone_metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cdicloner
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
54
ioprometheusclient "github.com/prometheus/client_model/go"
5+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
66
)
77

88
const (

pkg/monitoring/metrics/cdi-cloner/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cdicloner
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
4+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
55
)
66

77
// SetupMetrics register prometheus metrics

pkg/monitoring/metrics/cdi-controller/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ go_library(
1111
importpath = "kubevirt.io/containerized-data-importer/pkg/monitoring/metrics/cdi-controller",
1212
visibility = ["//visibility:public"],
1313
deps = [
14-
"//vendor/github.com/machadovilaca/operator-observability/pkg/operatormetrics:go_default_library",
1514
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
1615
"//vendor/github.com/prometheus/client_model/go:go_default_library",
16+
"//vendor/github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics:go_default_library",
1717
"//vendor/sigs.k8s.io/controller-runtime/pkg/metrics:go_default_library",
1818
],
1919
)

pkg/monitoring/metrics/cdi-controller/dataimportcron.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cdicontroller
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
54
"github.com/prometheus/client_golang/prometheus"
65
ioprometheusclient "github.com/prometheus/client_model/go"
6+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
77
)
88

99
const (

pkg/monitoring/metrics/cdi-controller/datavolume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cdicontroller
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
4+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
55
)
66

77
var (

pkg/monitoring/metrics/cdi-controller/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cdicontroller
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
4+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
55

66
runtimemetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
77
)

pkg/monitoring/metrics/cdi-controller/storageprofile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cdicontroller
22

33
import (
4-
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
54
"github.com/prometheus/client_golang/prometheus"
65
ioprometheusclient "github.com/prometheus/client_model/go"
6+
"github.com/rhobs/operator-observability-toolkit/pkg/operatormetrics"
77
)
88

99
const (

0 commit comments

Comments
 (0)