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.