Skip to content

Commit ce578f4

Browse files
authored
Merge pull request #36833 from rolfedh/RHDEVDOCS-3336
RHDEVDOCS-3336 Copy deprecation notices from legacy forwarding topics…
2 parents 934b38f + 54677aa commit ce578f4

6 files changed

+34
-9
lines changed

logging/cluster-logging-release-notes.adoc

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88
[id="openshift-logging-supported-versions"]
99
== Supported versions
1010

11-
OpenShift Logging versions 5.0, 5.1, and 5.2 run on {product-title} versions 4.7 and 4.8.
11+
OpenShift Logging 5.0, 5.1, and 5.2 run on {product-title} 4.7 and 4.8.
1212

1313
include::modules/con_making-open-source-more-inclusive.adoc[leveloffset=+1]
1414

@@ -19,8 +19,8 @@ include::modules/con_making-open-source-more-inclusive.adoc[leveloffset=+1]
1919

2020
The following advisories are available for OpenShift Logging 5.2.x:
2121

22-
* link:https://access.redhat.com/errata/RHBA-2021:3550[RHBA-2021:3550 OpenShift Logging Bug Fix Release 5.2.1].
23-
* link:https://access.redhat.com/errata/RHBA-2021:3393[RHBA-2021:3393 OpenShift Logging Bug Fix Release 5.2.0].
22+
* link:https://access.redhat.com/errata/RHBA-2021:3550[RHBA-2021:3550 OpenShift Logging Bug Fix Release 5.2.1]
23+
* link:https://access.redhat.com/errata/RHBA-2021:3393[RHBA-2021:3393 OpenShift Logging Bug Fix Release 5.2.0]
2424

2525
[id="openshift-logging-5-2-0-new-features-and-enhancements"]
2626
=== New features and enhancements
@@ -100,4 +100,24 @@ As a workaround, if you change the secret, you can force the Fluentd pods to red
100100
$ oc delete pod -l component=fluentd
101101
----
102102

103+
[id="openshift-logging-5-2-0-deprecated-removed-features"]
104+
== Deprecated and removed features
105+
106+
Some features available in previous releases have been deprecated or removed.
107+
108+
Deprecated functionality is still included in OpenShift Logging and continues to be supported; however, it will be removed in a future release of this product and is not recommended for new deployments.
109+
110+
[id="openshift-logging-5-2-0-legacy-forwarding"]
111+
=== Forwarding logs using the legacy Fluentd and legacy syslog methods have been deprecated
112+
113+
From {product-title} 4.6 to the present, forwarding logs by using the following legacy methods have been deprecated and will be removed in a future release:
114+
115+
* xref:../logging/cluster-logging-external.adoc#cluster-logging-collector-legacy-fluentd_cluster-logging-external[Forwarding logs using the legacy Fluentd method]
116+
* xref:../logging/cluster-logging-external.adoc#cluster-logging-collector-legacy-syslog_cluster-logging-external[Forwarding logs using the legacy syslog method]
117+
118+
Instead, use the following non-legacy methods:
119+
120+
* xref:../logging/cluster-logging-external.adoc#cluster-logging-collector-log-forward-fluentd_cluster-logging-external[Forwarding logs using the Fluentd forward protocol]
121+
* xref:../logging/cluster-logging-external.adoc#cluster-logging-collector-log-forward-syslog_cluster-logging-external[Forwarding logs using the syslog protocol]
122+
103123
include::modules/cluster-logging-release-notes-5.1.0.adoc[leveloffset=+1]

logging/cluster-logging-upgrading.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8-
{product-title} versions 4.7 and 4.8 support OpenShift Logging versions 5.0, 5.1, and 5.2.
8+
{product-title} 4.7 and 4.8 support OpenShift Logging 5.0, 5.1, and 5.2.
99

1010
To upgrade from cluster logging in {product-title} version 4.6 and earlier to OpenShift Logging 5.x, you update the {product-title} cluster to version 4.7 or 4.8. Then, you update the following operators:
1111

modules/cluster-logging-collector-collecting-ovn-logs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ You can collect the OVN network policy audit logs from the `/var/log/ovn/acl-aud
66
.Prerequisites
77

88
* You are using {product-title} version 4.8 or later.
9-
* You are using Cluster Logging version 5.2 or later.
9+
* You are using Cluster Logging 5.2 or later.
1010
* You have already set up a `ClusterLogForwarder` custom resource (CR) object.
1111
* The {product-title} cluster is configured for OVN-Kubernetes network policy audit logging. See the following "Additional resources" section.
1212

modules/cluster-logging-collector-log-forwarding-supported-plugins-5-1.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
= Supported log data output types in OpenShift Logging 5.1
88

9-
Red Hat OpenShift Logging version 5.1 provides the following output types and protocols for sending log data to target log collectors.
9+
Red Hat OpenShift Logging 5.1 provides the following output types and protocols for sending log data to target log collectors.
1010

1111
Red Hat tests each of the combinations shown in the following table. However, you should be able to send log data to a wider range target log collectors that ingest these protocols.
1212

@@ -40,7 +40,7 @@ kafka 2.7.0
4040

4141
|====
4242

43-
// Note to tech writer, validate these items against the corresponding line of the test configuration file that Red Hat OpenShift Logging version 5.0 uses: https://github.com/openshift/origin-aggregated-logging/blob/release-5.0/fluentd/Gemfile.lock
43+
// Note to tech writer, validate these items against the corresponding line of the test configuration file that Red Hat OpenShift Logging 5.0 uses: https://github.com/openshift/origin-aggregated-logging/blob/release-5.0/fluentd/Gemfile.lock
4444
// This file is the authoritative source of information about which items and versions Red Hat tests and supports.
4545
// According to this link:https://github.com/zendesk/ruby-kafka#compatibility[Zendesk compatibility list for ruby-kafka], the fluent-plugin-kafka plug-in supports Kafka version 0.11.
4646
// Logstash support is according to https://github.com/openshift/cluster-logging-operator/blob/master/test/functional/outputs/forward_to_logstash_test.go#L37

modules/cluster-logging-collector-log-forwarding-supported-plugins-5-2.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
= Supported log data output types in OpenShift Logging 5.2
88

9-
Red Hat OpenShift Logging version 5.2 provides the following output types and protocols for sending log data to target log collectors.
9+
Red Hat OpenShift Logging 5.2 provides the following output types and protocols for sending log data to target log collectors.
1010

1111
Red Hat tests each of the combinations shown in the following table. However, you should be able to send log data to a wider range target log collectors that ingest these protocols.
1212

@@ -49,7 +49,7 @@ kafka 2.7.0
4949

5050
|====
5151

52-
// Note to tech writer, validate these items against the corresponding line of the test configuration file that Red Hat OpenShift Logging version 5.0 uses: https://github.com/openshift/origin-aggregated-logging/blob/release-5.0/fluentd/Gemfile.lock
52+
// Note to tech writer, validate these items against the corresponding line of the test configuration file that Red Hat OpenShift Logging 5.0 uses: https://github.com/openshift/origin-aggregated-logging/blob/release-5.0/fluentd/Gemfile.lock
5353
// This file is the authoritative source of information about which items and versions Red Hat tests and supports.
5454
// According to this link:https://github.com/zendesk/ruby-kafka#compatibility[Zendesk compatibility list for ruby-kafka], the fluent-plugin-kafka plug-in supports Kafka version 0.11.
5555
// Logstash support is according to https://github.com/openshift/cluster-logging-operator/blob/master/test/functional/outputs/forward_to_logstash_test.go#L37

modules/cluster-logging-release-notes-5.1.0.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ Deprecated functionality is still included in OpenShift Logging and continues to
4444

4545
With this update, the Elasticsearch Curator has been removed and is no longer supported. Elasticsearch Curator helped you curate or manage your indices on {product-title} 4.4 and earlier. Instead of using Elasticsearch Curator, configure the log retention time.
4646

47+
[id="openshift-logging-5-1-0-legacy-forwarding"]
48+
=== Forwarding logs using the legacy Fluentd and legacy syslog methods have been deprecated
49+
50+
From {product-title} version 4.6 to the present, forwarding logs by using the legacy Fluentd and legacy syslog methods have been deprecated and will be removed in a future release. Use the standard non-legacy methods instead.
51+
4752
[id="openshift-logging-5-1-0-bug-fixes"]
4853
== Bug fixes
4954

0 commit comments

Comments
 (0)