Updated metrics spec

RedHatInsights · May 7, 2021 · c6a1bf7 · c6a1bf7
1 parent d9eaba5
commit c6a1bf7
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 32 deletions.
diff --git a/apis/kafka.strimzi.io/v1beta1/kafka_types.go b/apis/kafka.strimzi.io/v1beta1/kafka_types.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"reflect"
 
+	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -5149,11 +5150,6 @@ func (j *KafkaSpecKafkaLogging) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-// The Prometheus JMX Exporter configuration. See
-// https://github.com/prometheus/jmx_exporter for details of the structure of this
-// configuration.
-type KafkaSpecKafkaMetrics map[string]string
-
 type KafkaSpecKafkaMetricsConfigType string
 
 // Configuration of the Kafka Exporter. Kafka Exporter can provide additional
@@ -6242,7 +6238,7 @@ type KafkaSpecKafka struct {
 	// The Prometheus JMX Exporter configuration. See
 	// https://github.com/prometheus/jmx_exporter for details of the structure of this
 	// configuration.
-	Metrics KafkaSpecKafkaMetrics `json:"metrics,omitempty"`
+	Metrics *apiextensions.JSON `json:"metrics,omitempty"`
 
 	// Metrics configuration.
 	MetricsConfig *KafkaSpecKafkaMetricsConfig `json:"metricsConfig,omitempty"`

diff --git a/apis/kafka.strimzi.io/v1beta1/zz_generated.deepcopy.go b/apis/kafka.strimzi.io/v1beta1/zz_generated.deepcopy.go
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/RedHatInsights/strimzi-client-go
 go 1.13
 
 require (
+	k8s.io/apiextensions-apiserver v0.19.3
 	k8s.io/apimachinery v0.19.3
 	sigs.k8s.io/controller-runtime v0.6.2
 )