Skip to content

Commit 06ebaed

Browse files
authored
Merge pull request #51763 from mburke5678/logging-fix-nodecount-main
[main] Fix nodecount and ES memory per slack
2 parents 7ef9cbd + fb7772e commit 06ebaed

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

_unused_topics/cluster-logging-configuring-node-selector.adoc

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
// * logging/cluster-logging-elasticsearch.adoc
44

55
[id="cluster-logging-configuring-node-selector_{context}"]
6-
= Specifying a node for OpenShift Logging components using node selectors
6+
= Specifying a node for cluster logging components using node selectors
77

8-
Each component specification allows the component to target a specific node.
8+
Each component specification allows the component to target a specific node.
99

1010
.Procedure
1111

12-
. Edit the Cluster Logging custom resource (CR) in the `openshift-logging` project:
13-
+
14-
----
15-
$ oc edit ClusterLogging instance
16-
----
17-
+
12+
Edit the Cluster Logging Custom Resource (CR) in the `openshift-logging` project:
13+
1814
[source,yaml]
1915
----
16+
$ oc edit ClusterLogging instance
17+
2018
apiVersion: "logging.openshift.io/v1"
2119
kind: "ClusterLogging"
2220
metadata:
@@ -28,13 +26,13 @@ spec:
2826
elasticsearch:
2927
nodeSelector: <1>
3028
logging: es
31-
nodeCount: 1
29+
nodeCount: 3
3230
resources:
3331
limits:
34-
memory: 2Gi
32+
memory: 16Gi
3533
requests:
36-
cpu: 200m
37-
memory: 2Gi
34+
cpu: 500m
35+
memory: 16Gi
3836
storage:
3937
size: "20G"
4038
storageClassName: "gp2"
@@ -45,13 +43,23 @@ spec:
4543
nodeSelector: <2>
4644
logging: kibana
4745
replicas: 1
46+
curation:
47+
type: "curator"
48+
curator:
49+
nodeSelector: <3>
50+
logging: curator
51+
schedule: "*/10 * * * *"
4852
collection:
4953
logs:
5054
type: "fluentd"
5155
fluentd:
52-
nodeSelector: <3>
56+
nodeSelector: <4>
5357
logging: fluentd
5458
----
59+
5560
<1> Node selector for Elasticsearch.
5661
<2> Node selector for Kibana.
57-
<3> Node selector for Fluentd.
62+
<3> Node selector for Curator.
63+
<4> Node selector for Fluentd.
64+
65+

modules/cluster-logging-deploying-about.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ spec:
3535
resources:
3636
limits:
3737
cpu:
38-
memory:
38+
memory: 16Gi
3939
requests:
40-
cpu: 1
40+
cpu: 500m
4141
memory: 16Gi
4242
type: "elasticsearch"
4343
collection:

0 commit comments

Comments
 (0)