diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go index c1fa0144a8..f6907e1fcd 100644 --- a/apis/v1alpha1/opentelemetrycollector_types.go +++ b/apis/v1alpha1/opentelemetrycollector_types.go @@ -527,7 +527,7 @@ type MetricsConfigSpec struct { // // +optional // +kubebuilder:validation:Optional - // Deprecated: use Spec.Observability.Metrics.DisableAutomaticPrometheusAnnotations instead. + // Deprecated: use "OpenTelemetryCollector.Spec.Observability.Metrics.DisableAutomaticPrometheusAnnotations" instead. DisablePrometheusAnnotations bool `json:"DisablePrometheusAnnotations,omitempty"` // DisableAutomaticPrometheusAnnotations controls the automatic addition of default Prometheus annotations // ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index cf15404595..4393f6a3ee 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -3870,7 +3870,12 @@ spec: DisablePrometheusAnnotations: description: DisablePrometheusAnnotations controls the automatic addition of default Prometheus annotations ('prometheus.io/scrape', - 'prometheus.io/port', and 'prometheus.io/path') + 'prometheus.io/port', and 'prometheus. + type: boolean + disableAutomaticPrometheusAnnotations: + description: DisableAutomaticPrometheusAnnotations controls + the automatic addition of default Prometheus annotations + ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') type: boolean enableMetrics: description: EnableMetrics specifies if ServiceMonitor or @@ -5214,6 +5219,11 @@ spec: DisablePrometheusAnnotations: description: DisablePrometheusAnnotations controls the automatic addition of default Prometheus annotations + ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus. + type: boolean + disableAutomaticPrometheusAnnotations: + description: DisableAutomaticPrometheusAnnotations controls + the automatic addition of default Prometheus annotations ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') type: boolean enableMetrics: diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml index 5ed95c6145..458d338066 100644 --- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml +++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml @@ -3867,7 +3867,12 @@ spec: DisablePrometheusAnnotations: description: DisablePrometheusAnnotations controls the automatic addition of default Prometheus annotations ('prometheus.io/scrape', - 'prometheus.io/port', and 'prometheus.io/path') + 'prometheus.io/port', and 'prometheus. + type: boolean + disableAutomaticPrometheusAnnotations: + description: DisableAutomaticPrometheusAnnotations controls + the automatic addition of default Prometheus annotations + ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') type: boolean enableMetrics: description: EnableMetrics specifies if ServiceMonitor or @@ -5211,6 +5216,11 @@ spec: DisablePrometheusAnnotations: description: DisablePrometheusAnnotations controls the automatic addition of default Prometheus annotations + ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus. + type: boolean + disableAutomaticPrometheusAnnotations: + description: DisableAutomaticPrometheusAnnotations controls + the automatic addition of default Prometheus annotations ('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path') type: boolean enableMetrics: diff --git a/docs/api.md b/docs/api.md index a586f024e8..ae445563a9 100644 --- a/docs/api.md +++ b/docs/api.md @@ -17815,7 +17815,14 @@ Metrics defines the metrics configuration for operands.