Merge pull request #14326 from mburke5678/logging-config-subdir

Logging: Moving configuring topics into a subdirectory

Author: mburke5678

_topic_map.yml

@@ -478,26 +478,33 @@ Distros: openshift-*
 Topics:
 - Name: About cluster logging
   File: efk-logging
+- Name: About deploying cluster logging
+  File: efk-logging-deploying-about
 - Name: Deploying cluster logging
-  File: efk-logging-deploy
-- Name: Changing cluster logging management state
-  File: efk-logging-management
-- Name: Configuring cluster logging
-  File: efk-logging-configuring
-- Name: Configuring Elasticsearch
-  File: efk-logging-elasticsearch
-- Name: Configuring Kibana
-  File: efk-logging-kibana
-- Name: Configuring Curator
-  File: efk-logging-curator
-- Name: Configuring Fluentd
-  File: efk-logging-fluentd
+  File: efk-logging-deploying
 - Name: Deploying and Configuring the Event Router
   File: efk-logging-eventrouter
-- Name: Configuring systemd-journald
-  File: efk-logging-systemd
-- Name: Sending logs to external devices
-  File: efk-logging-external
+- Name: Configuring your cluster logging deployment
+  Dir: config
+  Topics:
+  - Name: About configuring cluster logging
+    File: efk-logging-configuring-about
+  - Name: Changing cluster logging management state
+    File: efk-logging-management
+  - Name: Configuring cluster logging
+    File: efk-logging-configuring
+  - Name: Configuring Elasticsearch
+    File: efk-logging-elasticsearch
+  - Name: Configuring Kibana
+    File: efk-logging-kibana
+  - Name: Configuring Curator
+    File: efk-logging-curator
+  - Name: Configuring Fluentd
+    File: efk-logging-fluentd
+  - Name: Configuring systemd-journald
+    File: efk-logging-systemd
+  - Name: Sending logs to external devices
+    File: efk-logging-external
 - Name: Manually rolling out Elasticsearch
   File: efk-logging-manual-rollout
 - Name: Troubleshooting Kibana

logging/config/efk-logging-configuring-about.adoc

@@ -0,0 +1,22 @@
+:context: efk-logging-configuring-about
+[id="efk-logging-configuring-about"]
+= About configuring cluster logging
+include::modules/common-attributes.adoc[]
+
+toc::[]
+
+After installing cluster logging into your cluster, you can make the following configurations.
+
+[NOTE]
+====
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
+====
+
+// The following include statements pull in the module files that comprise
+// the assembly. Include any combination of concept, procedure, or reference
+// modules required to cover the user story. You can also include other
+// assemblies.
+
+include::modules/efk-logging-deploying-about.adoc[leveloffset=+1]
+
+

logging/efk-logging-configuring.adoc renamed to logging/config/efk-logging-configuring.adoc

@@ -106,7 +106,7 @@ Optionally, you can use the actions file, *_actions.yaml_*, directly. Editing th
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-curator.adoc renamed to logging/config/efk-logging-curator.adoc

@@ -19,7 +19,7 @@ or higher memory. Each Elasticsearch node can operate with a lower memory settin
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
 ====
 
 // The following include statements pull in the module files that comprise
@@ -51,5 +51,5 @@ modules/efk-logging-elasticsearch-persistent-storage-local.adoc[leveloffset=+2]
 
 == Additional Resources
 
-//For information on installing Elasticsearch, see xref:../logging/efk-logging-deploy.adoc[Deploying cluster logging].
+//For information on installing Elasticsearch, see xref:../../logging/efk-logging-deploying.adoc[Deploying cluster logging].
 

logging/efk-logging-elasticsearch.adoc renamed to logging/config/efk-logging-elasticsearch.adoc

@@ -10,7 +10,7 @@ or an external syslog server. You can also configure Fluentd to send logs to an
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-external.adoc renamed to logging/config/efk-logging-external.adoc

@@ -11,7 +11,7 @@ You can configure log rotation, log location, use an external log aggregator, an
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
 ====
 
 // The following include statements pull in the module files that comprise
@@ -30,9 +30,11 @@ include::modules/efk-logging-fluentd-limits.adoc[leveloffset=+1]
 ////
 4.1
 modules/efk-logging-fluentd-log-rotation.adoc[leveloffset=+1]
+
+4.2
+modules/efk-logging-fluentd-collector.adoc[leveloffset=+1]
 ////
 
-include::modules/efk-logging-fluentd-collector.adoc[leveloffset=+1]
 
 include::modules/efk-logging-fluentd-log-location.adoc[leveloffset=+1]
 

logging/efk-logging-fluentd.adoc renamed to logging/config/efk-logging-fluentd.adoc

@@ -11,7 +11,7 @@ You can scale Kibana for redundancy and configure the CPU and memory for your Ki
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see _Changing the cluster logging management state_.
 ====
 
 // The following include statements pull in the module files that comprise