Skip to content

Commit b0dab55

Browse files
abrennan89abrennan89
committed
OBSDOCS-542: Update logging pod names
1 parent aa60709 commit b0dab55

File tree

6 files changed

+36
-53
lines changed

6 files changed

+36
-53
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2532,7 +2532,7 @@ Topics:
25322532
File: cluster-logging-memory
25332533
- Name: Using tolerations to control Logging pod placement
25342534
File: cluster-logging-tolerations
2535-
- Name: Moving the Logging resources with node selectors
2535+
- Name: Moving logging subsystem resources with node selectors
25362536
File: cluster-logging-moving-nodes
25372537
- Name: Configuring systemd-journald for Logging
25382538
File: cluster-logging-systemd

‎_topic_maps/_topic_map_osd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ Topics:
10051005
File: cluster-logging-memory
10061006
- Name: Using tolerations to control Logging pod placement
10071007
File: cluster-logging-tolerations
1008-
- Name: Moving the Logging resources with node selectors
1008+
- Name: Moving logging subsystem resources with node selectors
10091009
File: cluster-logging-moving-nodes
10101010
#- Name: Configuring systemd-journald and Fluentd
10111011
# File: cluster-logging-systemd

‎_topic_maps/_topic_map_rosa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ Topics:
11781178
File: cluster-logging-memory
11791179
- Name: Using tolerations to control Logging pod placement
11801180
File: cluster-logging-tolerations
1181-
- Name: Moving the Logging resources with node selectors
1181+
- Name: Moving logging subsystem resources with node selectors
11821182
File: cluster-logging-moving-nodes
11831183
#- Name: Configuring systemd-journald and Fluentd
11841184
# File: cluster-logging-systemd

‎logging/config/cluster-logging-moving-nodes.adoc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
10-
11-
12-
139
You can use node selectors to deploy the Elasticsearch and Kibana pods to different nodes.
1410

15-
// The following include statements pull in the module files that comprise
16-
// the assembly. Include any combination of concept, procedure, or reference
17-
// modules required to cover the user story. You can also include other
18-
// assemblies.
19-
2011
include::modules/infrastructure-moving-logging.adoc[leveloffset=+1]

‎modules/cluster-logging-clo-status.adoc

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,29 @@ $ oc get clusterlogging instance -o yaml
3333
----
3434
apiVersion: logging.openshift.io/v1
3535
kind: ClusterLogging
36-
37-
....
38-
36+
# ...
3937
status: <1>
4038
collection:
4139
logs:
4240
fluentdStatus:
4341
daemonSet: fluentd <2>
4442
nodes:
45-
fluentd-2rhqp: ip-10-0-169-13.ec2.internal
46-
fluentd-6fgjh: ip-10-0-165-244.ec2.internal
47-
fluentd-6l2ff: ip-10-0-128-218.ec2.internal
48-
fluentd-54nx5: ip-10-0-139-30.ec2.internal
49-
fluentd-flpnn: ip-10-0-147-228.ec2.internal
50-
fluentd-n2frh: ip-10-0-157-45.ec2.internal
43+
collector-2rhqp: ip-10-0-169-13.ec2.internal
44+
collector-6fgjh: ip-10-0-165-244.ec2.internal
45+
collector-6l2ff: ip-10-0-128-218.ec2.internal
46+
collector-54nx5: ip-10-0-139-30.ec2.internal
47+
collector-flpnn: ip-10-0-147-228.ec2.internal
48+
collector-n2frh: ip-10-0-157-45.ec2.internal
5149
pods:
5250
failed: []
5351
notReady: []
5452
ready:
55-
- fluentd-2rhqp
56-
- fluentd-54nx5
57-
- fluentd-6fgjh
58-
- fluentd-6l2ff
59-
- fluentd-flpnn
60-
- fluentd-n2frh
53+
- collector-2rhqp
54+
- collector-54nx5
55+
- collector-6fgjh
56+
- collector-6l2ff
57+
- collector-flpnn
58+
- collector-n2frh
6159
logstore: <3>
6260
elasticsearchStatus:
6361
- ShardAllocationEnabled: all

‎modules/infrastructure-moving-logging.adoc

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
:_mod-docs-content-type: PROCEDURE
77
[id="infrastructure-moving-logging_{context}"]
8-
= Moving OpenShift Logging resources
8+
= Moving {logging} resources
99

10-
You can configure the Cluster Logging Operator to deploy the pods for {logging} components, such as Elasticsearch and Kibana, to different nodes. You cannot move the Cluster Logging Operator pod from its installed location.
10+
You can configure the {clo} to deploy the pods for {logging} components, such as Elasticsearch and Kibana, to different nodes. You cannot move the {clo} pod from its installed location.
1111

1212
For example, you can move the Elasticsearch pods to a separate node because of high CPU, memory, and disk requirements.
1313

1414
.Prerequisites
1515

16-
* The Red Hat OpenShift Logging and Elasticsearch Operators must be installed. These features are not installed by default.
16+
* You have installed the {clo} and the {es-op}.
1717
1818
.Procedure
1919

@@ -24,13 +24,12 @@ For example, you can move the Elasticsearch pods to a separate node because of h
2424
$ oc edit ClusterLogging instance
2525
----
2626
+
27+
.Example `ClusterLogging` CR
2728
[source,yaml]
2829
----
2930
apiVersion: logging.openshift.io/v1
3031
kind: ClusterLogging
31-
32-
...
33-
32+
# ...
3433
spec:
3534
collection:
3635
logs:
@@ -76,8 +75,7 @@ spec:
7675
replicas: 1
7776
resources: null
7877
type: kibana
79-
80-
...
78+
# ...
8179
----
8280
<1> Add a `nodeSelector` parameter with the appropriate value to the component you want to move. You can use a `nodeSelector` in the format shown or use `<key>: <value>` pairs, based on the value specified for the node. If you added a taint to the infrasructure node, also add a matching toleration.
8381

@@ -150,13 +148,9 @@ metadata:
150148
----
151149
apiVersion: logging.openshift.io/v1
152150
kind: ClusterLogging
153-
154-
...
155-
151+
# ...
156152
spec:
157-
158-
...
159-
153+
# ...
160154
visualization:
161155
kibana:
162156
nodeSelector: <1>
@@ -184,12 +178,12 @@ cluster-logging-operator-84d98649c4-zb9g7 1/1 Running 0
184178
elasticsearch-cdm-hwv01pf7-1-56588f554f-kpmlg 2/2 Running 0 28m
185179
elasticsearch-cdm-hwv01pf7-2-84c877d75d-75wqj 2/2 Running 0 28m
186180
elasticsearch-cdm-hwv01pf7-3-f5d95b87b-4nx78 2/2 Running 0 28m
187-
fluentd-42dzz 1/1 Running 0 28m
188-
fluentd-d74rq 1/1 Running 0 28m
189-
fluentd-m5vr9 1/1 Running 0 28m
190-
fluentd-nkxl7 1/1 Running 0 28m
191-
fluentd-pdvqb 1/1 Running 0 28m
192-
fluentd-tflh6 1/1 Running 0 28m
181+
collector-42dzz 1/1 Running 0 28m
182+
collector-d74rq 1/1 Running 0 28m
183+
collector-m5vr9 1/1 Running 0 28m
184+
collector-nkxl7 1/1 Running 0 28m
185+
collector-pdvqb 1/1 Running 0 28m
186+
collector-tflh6 1/1 Running 0 28m
193187
kibana-5b8bdf44f9-ccpq9 2/2 Terminating 0 4m11s
194188
kibana-7d85dcffc8-bfpfp 2/2 Running 0 33s
195189
----
@@ -223,11 +217,11 @@ cluster-logging-operator-84d98649c4-zb9g7 1/1 Running 0 30m
223217
elasticsearch-cdm-hwv01pf7-1-56588f554f-kpmlg 2/2 Running 0 29m
224218
elasticsearch-cdm-hwv01pf7-2-84c877d75d-75wqj 2/2 Running 0 29m
225219
elasticsearch-cdm-hwv01pf7-3-f5d95b87b-4nx78 2/2 Running 0 29m
226-
fluentd-42dzz 1/1 Running 0 29m
227-
fluentd-d74rq 1/1 Running 0 29m
228-
fluentd-m5vr9 1/1 Running 0 29m
229-
fluentd-nkxl7 1/1 Running 0 29m
230-
fluentd-pdvqb 1/1 Running 0 29m
231-
fluentd-tflh6 1/1 Running 0 29m
220+
collector-42dzz 1/1 Running 0 29m
221+
collector-d74rq 1/1 Running 0 29m
222+
collector-m5vr9 1/1 Running 0 29m
223+
collector-nkxl7 1/1 Running 0 29m
224+
collector-pdvqb 1/1 Running 0 29m
225+
collector-tflh6 1/1 Running 0 29m
232226
kibana-7d85dcffc8-bfpfp 2/2 Running 0 62s
233227
----

0 commit comments

Comments
 (0)