Skip to content

Commit 4c7d575

Browse files
committed
V3 fixes
1 parent 7f89ac7 commit 4c7d575

10 files changed

+94
-171
lines changed

modules/log6x-6-1-0-rn.adoc

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Module included in the following assemblies:
2+
//log6x-release-notes-6.1
3+
= Logging 6.1.0 Release Notes
4+
:_mod-docs-content-type: REFERENCE
5+
[id="logging-release-notes-6-1-0_{context}"]
6+
7+
This release includes link:https://access.redhat.com/errata/RHBA-2024:9038[{OCP-short}{logging} Release 6.1.0].
8+
9+
[id="openshift-logging-release-notes-6-1-0-enhancements"]
10+
== New Features and Enhancements
11+
12+
=== Log Collection
13+
14+
* This enhancement adds the source `iostream` to the attributes sent from collected container logs. The value is set to either `stdout` or `stderr` based on how the collector received it. (link:https://issues.redhat.com/browse/LOG-5292[LOG-5292])
15+
16+
* With this update, the default memory limit for the collector increases from 1024 Mi to 2048 Mi. Users should adjust resource limits based on their cluster’s specific needs and specifications. (link:https://issues.redhat.com/browse/LOG-6072[LOG-6072])
17+
18+
* With this update, users can now set the syslog output delivery mode of the `ClusterLogForwarder` CR to either `AtLeastOnce` or `AtMostOnce.` (link:https://issues.redhat.com/browse/LOG-6355[LOG-6355])
19+
20+
=== Log Storage
21+
22+
* With this update, the new `1x.pico` LokiStack size supports clusters with fewer workloads and lower log volumes (up to 50GB/day). (link:https://issues.redhat.com/browse/LOG-5939[LOG-5939])
23+
24+
[id="logging-release-notes-6-1-0-technology-preview-features"]
25+
== Technology Preview
26+
27+
:FeatureName: The OpenTelemetry Protocol (OTLP) output log forwarder
28+
include::snippets/technology-preview.adoc[]
29+
30+
* With this update, OpenTelemetry logs can now be forwarded using the `OTel` (OpenTelemetry) data model to a Red Hat Managed LokiStack instance. To enable this feature, add the `observability.openshift.io/tech-preview-otlp-output: "enabled"` annotation to your `ClusterLogForwarder` configuration. For additional configuration information, see link:https://github.com/openshift/cluster-logging-operator/blob/master/docs/features/logforwarding/outputs/opentelemetry-lokistack-forwarding.adoc[OTLP Forwarding].
31+
32+
* With this update, a `dataModel` field has been added to the `lokiStack` output specification. Set the `dataModel` to `Otel` to configure log forwarding using the OpenTelemetry data format. The default is set to `Viaq`. For information about data mapping see link:https://opentelemetry.io/docs/specs/otlp/[OTLP Specification].
33+
34+
[id="logging-release-notes-6-1-0-bug-fixes_{context}"]
35+
== Bug Fixes
36+
None.
37+
38+
[id="logging-release-notes-6-1-0-CVEs_{context}"]
39+
== CVEs
40+
41+
* link:https://access.redhat.com/security/cve/CVE-2024-6119[CVE-2024-6119]
42+
* link:https://access.redhat.com/security/cve/CVE-2024-6232[CVE-2024-6232]

modules/log6x-loki-sizing.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Module is included in the following assemblies:
2-
// * observability/logging/logging-6.0/
2+
// * observability/logging/logging-6.1/log6x-loki-6.1.adoc
33

44
:_mod-docs-content-type: CONCEPT
55
[id="log6x-loki-sizing_{context}"]
66
= Loki deployment sizing
77

88
Sizing for Loki follows the format of `1x.<size>` where the value `1x` is number of instances and `<size>` specifies performance capabilities.
99

10-
For logging 6.1+, `1x.pico` configuration defines a single Loki deployment with minimal resource and limit requirements, offering high availability (HA) support for all Loki components. This configuration is suited for deployments that do not require a single replication factor or auto-compaction.
10+
The `1x.pico` configuration defines a single Loki deployment with minimal resource and limit requirements, offering high availability (HA) support for all Loki components. This configuration is suited for deployments that do not require a single replication factor or auto-compaction.
1111

1212
Disk requests are similar across size configurations, allowing customers to test different sizes to determine the best fit for their deployment needs.
1313

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,52 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/common-attributes.adoc[]
3-
[id="log6x-about-6.1"]
3+
[id="log6x-about-6-1"]
44
= Logging 6.1
55
context: logging-6x-6.1
66

77
toc::[]
88

99
The `ClusterLogForwarder` custom resource (CR) is the central configuration point for log collection and forwarding.
1010

11-
== Inputs and Outputs
11+
[id="inputs-and-outputs_6-1_{context}"]
12+
== Inputs and outputs
1213

1314
Inputs specify the sources of logs to be forwarded. Logging provides built-in input types: `application`, `receiver`, `infrastructure`, and `audit`, which select logs from different parts of your cluster. You can also define custom inputs based on namespaces or pod labels to fine-tune log selection.
1415

1516
Outputs define the destinations where logs are sent. Each output type has its own set of configuration options, allowing you to customize the behavior and authentication settings.
1617

17-
18-
== Receiver Input Type
18+
[id="receiver-input-type_6-1_{context}"]
19+
== Receiver input type
1920
The receiver input type enables the Logging system to accept logs from external sources. It supports two formats for receiving logs: `http` and `syslog`.
2021

2122
The `ReceiverSpec` defines the configuration for a receiver input.
2223

23-
== Pipelines and Filters
24+
[id="pipelines-and-filters_6-1_{context}"]
25+
== Pipelines and filters
2426

2527
Pipelines determine the flow of logs from inputs to outputs. A pipeline consists of one or more input refs, output refs, and optional filter refs. Filters can be used to transform or drop log messages within a pipeline. The order of filters matters, as they are applied sequentially, and earlier filters can prevent log messages from reaching later stages.
2628

27-
== Operator Behavior
29+
[id="operator-behavior_6-1_{context}"]
30+
== Operator behavior
2831

2932
The Cluster Logging Operator manages the deployment and configuration of the collector based on the `managementState` field of the `ClusterLogForwarder` resource:
3033

3134
- When set to `Managed` (default), the operator actively manages the logging resources to match the configuration defined in the spec.
3235
- When set to `Unmanaged`, the operator does not take any action, allowing you to manually manage the logging components.
3336

37+
[id="validation_6-1_{context}"]
3438
== Validation
3539
Logging includes extensive validation rules and default values to ensure a smooth and error-free configuration experience. The `ClusterLogForwarder` resource enforces validation checks on required fields, dependencies between fields, and the format of input values. Default values are provided for certain fields, reducing the need for explicit configuration in common scenarios.
3640

37-
[id="quick-start_{context}"]
41+
[id="quick-start_6-1_{context}"]
3842
== Quick start
3943

4044
OpenShift Logging supports two data models:
4145

4246
* ViaQ (General Availability)
4347
* OpenTelemetry (Technology Preview)
4448

45-
You can select either of these data models based on your requirement by configuring the `lokiStack.dataModel` field in the `ClusterLogForwarder`. ViaQ is the default data model when forwarding logs to LokiStack. For more information on OpenTelemetry, see xref:../../../observability/logging/logging-6.1/log6x-opentelemetry-data-model-6.1.adoc#log6x-opentelemetry-data-model-6.1[OpenTelemetry data model].
49+
You can select either of these data models based on your requirement by configuring the `lokiStack.dataModel` field in the `ClusterLogForwarder`. ViaQ is the default data model when forwarding logs to LokiStack.
4650

4751
[NOTE]
4852
====
@@ -51,15 +55,4 @@ In future releases of OpenShift Logging, the default data model will change from
5155

5256
include::modules/log6x-quickstart-viaq.adoc[leveloffset=+2]
5357

54-
[discrete]
55-
[role="_additional-resources"]
56-
.Additional resources
57-
* xref:../../../observability/logging/logging-6.0/log6x-upgrading-to-6.adoc#secrets-and-tls-configuration[Secrets and TLS Configuration]
58-
5958
include::modules/log6x-quickstart-opentelemetry.adoc[leveloffset=+2]
60-
61-
[discrete]
62-
[role="_additional-resources"]
63-
.Additional resources
64-
* xref:../../../observability/logging/logging-6.0/log6x-upgrading-to-6.adoc#secrets-and-tls-configuration[Secrets and TLS Configuration]
65-
* xref:../../../observability/logging/logging-6.1/log6x-configuring-lokistack-otlp-6.1.adoc#log6x-configuring-lokistack-otlp-data-ingestion_log6x-configuring-lokistack-otlp-6.1[Configuring LokiStack for OTLP data ingestion]

observability/logging/logging-6.1/log6x-clf-6.1.adoc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/common-attributes.adoc[]
3-
[id="log6x-clf-6.1"]
3+
[id="log6x-clf-6-1"]
44
= Configuring log forwarding
55
:context: logging-6x-6.1
66

@@ -16,6 +16,7 @@ The `ClusterLogForwarder` (CLF) allows users to configure forwarding of logs to
1616
1717
include::modules/log6x-collection-setup.adoc[leveloffset=+1]
1818

19+
[id="modifying-log-level_6-1_{context}"]
1920
== Modifying log level in collector
2021

2122
To modify the log level in the collector, you can set the `observability.openshift.io/log-level` annotation to `trace`, `debug`, `info`, `warn`, `error`, and `off`.
@@ -32,6 +33,7 @@ metadata:
3233
# ...
3334
----
3435

36+
[id="managing-the-operator_6-1_{context}"]
3537
== Managing the Operator
3638

3739
The `ClusterLogForwarder` resource has a `managementState` field that controls whether the operator actively manages its resources or leaves them Unmanaged:
@@ -42,6 +44,7 @@ Unmanaged:: The operator will not take any action related to the logging compone
4244

4345
This allows administrators to temporarily pause log forwarding by setting `managementState` to `Unmanaged`.
4446

47+
[id="clf-structure_6-1_{context}"]
4548
== Structure of the ClusterLogForwarder
4649

4750
The CLF has a `spec` section that contains the following key components:
@@ -54,6 +57,7 @@ Pipelines:: Define the path logs take from inputs, through filters, to outputs.
5457

5558
Filters:: Transform or drop log messages in the pipeline. Users can define filters that match certain log fields and drop or modify the messages. Filters are applied in the order specified in the pipeline.
5659

60+
[id="clf-inputs_6-1_{context}"]
5761
=== Inputs
5862

5963
Inputs are configured in an array under `spec.inputs`. There are three built-in input types:
@@ -66,6 +70,7 @@ audit:: Selects logs from the OpenShift API server audit logs, Kubernetes API se
6670

6771
Users can define custom inputs of type `application` that select logs from specific namespaces or using pod labels.
6872

73+
[id="clf-outputs_6-1_{context}"]
6974
=== Outputs
7075

7176
Outputs are configured in an array under `spec.outputs`. Each output must have a unique name and a type. Supported types are:
@@ -86,6 +91,7 @@ Each output type has its own configuration fields.
8691

8792
include::modules/log6x-configuring-otlp-output.adoc[leveloffset=+1]
8893

94+
[id="clf-pipelines_6-1_{context}"]
8995
=== Pipelines
9096

9197
Pipelines are configured in an array under `spec.pipelines`. Each pipeline must have a unique name and consists of:
@@ -96,6 +102,7 @@ filterRefs:: (optional) Names of filters to apply.
96102

97103
The order of filterRefs matters, as they are applied sequentially. Earlier filters can drop messages that will not be processed by later filters.
98104

105+
[id="clf-filters_6-1_{context}"]
99106
=== Filters
100107

101108
Filters are configured in an array under `spec.filters`. They can match incoming log messages based on the value of structured fields and modify or drop them.
@@ -108,4 +115,4 @@ include::modules/log6x-audit-log-filtering.adoc[leveloffset=+2]
108115
include::modules/log6x-input-spec-filter-labels-expressions.adoc[leveloffset=+2]
109116
include::modules/log6x-content-filter-prune-records.adoc[leveloffset=+2]
110117
include::modules/log6x-input-spec-filter-audit-infrastructure.adoc[leveloffset=+1]
111-
include::modules/log6x-input-spec-filter-namespace-container.adoc[leveloffset=+1]
118+
include::modules/log6x-input-spec-filter-namespace-container.adoc[leveloffset=+1]

observability/logging/logging-6.1/log6x-configuring-lokistack-otlp-6.1.adoc

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="log6x-configuring-lokistack-otlp-6.1"]
2+
[id="log6x-configuring-lokistack-otlp-6-1"]
33
= OTLP data ingestion in Loki
44
include::_attributes/common-attributes.adoc[]
5-
:context: log6x-configuring-lokistack-otlp-6.1
5+
:context: log6x-configuring-lokistack-otlp-6-1
66

77
toc::[]
88

9-
Loki 3.0 introduces an API endpoint using the OpenTelemetry Protocol (OTLP), providing a new way to ingest log entries into Loki. This endpoint complements the standard Push API, which is available in Loki from its initial release. Because OTLP is a standardized format not specifically designed for Loki, it requires additional configuration on Loki's side to map OpenTelemetry's data format to Loki's data model. OTLP lacks concepts such as _stream labels_ or _structured metadata_. Instead, OTLP provides metadata about log entries as *attributes*, grouped into three categories:
9+
Logging 6.1 enables an API endpoint using the OpenTelemetry Protocol (OTLP). As OTLP is a standardized format not specifically designed for Loki, it requires additional configuration on Loki's side to map OpenTelemetry's data format to Loki's data model. OTLP lacks concepts such as _stream labels_ or _structured metadata_. Instead, OTLP provides metadata about log entries as *attributes*, grouped into three categories:
1010

1111
* Resource
1212
* Scope
@@ -19,15 +19,13 @@ include::modules/log6x-configuring-lokistack-otlp-data-ingestion.adoc[leveloffse
1919
[id="attribute-mapping_{context}"]
2020
== Attribute mapping
2121

22-
When the {loki-op} is set to `openshift-logging` mode, it automatically applies a default set of xref:../../../observability/logging/logging-6.1/log6x-opentelemetry-data-model-6.1.adoc#log6x-opentelemetry-data-model-6.1[attribute mappings]. These mappings align specific OTLP attributes with Loki's stream labels and structured metadata.
22+
When the {loki-op} is set to `openshift-logging` mode, it automatically applies a default set of attribute mappings. These mappings align specific OTLP attributes with Loki's stream labels and structured metadata.
2323

2424
For typical setups, these default mappings should be sufficient. However, you might need to customize attribute mapping in the following cases:
2525

2626
* Using a custom Collector: If your setup includes a custom collector that generates additional attributes, consider customizing the mapping to ensure these attributes are retained in Loki.
2727
* Adjusting attribute detail levels: If the default attribute set is more detailed than necessary, you can reduce it to essential attributes only. This can avoid excessive data storage and streamline the {logging} process.
2828

29-
For more infomation on configuring custom attribute mappings, see xref:../../../observability/logging/logging-6.1/log6x-configuring-lokistack-otlp-6.1.adoc#custom-attribute-mapping-for-openshift_log6x-configuring-lokistack-otlp-6.1[Custom attribute mapping for OpenShift].
30-
3129
[IMPORTANT]
3230
====
3331
Attributes that are not mapped to either stream labels or structured metadata are not stored in Loki.
@@ -36,9 +34,9 @@ Attributes that are not mapped to either stream labels or structured metadata ar
3634
[id="custom-attribute-mapping-for-openshift_{context}"]
3735
=== Custom attribute mapping for OpenShift
3836

39-
When using the {loki-op} in `openshift-logging` mode, attribute mapping follow OpenShift defaults, but custom mappings can be configured to adjust these. Custom mappings allow further configurations to meet specific needs.
37+
When using the {loki-op} in `openshift-logging` mode, attribute mapping follow OpenShift defaults, but custom mappings can be configured to adjust these. Custom mappings allow further configurations to meet specific needs.
4038

41-
In `openshift-logging` mode, custom attribute mappings can be configured globally for all tenants or for individual tenants as needed. When custom mappings are defined, they are appended to the OpenShift defaults. If default recommended labels are not required, they can be disabled in the tenant configuration. For more information, see xref:../../../observability/logging/logging-6.1/log6x-configuring-lokistack-otlp-6.1.adoc#customizing-openshift-defaults_log6x-configuring-lokistack-otlp-6.1[Customizing OpenShift defaults].
39+
In `openshift-logging` mode, custom attribute mappings can be configured globally for all tenants or for individual tenants as needed. When custom mappings are defined, they are appended to the OpenShift defaults. If default recommended labels are not required, they can be disabled in the tenant configuration.
4240

4341
[NOTE]
4442
====
@@ -53,10 +51,10 @@ Within `LokiStack`, attribute mapping configuration is managed through the `limi
5351
spec:
5452
limits:
5553
global:
56-
otlp: {} # <1>
54+
otlp: {} # <1>
5755
tenants:
5856
application:
59-
otlp: {} # <2>
57+
otlp: {} # <2>
6058
----
6159
<1> Global OTLP attribute configuration.
6260
<2> OTLP attribute configuration for the `application` tenant within `openshift-logging` mode.
@@ -105,7 +103,7 @@ spec:
105103

106104
[TIP]
107105
====
108-
Use regular expressions by setting `regex: true` for attributes names when mapping similar attributes in Loki.
106+
Use regular expressions by setting `regex: true` for attributes names when mapping similar attributes in Loki.
109107
====
110108

111109
[IMPORTANT]
@@ -116,7 +114,7 @@ Avoid using regular expressions for stream labels, as this can increase data vol
116114
[id="customizing-openshift-defaults_{context}"]
117115
=== Customizing OpenShift defaults
118116

119-
In `openshift-logging` mode, certain attributes are required and cannot be removed from the configuration due to their role in OpenShift functions. Other attributes, labeled *recommended*, might be disabled if performance is impacted. For a complete attribute list, see xref:../../../observability/logging/logging-6.1/log6x-opentelemetry-data-model-6.1.adoc#log6x-opentelemetry-data-model-6.1[OpenShift default attributes].
117+
In `openshift-logging` mode, certain attributes are required and cannot be removed from the configuration due to their role in OpenShift functions. Other attributes, labeled *recommended*, might be disabled if performance is impacted.
120118

121119
When using the `openshift-logging` mode without custom attributes, you can achieve immediate compatibility with OpenShift tools. If additional attributes are needed as stream labels or structured metadata, use custom configuration. Custom configurations can merge with default configurations.
122120

@@ -148,4 +146,3 @@ This option is beneficial if the default attributes causes performance or storag
148146
* link:https://grafana.com/docs/loki/latest/get-started/labels/[Loki labels]
149147
* link:https://grafana.com/docs/loki/latest/get-started/labels/structured-metadata/[Structured metadata]
150148
* link:https://opentelemetry.io/docs/specs/otel/common/#attribute[OpenTelemetry attribute]
151-
* xref:../../../observability/logging/logging-6.1/log6x-loki-6.1.adoc#log6x-loki-6.1[Configuring LokiStack storage]

0 commit comments

Comments
 (0)