diff --git a/CHANGELOG.md b/CHANGELOG.md index 771ff58d..5517485c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD +- Add `ServiceIntegrationEndpoint` field `datadog.extra_tags_prefix`, type `string`: Extra tags prefix. + Defaults to aiven + ## v0.26.0 - 2024-11-21 - Add kind: `Flink` diff --git a/api/v1alpha1/userconfig/integrationendpoints/datadog/datadog.go b/api/v1alpha1/userconfig/integrationendpoints/datadog/datadog.go index 182dc5a4..07a4425c 100644 --- a/api/v1alpha1/userconfig/integrationendpoints/datadog/datadog.go +++ b/api/v1alpha1/userconfig/integrationendpoints/datadog/datadog.go @@ -28,6 +28,12 @@ type DatadogUserConfig struct { // Disable consumer group metrics DisableConsumerStats *bool `groups:"create,update" json:"disable_consumer_stats,omitempty"` + // +kubebuilder:validation:MinLength=0 + // +kubebuilder:validation:MaxLength=64 + // +kubebuilder:validation:Pattern=`^[A-Za-z0-9\-]{0,64}$` + // Extra tags prefix. Defaults to aiven + ExtraTagsPrefix *string `groups:"create,update" json:"extra_tags_prefix,omitempty"` + // +kubebuilder:validation:Minimum=1 // +kubebuilder:validation:Maximum=100 // Number of separate instances to fetch kafka consumer statistics with diff --git a/api/v1alpha1/userconfig/integrationendpoints/datadog/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/integrationendpoints/datadog/zz_generated.deepcopy.go index 3975169d..5a4c9f2d 100644 --- a/api/v1alpha1/userconfig/integrationendpoints/datadog/zz_generated.deepcopy.go +++ b/api/v1alpha1/userconfig/integrationendpoints/datadog/zz_generated.deepcopy.go @@ -45,6 +45,11 @@ func (in *DatadogUserConfig) DeepCopyInto(out *DatadogUserConfig) { *out = new(bool) **out = **in } + if in.ExtraTagsPrefix != nil { + in, out := &in.ExtraTagsPrefix, &out.ExtraTagsPrefix + *out = new(string) + **out = **in + } if in.KafkaConsumerCheckInstances != nil { in, out := &in.KafkaConsumerCheckInstances, &out.KafkaConsumerCheckInstances *out = new(int) diff --git a/charts/aiven-operator-crds/templates/aiven.io_serviceintegrationendpoints.yaml b/charts/aiven-operator-crds/templates/aiven.io_serviceintegrationendpoints.yaml index 5e0b9698..646a3b92 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_serviceintegrationendpoints.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_serviceintegrationendpoints.yaml @@ -131,6 +131,12 @@ spec: disable_consumer_stats: description: Disable consumer group metrics type: boolean + extra_tags_prefix: + description: Extra tags prefix. Defaults to aiven + maxLength: 64 + minLength: 0 + pattern: ^[A-Za-z0-9\-]{0,64}$ + type: string kafka_consumer_check_instances: description: Number of separate instances to fetch kafka consumer diff --git a/config/crd/bases/aiven.io_serviceintegrationendpoints.yaml b/config/crd/bases/aiven.io_serviceintegrationendpoints.yaml index 5e0b9698..646a3b92 100644 --- a/config/crd/bases/aiven.io_serviceintegrationendpoints.yaml +++ b/config/crd/bases/aiven.io_serviceintegrationendpoints.yaml @@ -131,6 +131,12 @@ spec: disable_consumer_stats: description: Disable consumer group metrics type: boolean + extra_tags_prefix: + description: Extra tags prefix. Defaults to aiven + maxLength: 64 + minLength: 0 + pattern: ^[A-Za-z0-9\-]{0,64}$ + type: string kafka_consumer_check_instances: description: Number of separate instances to fetch kafka consumer diff --git a/docs/docs/api-reference/serviceintegrationendpoint.md b/docs/docs/api-reference/serviceintegrationendpoint.md index 64b7bcea..017aa77a 100644 --- a/docs/docs/api-reference/serviceintegrationendpoint.md +++ b/docs/docs/api-reference/serviceintegrationendpoint.md @@ -178,6 +178,7 @@ Datadog configuration values. - [`datadog_tags`](#spec.datadog.datadog_tags-property){: name='spec.datadog.datadog_tags-property'} (array of objects, MaxItems: 32). Custom tags provided by user. See below for [nested schema](#spec.datadog.datadog_tags). - [`disable_consumer_stats`](#spec.datadog.disable_consumer_stats-property){: name='spec.datadog.disable_consumer_stats-property'} (boolean). Disable consumer group metrics. +- [`extra_tags_prefix`](#spec.datadog.extra_tags_prefix-property){: name='spec.datadog.extra_tags_prefix-property'} (string, Pattern: `^[A-Za-z0-9\-]{0,64}$`, MinLength: 0, MaxLength: 64). Extra tags prefix. Defaults to aiven. - [`kafka_consumer_check_instances`](#spec.datadog.kafka_consumer_check_instances-property){: name='spec.datadog.kafka_consumer_check_instances-property'} (integer, Minimum: 1, Maximum: 100). Number of separate instances to fetch kafka consumer statistics with. - [`kafka_consumer_stats_timeout`](#spec.datadog.kafka_consumer_stats_timeout-property){: name='spec.datadog.kafka_consumer_stats_timeout-property'} (integer, Minimum: 2, Maximum: 300). Number of seconds that datadog will wait to get consumer statistics from brokers. - [`max_partition_contexts`](#spec.datadog.max_partition_contexts-property){: name='spec.datadog.max_partition_contexts-property'} (integer, Minimum: 200, Maximum: 200000). Maximum number of partition contexts to send. diff --git a/go.mod b/go.mod index cccd242a..73bf147e 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ toolchain go1.23.0 require ( github.com/ClickHouse/clickhouse-go/v2 v2.30.0 - github.com/aiven/aiven-go-client/v2 v2.31.0 - github.com/aiven/go-api-schemas v1.103.0 - github.com/aiven/go-client-codegen v0.56.0 + github.com/aiven/aiven-go-client/v2 v2.32.0 + github.com/aiven/go-api-schemas v1.104.0 + github.com/aiven/go-client-codegen v0.62.0 github.com/avast/retry-go v3.0.0+incompatible github.com/dave/jennifer v1.7.1 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index c25a34d5..7fd9ebb0 100644 --- a/go.sum +++ b/go.sum @@ -37,12 +37,12 @@ github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeE github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= github.com/ClickHouse/clickhouse-go/v2 v2.30.0 h1:AG4D/hW39qa58+JHQIFOSnxyL46H6h2lrmGGk17dhFo= github.com/ClickHouse/clickhouse-go/v2 v2.30.0/go.mod h1:i9ZQAojcayW3RsdCb3YR+n+wC2h65eJsZCscZ1Z1wyo= -github.com/aiven/aiven-go-client/v2 v2.31.0 h1:ThPtEQiKDxtq5GDfPW8bAmrT2d6oHRP492CQ7gXwuTI= -github.com/aiven/aiven-go-client/v2 v2.31.0/go.mod h1:AXfB5OeioOln+hYh1XAJaYyi+f+TV6xInc7VZ9DwnY4= -github.com/aiven/go-api-schemas v1.103.0 h1:jz1/Nu/l26gQF46PhL12tNAQLd79wrpagSrbqVJgVZU= -github.com/aiven/go-api-schemas v1.103.0/go.mod h1:gtyL4LloZ2lRqcyEZTCSizi1eKm6tdzQdUdlIHlvdlY= -github.com/aiven/go-client-codegen v0.56.0 h1:LSaVaZV+Uw7jWJXfQui4NTzrhKWHRJUNtd4aCQforeY= -github.com/aiven/go-client-codegen v0.56.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA= +github.com/aiven/aiven-go-client/v2 v2.32.0 h1:P7MeU33bhn+DvvNygViAzXVLfAztEZF0xYrGGX8wZ14= +github.com/aiven/aiven-go-client/v2 v2.32.0/go.mod h1:IUEFZGRoerp3hLTLBuGQhas/HI3IAzRLwDq5D+VSk0g= +github.com/aiven/go-api-schemas v1.104.0 h1:RHhPLLnEXzcOwUlK7vZWcflzHcYK7LUF66koJiYbWVM= +github.com/aiven/go-api-schemas v1.104.0/go.mod h1:z7dGvufm6If4gOdVr7dWTuFZmll9FOZr5Z5CSxGpebA= +github.com/aiven/go-client-codegen v0.62.0 h1:h7sZMUagc1zQUb5l5LeIZ/S5B5aLfLqiYJA6/YI+ePY= +github.com/aiven/go-client-codegen v0.62.0/go.mod h1:QKN/GgLMGWd6+gPEucXlZPi5vC3C6RpD3UeBRQOLI1Y= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=