Skip to content

Commit eb4b080

Browse files
authored
Merge pull request #68946 from openshift/revert-68921-OBSDOCS-650-setup
Revert "OBSDOCS-650: Update structure of collector docs"
2 parents 5f6fb31 + 8dcaf83 commit eb4b080

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2550,6 +2550,8 @@ Topics:
25502550
File: cluster-logging-memory
25512551
- Name: Using tolerations to control Logging pod placement
25522552
File: cluster-logging-tolerations
2553+
- Name: Moving logging subsystem resources with node selectors
2554+
File: cluster-logging-moving-nodes
25532555
- Name: Configuring systemd-journald for Logging
25542556
File: cluster-logging-systemd
25552557
- Name: Log collection and forwarding

_topic_maps/_topic_map_osd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,6 +1059,8 @@ Topics:
10591059
File: cluster-logging-memory
10601060
- Name: Using tolerations to control Logging pod placement
10611061
File: cluster-logging-tolerations
1062+
- Name: Moving logging subsystem resources with node selectors
1063+
File: cluster-logging-moving-nodes
10621064
#- Name: Configuring systemd-journald and Fluentd
10631065
# File: cluster-logging-systemd
10641066
- Name: Log collection and forwarding

_topic_maps/_topic_map_rosa.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,8 @@ Topics:
12571257
File: cluster-logging-memory
12581258
- Name: Using tolerations to control Logging pod placement
12591259
File: cluster-logging-tolerations
1260+
- Name: Moving logging subsystem resources with node selectors
1261+
File: cluster-logging-moving-nodes
12601262
#- Name: Configuring systemd-journald and Fluentd
12611263
# File: cluster-logging-systemd
12621264
- Name: Log collection and forwarding
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
:context: cluster-logging-moving
3+
[id="cluster-logging-moving"]
4+
= Moving {logging} resources with node selectors
5+
include::_attributes/common-attributes.adoc[]
6+
7+
toc::[]
8+
9+
You can use node selectors to deploy the Elasticsearch and Kibana pods to different nodes.
10+
11+
include::modules/infrastructure-moving-logging.adoc[leveloffset=+1]

logging/log_collection_forwarding/cluster-logging-collector.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ include::_attributes/attributes-openshift-dedicated.adoc[]
88
toc::[]
99

1010
{logging-title-uc} collects operations and application logs from your cluster and enriches the data with Kubernetes pod and project metadata.
11-
All supported modifications to the log collector can be performed though the `spec.collection` stanza in the `ClusterLogging` custom resource (CR).
1211

13-
include::modules/configuring-logging-collector.adoc[leveloffset=+1]
12+
You can configure the CPU and memory limits for the log collector and xref:../../logging/config/cluster-logging-moving-nodes.adoc#cluster-logging-moving[move the log collector pods to specific nodes]. All supported modifications to the log collector can be performed though the `spec.collection.log.fluentd` stanza in the `ClusterLogging` custom resource (CR).
1413

15-
include::modules/infrastructure-moving-logging.adoc[leveloffset=+1]
14+
include::modules/configuring-logging-collector.adoc[leveloffset=+1]
1615

1716
include::modules/cluster-logging-collector-pod-location.adoc[leveloffset=+1]
1817

0 commit comments

Comments
 (0)