diff --git a/operator/apis/loki/v1/lokistack_types.go b/operator/apis/loki/v1/lokistack_types.go index 41f4ad95e6a8b..5fd953bc71eb9 100644 --- a/operator/apis/loki/v1/lokistack_types.go +++ b/operator/apis/loki/v1/lokistack_types.go @@ -887,7 +887,7 @@ type OTLPResourceAttributesSpec struct { // tenants. type GlobalOTLPSpec struct { // IndexedResourceAttributes contains the global configuration for resource attributes - // to store them as index labels or structured metadata or drop them altogether. + // to store them as index labels. // // +optional // +kubebuilder:validation:Optional @@ -909,7 +909,7 @@ type OTLPSpec struct { ResourceAttributes *OTLPResourceAttributesSpec `json:"resourceAttributes,omitempty"` // ScopeAttributes contains the configuration for scope attributes - // to store them as index labels or structured metadata or drop them altogether. + // to store them as structured metadata or drop them altogether. // // +optional // +kubebuilder:validation:Optional @@ -917,7 +917,7 @@ type OTLPSpec struct { ScopeAttributes []OTLPAttributesSpec `json:"scopeAttributes,omitempty"` // LogAttributes contains the configuration for log attributes - // to store them as index labels or structured metadata or drop them altogether. + // to store them as structured metadata or drop them altogether. // // +optional // +kubebuilder:validation:Optional diff --git a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml index 09119acd77819..c45c732183aeb 100644 --- a/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/community/manifests/loki-operator.clusterserviceversion.yaml @@ -150,7 +150,7 @@ metadata: categories: OpenShift Optional, Logging & Tracing certified: "false" containerImage: docker.io/grafana/loki-operator:0.6.2 - createdAt: "2024-09-09T09:16:56Z" + createdAt: "2024-09-24T16:09:54Z" description: The Community Loki Operator provides Kubernetes native deployment and management of Loki and related logging components. operators.operatorframework.io/builder: operator-sdk-unknown @@ -355,12 +355,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:number - description: IndexedResourceAttributes contains the global configuration for - resource attributes to store them as index labels or structured metadata - or drop them altogether. + resource attributes to store them as index labels. displayName: Indexed Resource Attributes path: limits.global.otlp.indexedResourceAttributes - description: LogAttributes contains the configuration for log attributes to - store them as index labels or structured metadata or drop them altogether. + store them as structured metadata or drop them altogether. displayName: Log Attributes path: limits.global.otlp.logAttributes - description: Action defines the indexing action for the selected attributes. @@ -401,7 +400,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - description: ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. displayName: Scope Attributes path: limits.global.otlp.scopeAttributes - description: Action defines the indexing action for the selected attributes. @@ -511,7 +510,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:number - description: LogAttributes contains the configuration for log attributes to - store them as index labels or structured metadata or drop them altogether. + store them as structured metadata or drop them altogether. displayName: Log Attributes path: limits.tenants.otlp.logAttributes - description: Action defines the indexing action for the selected attributes. @@ -552,7 +551,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - description: ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. displayName: Scope Attributes path: limits.tenants.otlp.scopeAttributes - description: Action defines the indexing action for the selected attributes. diff --git a/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml b/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml index c11f81be9c55f..69c6fb65d26a9 100644 --- a/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml +++ b/operator/bundle/community/manifests/loki.grafana.com_lokistacks.yaml @@ -173,14 +173,14 @@ spec: indexedResourceAttributes: description: |- IndexedResourceAttributes contains the global configuration for resource attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as index labels. items: type: string type: array logAttributes: description: |- LogAttributes contains the configuration for log attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -256,7 +256,7 @@ spec: scopeAttributes: description: |- ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -437,7 +437,7 @@ spec: logAttributes: description: |- LogAttributes contains the configuration for log attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -513,7 +513,7 @@ spec: scopeAttributes: description: |- ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes diff --git a/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml b/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml index 0180fe98e7ae4..4c87aadac18b2 100644 --- a/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml +++ b/operator/config/crd/bases/loki.grafana.com_lokistacks.yaml @@ -155,14 +155,14 @@ spec: indexedResourceAttributes: description: |- IndexedResourceAttributes contains the global configuration for resource attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as index labels. items: type: string type: array logAttributes: description: |- LogAttributes contains the configuration for log attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -238,7 +238,7 @@ spec: scopeAttributes: description: |- ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -419,7 +419,7 @@ spec: logAttributes: description: |- LogAttributes contains the configuration for log attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes @@ -495,7 +495,7 @@ spec: scopeAttributes: description: |- ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. items: description: |- OTLPAttributesSpec contains the configuration for a set of attributes diff --git a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml index e1a74389c40f7..c1ee0008faa43 100644 --- a/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/community/bases/loki-operator.clusterserviceversion.yaml @@ -268,12 +268,11 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:number - description: IndexedResourceAttributes contains the global configuration for - resource attributes to store them as index labels or structured metadata - or drop them altogether. + resource attributes to store them as index labels. displayName: Indexed Resource Attributes path: limits.global.otlp.indexedResourceAttributes - description: LogAttributes contains the configuration for log attributes to - store them as index labels or structured metadata or drop them altogether. + store them as structured metadata or drop them altogether. displayName: Log Attributes path: limits.global.otlp.logAttributes - description: Action defines the indexing action for the selected attributes. @@ -314,7 +313,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - description: ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. displayName: Scope Attributes path: limits.global.otlp.scopeAttributes - description: Action defines the indexing action for the selected attributes. @@ -424,7 +423,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:number - description: LogAttributes contains the configuration for log attributes to - store them as index labels or structured metadata or drop them altogether. + store them as structured metadata or drop them altogether. displayName: Log Attributes path: limits.tenants.otlp.logAttributes - description: Action defines the indexing action for the selected attributes. @@ -465,7 +464,7 @@ spec: x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch - description: ScopeAttributes contains the configuration for scope attributes - to store them as index labels or structured metadata or drop them altogether. + to store them as structured metadata or drop them altogether. displayName: Scope Attributes path: limits.tenants.otlp.scopeAttributes - description: Action defines the indexing action for the selected attributes.