Merge pull request #13218 from mburke5678/logging-40-edits-per-jcantrill

Edits to merged EFK topics

Author: mburke5678

_topic_map.yml

@@ -173,11 +173,11 @@ Topics:
 - Name: Appendices
   File: operators-appendices
 ---
-Name: Aggregated EFK Logging
+Name: Cluster logging
 Dir: logging
 Distros: openshift-*
 Topics:
-- Name: About EFK logging
+- Name: About cluster logging
   File: efk-logging
 - Name: Deploying EFK stack
   File: efk-logging-deploy
@@ -193,7 +193,7 @@ Topics:
   File: efk-logging-curator
 - Name: Sending logs to external devices
   File: efk-logging-external
-- Name: Setting the EFK logging driver
+- Name: Setting the cluster logging driver
   File: efk-logging-driver
 - Name: Manually rolling out Elasticsearch
   File: efk-logging-manual-rollout

logging/efk-logging-curator.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-curator
-[id='efk-logging-curator_{context}']
+[id='efk-logging-curator']
 = Working with Elasticsearch Curator in {product-title}
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-deploy.adoc

@@ -1,6 +1,6 @@
 :context: efk-logging-deploy
-[id='efk-logging-deploy_{context}']
-= Deploying EFK logging
+[id='efk-logging-deploy']
+= Deploying cluster logging
 include::modules/common-attributes.adoc[]
 
 toc::[]
@@ -11,10 +11,6 @@ The process for deploying the EFK into {prouct-title} involves:
 
 * Editing the Ansible inventory file for your environment;
 
-* Optionally, configure the inventory file to deploy the Ops Cluster;
-
-* Optionally, configure the inventory file to deploy the eventrouter;
-
 * Running the logging installer Ansible playbook.
 
 // The following include statements pull in the module files that comprise
@@ -28,17 +24,10 @@ include::modules/efk-logging-storage-considerations.adoc[leveloffset=+1]
 
 include::modules/efk-logging-deploy-variables.adoc[leveloffset=+1]
 
-include::modules/efk-logging-deploy-ops-cluster.adoc[leveloffset=+1]
-
-include::modules/efk-logging-deploy-eventrouter.adoc[leveloffset=+1]
-
 include::modules/efk-logging-deploy-memory.adoc[leveloffset=+1]
 
 include::modules/efk-logging-deploy-certificates.adoc[leveloffset=+1]
 
 include::modules/efk-logging-deploy-playbook.adoc[leveloffset=+1]
 
 include::modules/efk-logging-deploy-label.adoc[leveloffset=+1]
-
-
-

logging/efk-logging-driver.adoc

@@ -1,14 +1,16 @@
 :context: efk-logging-driver
-[id='efk-logging-driver_{context}']
-= Setting the EFK logging driver
+[id='efk-logging-driver']
+= Setting the cluster logging driver
 include::modules/common-attributes.adoc[]
 
 toc::[]
 
-By default, the *json-file* log driver is used by default for Docker in {product-title} as of {product-title} 3.9.
-However, if you have upgraded from {product-title} 3.7, your cluster might be configured to use the *journald* log driver configuration. 
+By default, the *json-file* log driver is used by default. However, you can use change to *journald*, if needed. 
 
-If you are using EFK logging, you should use the *json-file* log driver.
+[NOTE]
+====
+To use cluster logging, you should change to *json-file*. 
+====
 
 // The following include statements pull in the module files that comprise
 // the assembly. Include any combination of concept, procedure, or reference

logging/efk-logging-elasticsearch.adoc

@@ -1,5 +1,5 @@
-:context: efk-logging-elasticseearch
-[id='efk-logging-elasticsearch_{context}']
+:context: efk-logging-elasticsearch
+[id='efk-logging-elasticsearch']
 = Working with Elasticsearch in {product-title}
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-exported-fields.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-exported-fields
-[id='efk-logging-exported-fields_{context}']
+[id='efk-logging-exported-fields']
 = Exported fields
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-external.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-external
-[id='efk-logging-external_{context}']
+[id='efk-logging-external']
 = Sending {product-title} logs to external devices
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-fluentd.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-fluentd
-[id='efk-logging-fluentd_{context}']
+[id='efk-logging-fluentd']
 = Working with Fluentd in {product-title}
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-kibana.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-kibana
-[id='efk-logging-kibana_{context}']
+[id='efk-logging-kibana']
 = Working with Kibana in {product-title}
 include::modules/common-attributes.adoc[]
 

logging/efk-logging-manual-rollout.adoc

@@ -1,5 +1,5 @@
 :context: efk-logging-rollout
-[id='efk-logging-rollout_{context}']
+[id='efk-logging-rollout']
 = Manually rolling out Elasticsearch
 include::modules/common-attributes.adoc[]