Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions operator/api/loki/v1/lokistack_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,13 @@ type OpenshiftTenantSpec struct {

// OpenshiftOTLPConfig defines configuration specific to users using OTLP together with an OpenShift tenancy mode.
type OpenshiftOTLPConfig struct {
// DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
// EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
// currently used by the logs console in OpenShift.
//
// Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
// to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
// This is not different from manually adding some or all of the attributes to the set of stream labels using the
// normal OTLP configuration.
//
// The recommended attributes are:
// The additional attributes which are converted to stream labels are:
//
// - k8s.container.name
// - k8s.cronjob.name
Expand All @@ -353,15 +354,12 @@ type OpenshiftOTLPConfig struct {
// - kubernetes.pod_name
// - service.name
//
// This option is supposed to be combined with a custom attribute configuration listing the stream labels that
// should continue to exist.
//
// See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
//
// +optional
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Disable recommended OTLP attributes"
DisableRecommendedAttributes bool `json:"disableRecommendedAttributes,omitempty"`
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Enable Console labels"
EnableConsoleLabels bool `json:"enableConsoleLabels,omitempty"`
}

// LokiComponentSpec defines the requirements to configure scheduling
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.9.0
createdAt: "2026-02-25T18:26:49Z"
createdAt: "2026-02-27T13:31:21Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
features.operators.openshift.io/disconnected: "true"
Expand Down Expand Up @@ -1103,12 +1103,13 @@ spec:
displayName: OpenTelemetry Protocol
path: tenants.openshift.otlp
- description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -1123,12 +1124,9 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
displayName: Disable recommended OTLP attributes
path: tenants.openshift.otlp.disableRecommendedAttributes
displayName: Enable Console labels
path: tenants.openshift.otlp.enableConsoleLabels
statusDescriptors:
- description: Distributor is a map to the per pod status of the distributor
deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3976,14 +3976,15 @@ spec:
description: OTLP contains settings for ingesting data using
OTLP in the OpenShift tenancy mode.
properties:
disableRecommendedAttributes:
enableConsoleLabels:
description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -3998,9 +3999,6 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
type: boolean
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: docker.io/grafana/loki-operator:0.9.0
createdAt: "2026-02-25T18:26:47Z"
createdAt: "2026-02-27T13:31:16Z"
description: The Community Loki Operator provides Kubernetes native deployment
and management of Loki and related logging components.
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1096,12 +1096,13 @@ spec:
displayName: OpenTelemetry Protocol
path: tenants.openshift.otlp
- description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -1116,12 +1117,9 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
displayName: Disable recommended OTLP attributes
path: tenants.openshift.otlp.disableRecommendedAttributes
displayName: Enable Console labels
path: tenants.openshift.otlp.enableConsoleLabels
statusDescriptors:
- description: Distributor is a map to the per pod status of the distributor
deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3977,14 +3977,15 @@ spec:
description: OTLP contains settings for ingesting data using
OTLP in the OpenShift tenancy mode.
properties:
disableRecommendedAttributes:
enableConsoleLabels:
description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -3999,9 +4000,6 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
type: boolean
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/loki-operator:0.1.0
createdAt: "2026-02-25T18:26:52Z"
createdAt: "2026-02-27T13:31:26Z"
description: |
The Loki Operator for OCP provides a means for configuring and managing a Loki stack for cluster logging.
## Prerequisites and Requirements
Expand Down Expand Up @@ -1116,12 +1116,13 @@ spec:
displayName: OpenTelemetry Protocol
path: tenants.openshift.otlp
- description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -1136,12 +1137,9 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
displayName: Disable recommended OTLP attributes
path: tenants.openshift.otlp.disableRecommendedAttributes
displayName: Enable Console labels
path: tenants.openshift.otlp.enableConsoleLabels
statusDescriptors:
- description: Distributor is a map to the per pod status of the distributor
deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3976,14 +3976,15 @@ spec:
description: OTLP contains settings for ingesting data using
OTLP in the OpenShift tenancy mode.
properties:
disableRecommendedAttributes:
enableConsoleLabels:
description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -3998,9 +3999,6 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
type: boolean
type: object
Expand Down
14 changes: 6 additions & 8 deletions operator/config/crd/bases/loki.grafana.com_lokistacks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3958,14 +3958,15 @@ spec:
description: OTLP contains settings for ingesting data using
OTLP in the OpenShift tenancy mode.
properties:
disableRecommendedAttributes:
enableConsoleLabels:
description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -3980,9 +3981,6 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
type: boolean
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1016,12 +1016,13 @@ spec:
displayName: OpenTelemetry Protocol
path: tenants.openshift.otlp
- description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -1036,12 +1037,9 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
displayName: Disable recommended OTLP attributes
path: tenants.openshift.otlp.disableRecommendedAttributes
displayName: Enable Console labels
path: tenants.openshift.otlp.enableConsoleLabels
statusDescriptors:
- description: Distributor is a map to the per pod status of the distributor
deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1009,12 +1009,13 @@ spec:
displayName: OpenTelemetry Protocol
path: tenants.openshift.otlp
- description: |-
DisableRecommendedAttributes can be used to reduce the number of attributes used as stream labels.
EnableConsoleLabels can be used to add a set of additional stream labels to the OTLP input. These labels are
currently used by the logs console in OpenShift.

Enabling this setting removes the "recommended attributes" from the stream labels. This requires an update
to queries that relied on these attributes as stream labels, as they will no longer be indexed as such.
This is not different from manually adding some or all of the attributes to the set of stream labels using the
normal OTLP configuration.

The recommended attributes are:
The additional attributes which are converted to stream labels are:

- k8s.container.name
- k8s.cronjob.name
Expand All @@ -1029,12 +1030,9 @@ spec:
- kubernetes.pod_name
- service.name

This option is supposed to be combined with a custom attribute configuration listing the stream labels that
should continue to exist.

See also: https://github.com/rhobs/observability-data-model/blob/main/cluster-logging.md#attributes
displayName: Disable recommended OTLP attributes
path: tenants.openshift.otlp.disableRecommendedAttributes
displayName: Enable Console labels
path: tenants.openshift.otlp.enableConsoleLabels
statusDescriptors:
- description: Distributor is a map to the per pod status of the distributor
deployment
Expand Down
Loading
Loading