Merge pull request #13805 from mburke5678/BZ-1682996

Logging feedback for 4.0 docs

Author: mburke5678

logging/efk-logging-manual-rollout.adoc

@@ -7,6 +7,14 @@ toc::[]
 
 
 
+<<<<<<< HEAD
+=======
+{product-title} is configured so that the Elasticsearch
+Deployment Config object does not have a Config Change Trigger, meaning
+any changes to the DeploymentConfig does not result in an automatic rollout. This prevents
+unintended restarts happening in the Elasticsearch cluster, which could create excessive shard
+rebalancing as cluster members restart.
+>>>>>>> edit
 
 {product-title} supports two Elasticsearch restart procedures:
 

modules/efk-logging-about-crd.adoc

@@ -1,11 +1,11 @@
+<<<<<<< HEAD
 // Module included in the following assemblies:
 //
 // * logging/efk-logging.adoc
 
 [id='efk-logging-configuring-crd_{context}']
 = About the Cluster logging CRD
 
-
 The Cluster Logging Operator Custom Resource Definition (CRD) defines a complete cluster logging deployment 
 that includes all the components of the logging stack to collect, store and visualize logs. 
 
@@ -40,7 +40,7 @@ spec:
       nodeSelector:
           node-type: infra
           cluster-logging-component: es
-      storage: {}
+      storage:
         storageClass:
           name: "gp2"
           size: "200G"