Merge pull request #30170 from rolfedh/RHDEVDOCS-2752

Rhdevdocs 2752

Author: codyhoag

modules/cluster-logging-about-crd.adoc

@@ -43,10 +43,11 @@ spec:
         request:
           memory: 8G
       proxy:
-        limits:
-          memory: 100Mi
-        requests:
-          memory: 100Mi
+        resources:
+          limits:
+            memory: 256Mi
+          requests:
+            memory: 256Mi
   visualization:
     type: "kibana"
     kibana:

modules/cluster-logging-deploy-cli.adoc

@@ -362,10 +362,11 @@ spec:
         requests:
           memory: "8Gi"
       proxy: <8>
-        limits:
-          memory: 256Mi
-        requests:
-           memory: 256Mi
+        resources:
+          limits:
+            memory: 256Mi
+          requests:
+             memory: 256Mi
       redundancyPolicy: "SingleRedundancy"
   visualization:
     type: "kibana"  <9>

modules/cluster-logging-deploy-console.adoc

@@ -196,10 +196,11 @@ spec:
       storage:
         storageClassName: "<storage_class_name>" <6>
         size: 200G
-        resources: <7>
-          requests:
-            memory: "8Gi"
-        proxy: <8>
+      resources: <7>
+        requests:
+          memory: "8Gi"
+      proxy: <8>
+        resources:
           limits:
             memory: 256Mi
           requests:

modules/cluster-logging-logstore-limits.adoc

@@ -3,7 +3,7 @@
 // * logging/cluster-logging-elasticsearch.adoc
 
 [id="cluster-logging-logstore-limits_{context}"]
-= Configuring CPU and memory requests for the log store 
+= Configuring CPU and memory requests for the log store
 
 Each component specification allows for adjustments to both the CPU and memory requests.
 You should not have to manually adjust these values as the Elasticsearch
@@ -14,7 +14,7 @@ Operator sets values sufficient for your environment.
 In large-scale clusters, the default memory limit for the Elasticsearch proxy container might not be sufficient, causing the proxy container to be OOMKilled. If you experience this issue, increase the memory requests and limits for the Elasticsearch proxy.
 ====
 
-Each Elasticsearch node can operate with a lower memory setting though this is *not* recommended for production deployments. 
+Each Elasticsearch node can operate with a lower memory setting though this is *not* recommended for production deployments.
 For production use, you should have no less than the default 16Gi allocated to each pod. Preferably you should allocate as much as possible, up to 64Gi per pod.
 
 .Prerequisites
@@ -46,16 +46,17 @@ spec:
             cpu: "1"
             memory: "64Gi"
         proxy: <2>
-          limits:
-            memory: 100Mi
-          requests:
-             memory: 100Mi
+          resources:
+            limits:
+              memory: 100Mi
+            requests:
+              memory: 100Mi
 ----
 <1> Specify the CPU and memory requests for Elasticsearch as needed. If you leave these values blank,
 the Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `16Gi` for the memory request and `1` for the CPU request.
 <2> Specify the CPU and memory requests for the Elasticsearch proxy as needed. If you leave these values blank, the Elasticsearch Operator sets default values that should be sufficient for most deployments. The default values are `256Mi` for the memory request and `100m` for the CPU request.
 
-If you adjust the amount of Elasticsearch memory, you must change both the request value and the limit value. 
+If you adjust the amount of Elasticsearch memory, you must change both the request value and the limit value.
 
 For example:
 
@@ -69,5 +70,5 @@ For example:
           memory: "32Gi"
 ----
 
-Kubernetes generally adheres the node configuration and does not allow Elasticsearch to use the specified limits. 
+Kubernetes generally adheres the node configuration and does not allow Elasticsearch to use the specified limits.
 Setting the same value for the `requests` and `limits` ensures that Elasticsearch can use the memory you want, assuming the node has the memory available.