Skip to content

Commit e150794

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #864 from vyzigold/update_obo_100_fr5
[18.0-fr5] [OSPRH-26273] Update observability-operator
2 parents f1cd325 + 0169214 commit e150794

9 files changed

Lines changed: 2040 additions & 38 deletions

‎api/bases/telemetry.openstack.org_metricstorages.yaml‎

Lines changed: 504 additions & 5 deletions
Large diffs are not rendered by default.

‎api/bases/telemetry.openstack.org_telemetries.yaml‎

Lines changed: 507 additions & 5 deletions
Large diffs are not rendered by default.

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/onsi/gomega v1.39.1
77
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260314152256-401ddf989e8b
88
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260205083029-d03e9df035ef
9-
github.com/rhobs/observability-operator v0.3.1
9+
github.com/rhobs/observability-operator v1.0.0
1010
k8s.io/api v0.31.14
1111
k8s.io/apimachinery v0.31.14
1212
sigs.k8s.io/controller-runtime v0.19.7
@@ -44,7 +44,7 @@ require (
4444
github.com/prometheus/common v0.65.0 // indirect
4545
github.com/prometheus/procfs v0.16.1 // indirect
4646
github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect
47-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
47+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 // indirect
4848
github.com/rogpeppe/go-internal v1.13.1 // indirect
4949
github.com/spf13/pflag v1.0.7 // indirect
5050
github.com/x448/float16 v0.8.4 // indirect

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2
9898
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
9999
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
100100
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
101-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:NBdZFQUVKllUnmh6suuH02+K8VS8ibErnOhxNiH+aio=
102-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY=
103-
github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM=
104-
github.com/rhobs/observability-operator v0.3.1/go.mod h1:nC2YcqsTdm44agl9Fz5QzNSGtSFokIGUhS1g7OlzFrs=
101+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 h1:uahWdfwYHqAb28Y1WsltZsiFlIgjxI8HHQxgUdBgPYQ=
102+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1/go.mod h1:I9jGubP/TOORi53RNCK7yPH5cP0TAyxzrNirBhHJtoM=
103+
github.com/rhobs/observability-operator v1.0.0 h1:BqV9ZaIt7/52yJTw9xeSiQ1uo7O1A272AzgQms/uo7M=
104+
github.com/rhobs/observability-operator v1.0.0/go.mod h1:OheVnMXdnGj+GPoVA3UDgsJfC2pXIKluLFe+5LJzxC0=
105105
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
106106
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
107107
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=

‎config/crd/bases/telemetry.openstack.org_metricstorages.yaml‎

Lines changed: 504 additions & 5 deletions
Large diffs are not rendered by default.

‎config/crd/bases/telemetry.openstack.org_telemetries.yaml‎

Lines changed: 507 additions & 5 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ require (
2020
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260314104055-a5465f4ee56e
2121
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240529090522-c780bd90b147
2222
github.com/rabbitmq/cluster-operator v1.14.0
23-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1
24-
github.com/rhobs/observability-operator v0.3.1
23+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1
24+
github.com/rhobs/observability-operator v1.0.0
2525
k8s.io/api v0.31.14
2626
k8s.io/apimachinery v0.31.14
2727
k8s.io/client-go v0.31.14

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
148148
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
149149
github.com/rabbitmq/cluster-operator v1.14.0 h1:1/nMyd9v/8T5IHA1BVcWbV0nrzN31F+gLP+0Ges6Y5E=
150150
github.com/rabbitmq/cluster-operator v1.14.0/go.mod h1:7XVU6ngbVJSPDXld+uMVk6nu68GH7fM6yYYY2MdYKek=
151-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 h1:NBdZFQUVKllUnmh6suuH02+K8VS8ibErnOhxNiH+aio=
152-
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1/go.mod h1:oDJbA/Byh5LNU7zBgBZYRM5263mgL16NtysHl/uVtGY=
153-
github.com/rhobs/observability-operator v0.3.1 h1:vVGCt/a7Ds5VeqikaKZJz18oOPV9p4YUaezlVlwdpIM=
154-
github.com/rhobs/observability-operator v0.3.1/go.mod h1:nC2YcqsTdm44agl9Fz5QzNSGtSFokIGUhS1g7OlzFrs=
151+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1 h1:uahWdfwYHqAb28Y1WsltZsiFlIgjxI8HHQxgUdBgPYQ=
152+
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.77.1-rhobs1/go.mod h1:I9jGubP/TOORi53RNCK7yPH5cP0TAyxzrNirBhHJtoM=
153+
github.com/rhobs/observability-operator v1.0.0 h1:BqV9ZaIt7/52yJTw9xeSiQ1uo7O1A272AzgQms/uo7M=
154+
github.com/rhobs/observability-operator v1.0.0/go.mod h1:OheVnMXdnGj+GPoVA3UDgsJfC2pXIKluLFe+5LJzxC0=
155155
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
156156
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
157157
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

‎internal/metricstorage/scrape_config.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func ScrapeConfigMysqldExporter(
6565
scrapeConfig := ScrapeConfig(instance, labels, targets, tlsEnabled)
6666

6767
scrapeConfig.Spec.MetricsPath = ptr.To("/probe")
68-
scrapeConfig.Spec.RelabelConfigs = []*monv1.RelabelConfig{
68+
scrapeConfig.Spec.RelabelConfigs = []monv1.RelabelConfig{
6969
{
7070
Action: "Replace",
7171
SourceLabels: []monv1.LabelName{
@@ -80,7 +80,7 @@ func ScrapeConfigMysqldExporter(
8080
},
8181
TargetLabel: "__param_auth_module",
8282
Regex: "(.*):(.*)",
83-
Replacement: "client.$1",
83+
Replacement: ptr.To("client.$1"),
8484
},
8585
{
8686
Action: "Replace",
@@ -92,7 +92,7 @@ func ScrapeConfigMysqldExporter(
9292
{
9393
Action: "Replace",
9494
TargetLabel: "__address__",
95-
Replacement: fmt.Sprintf("%s.%s.svc:%d", mysqldexporter.ServiceName, instance.Namespace, mysqldexporter.MysqldExporterPort),
95+
Replacement: ptr.To(fmt.Sprintf("%s.%s.svc:%d", mysqldexporter.ServiceName, instance.Namespace, mysqldexporter.MysqldExporterPort)),
9696
},
9797
}
9898
return scrapeConfig
@@ -159,7 +159,7 @@ func ScrapeConfigRabbitMQ(
159159
Labels: labels,
160160
},
161161
Spec: monv1alpha1.ScrapeConfigSpec{
162-
MetricRelabelConfigs: []*monv1.RelabelConfig{
162+
MetricRelabelConfigs: []monv1.RelabelConfig{
163163
{
164164
Action: "labeldrop",
165165
Regex: "job",
@@ -181,7 +181,7 @@ func ScrapeConfigRabbitMQ(
181181
},
182182
},
183183
},
184-
ServerName: fmt.Sprintf("%s.%s.svc", rabbit.Name, rabbit.Namespace),
184+
ServerName: ptr.To(fmt.Sprintf("%s.%s.svc", rabbit.Name, rabbit.Namespace)),
185185
}
186186
scheme := "HTTPS"
187187
scrapeConfig.Spec.Scheme = &scheme
@@ -231,7 +231,7 @@ func ScrapeConfig(
231231
Labels: labels,
232232
},
233233
Spec: monv1alpha1.ScrapeConfigSpec{
234-
MetricRelabelConfigs: []*monv1.RelabelConfig{
234+
MetricRelabelConfigs: []monv1.RelabelConfig{
235235
{
236236
Action: "labeldrop",
237237
Regex: "pod",

0 commit comments

Comments
 (0)