Skip to content

Commit 51e4ec5

Browse files
author
Miguel Lavalle
committed
Enable OVNDBCluster metrics collection
Add Prometheus metrics support to OVNDBCluster by updating the ovn-operator dependency and configuring the openstack-network-exporter sidecar container. This enables monitoring of OVSDB server metrics through the same pattern used for OVNNorthd. Changes include: - Update ovn-operator/api dependency to include OVNDBCluster metrics support - Add ExporterImage assignment for OVNDBCluster reconciliation - Update container image status tracking for OpenstackNetworkExporter - Regenerate CRDs with new metricsEnabled and exporterImage fields Depends-On: openstack-k8s-operators/ovn-operator#480 Resolves: https://issues.redhat.com/browse/OSPRH-12567 Assisted-by: Claude Signed-off-by: Miguel Lavalle <mlavalle@redhat.com>
1 parent 9ad9305 commit 51e4ec5

11 files changed

Lines changed: 30 additions & 8 deletions

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11858,6 +11858,9 @@ spec:
1185811858
logLevel:
1185911859
default: info
1186011860
type: string
11861+
metricsEnabled:
11862+
default: true
11863+
type: boolean
1186111864
networkAttachment:
1186211865
type: string
1186311866
nodeSelector:

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250821233804-a68262cb33eb
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-1b0e7d1a4a91
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250908153015-34a9f043c424

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-1b0e7d1a4a91/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
131131
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52 h1:QuOy7xZzbIfPKDQ940r+z5fsqr3aTAdQFjDOXuFY2Gw=
132132
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
133-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec h1:sMGuFJkrbiNXy1ps2YrhI6xN1yqltne+QhnVvHU2ab4=
134-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
133+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5 h1:kjCoac5RqGN2m3Iw0+XmaiEwo/FuGB9MfWAeHT+6caI=
134+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5/go.mod h1:gxQk8WOaA2lQ9oy4ZKXK35oKuD6pKo4Ce2XkUkFjkE4=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
136136
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
137137
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=

‎bindata/crds/crds.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12022,6 +12022,9 @@ spec:
1202212022
logLevel:
1202312023
default: info
1202412024
type: string
12025+
metricsEnabled:
12026+
default: true
12027+
type: boolean
1202512028
networkAttachment:
1202612029
type: string
1202712030
nodeSelector:

‎bindata/crds/ovn.openstack.org_ovndbclusters.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ spec:
6767
to use on db creation (in milliseconds)
6868
format: int32
6969
type: integer
70+
exporterImage:
71+
description: ExporterImage - Container Image URL for the openstack-network-exporter
72+
metrics sidecar (will be set to environmental default if empty)
73+
type: string
7074
inactivityProbe:
7175
default: 60000
7276
description: Probe interval for the OVSDB session (in milliseconds)
@@ -76,6 +80,11 @@ spec:
7680
default: info
7781
description: LogLevel - Set log level info, dbg, emer etc
7882
type: string
83+
metricsEnabled:
84+
default: true
85+
description: MetricsEnabled enables the metrics sidecar container
86+
for collecting OVN DB metrics
87+
type: boolean
7988
networkAttachment:
8089
description: |-
8190
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11858,6 +11858,9 @@ spec:
1185811858
logLevel:
1185911859
default: info
1186011860
type: string
11861+
metricsEnabled:
11862+
default: true
11863+
type: boolean
1186111864
networkAttachment:
1186211865
type: string
1186311866
nodeSelector:

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
4545
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:cf154435d57d24a253599eda2988fa24f0bb32f0b637965efff3476a42fdcf56
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:f41e7acbb50c7ef0de9263e31015c16351f202644d9fac7704032f996e67d113
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:7a67bc40f20ebd2ed46b5f82c0a8883c64dc3197ddb56059e55c6ba0ff5597eb
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-1b0e7d1a4a91
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52
3535
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
36-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec
36+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764
3939
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250908153015-34a9f043c424

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-
140140
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250908160353-1b0e7d1a4a91/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
141141
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52 h1:QuOy7xZzbIfPKDQ940r+z5fsqr3aTAdQFjDOXuFY2Gw=
142142
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
143-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec h1:sMGuFJkrbiNXy1ps2YrhI6xN1yqltne+QhnVvHU2ab4=
144-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911160904-af5495f677ec/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
143+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5 h1:kjCoac5RqGN2m3Iw0+XmaiEwo/FuGB9MfWAeHT+6caI=
144+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5/go.mod h1:gxQk8WOaA2lQ9oy4ZKXK35oKuD6pKo4Ce2XkUkFjkE4=
145145
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
146146
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
147147
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:1d198c76f354fb15c60111882c2cca2f8fee4d4893d1785397ed00ee879b0ab9
1616
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:590f0719cc3c4c174baa6bf6561451602985ab0b62a5f735568df33db886ef09
1717
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:cf154435d57d24a253599eda2988fa24f0bb32f0b637965efff3476a42fdcf56
18-
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:f41e7acbb50c7ef0de9263e31015c16351f202644d9fac7704032f996e67d113
18+
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:7a67bc40f20ebd2ed46b5f82c0a8883c64dc3197ddb56059e55c6ba0ff5597eb
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
2121
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:7a461473e981b273217177b299b99ca12174340db0d8e685fb5425df9efbd94f

0 commit comments

Comments
 (0)