Skip to content

Commit 209e4b0

Browse files
authored
Merge pull request #34820 from rolfedh/RHDEVDOCS-3182
RHDEVDOCS-3182: Update the "Supported log data output types" for 5.1
2 parents 0fceb44 + fe2445e commit 209e4b0

File tree

3 files changed

+55
-3
lines changed

3 files changed

+55
-3
lines changed

logging/cluster-logging-external.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ You cannot use the config map methods and the Cluster Log Forwarder in the same
2929
// assemblies.
3030

3131
include::modules/cluster-logging-collector-log-forwarding-about.adoc[leveloffset=+1]
32-
include::modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc[leveloffset=+1]
32+
include::modules/cluster-logging-collector-log-forwarding-supported-plugins-5-0.adoc[leveloffset=+1]
33+
include::modules/cluster-logging-collector-log-forwarding-supported-plugins-5-1.adoc[leveloffset=+1]
3334
include::modules/cluster-logging-collector-log-forward-es.adoc[leveloffset=+1]
3435
include::modules/cluster-logging-collector-log-forward-fluentd.adoc[leveloffset=+1]
3536
include::modules/cluster-logging-collector-log-forward-syslog.adoc[leveloffset=+1]

modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc renamed to modules/cluster-logging-collector-log-forwarding-supported-plugins-5-0.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
//
33
// logging/cluster-logging-external.adoc
44

5-
[id="cluster-logging-collector-log-forwarding-supported-plugins_{context}"]
5+
[id="cluster-logging-collector-log-forwarding-supported-plugins-5-0_{context}"]
66

7-
= Supported log data output types
7+
= Supported log data output types in OpenShift Logging 5.0
88

99
Red Hat OpenShift Logging version 5.0 provides the following output types and protocols for sending log data to target log collectors.
1010

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Module included in the following assemblies:
2+
//
3+
// logging/cluster-logging-external.adoc
4+
5+
[id="cluster-logging-collector-log-forwarding-supported-plugins-5-1_{context}"]
6+
7+
= Supported log data output types in OpenShift Logging 5.1
8+
9+
Red Hat OpenShift Logging versions 5.1 provides the following output types and protocols for sending log data to target log collectors.
10+
11+
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.
12+
13+
[options="header"]
14+
|====
15+
| Output types | Protocols | Tested with
16+
17+
| fluentdForward
18+
| fluentd forward v1
19+
a| fluentd 1.7.4
20+
21+
logstash 7.10.1
22+
23+
| elasticsearch
24+
| elasticsearch
25+
a| Elasticsearch 6.8.1
26+
27+
Elasticsearch 6.8.4
28+
29+
Elasticsearch 7.12.2
30+
31+
| syslog
32+
| RFC-3164, RFC-5424
33+
| rsyslog-8.39.0
34+
35+
| kafka
36+
| kafka 0.11
37+
a| kafka 2.4.1
38+
39+
kafka 2.7.0
40+
41+
|====
42+
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
44+
// This file is the authoritative source of information about which items and versions Red Hat tests and supports.
45+
// 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.
46+
// Logstash support is according to https://github.com/openshift/cluster-logging-operator/blob/master/test/functional/outputs/forward_to_logstash_test.go#L37
47+
48+
[NOTE]
49+
====
50+
Previously, the syslog output supported only RFC-3164. The current syslog output adds support for RFC-5424.
51+
====

0 commit comments

Comments
 (0)