Merge pull request #14078 from mburke5678/logging-team-edits-2

Edits to Logging 4.0 topics per team review 2

Author: mburke5678

_topic_map.yml

@@ -460,6 +460,8 @@ Topics:
   File: efk-logging
 - 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
@@ -472,7 +474,7 @@ Topics:
   File: efk-logging-fluentd
 - Name: Deploying and Configuring the Event Router
   File: efk-logging-eventrouter
-- Name: Configuring systemd-journald and rsyslog
+- Name: Configuring systemd-journald
   File: efk-logging-systemd
 - Name: Sending logs to external devices
   File: efk-logging-external

logging/efk-logging-configuring.adoc

@@ -20,29 +20,45 @@ and includes all the components of the logging stack to collect, store and visua
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogging
 metadata:
-  name: "instance"
+  creationTimestamp: '2019-03-20T18:07:02Z'
+  generation: 1
+  name: instance
+  namespace: openshift-logging
 spec:
-  managementState: "Managed"
+  collection:
+    logs:
+      fluentd:
+        resources: null
+      rsyslog:
+        resources: null
+      type: fluentd
+  curation:
+    curator:
+      resources: null
+      schedule: 30 3 * * *
+    type: curator
   logStore:
-    type: "elasticsearch"
     elasticsearch:
       nodeCount: 3
+      redundancyPolicy: SingleRedundancy
+      resources:
+        limits:
+          cpu: 
+          memory: 
+        requests:
+          cpu: 
+          memory: 
       storage: {}
-      redundancyPolicy: "SingleRedundancy"
+    type: elasticsearch
+  managementState: Managed
   visualization:
-    type: "kibana"
     kibana:
+      proxy:
+        resources: null
       replicas: 1
-  curation:
-    type: "curator"
-    curator:
-      schedule: "30 3 * * *"
-  collection:
-    logs:
-      type: "fluentd"
-      fluentd: {}
+      resources: null
+    type: kibana
 ----
-
 You can configure the following for cluster logging:
 
 * You can place cluster logging into an unmanaged state that allows an administrator to assume full control of individual
@@ -68,8 +84,6 @@ The Rsyslog log collector is currently a Technology Preview feature.
 // modules required to cover the user story. You can also include other
 // assemblies.
 
-include::modules/efk-logging-management-state-changing.adoc[leveloffset=+1]
-
 include::modules/efk-logging-configuring-image-about.adoc[leveloffset=+1]
 
 include::modules/efk-logging-configuring-node-selector.adoc[leveloffset=+1]

logging/efk-logging-curator.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-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise
@@ -123,4 +123,3 @@ include::modules/efk-logging-curator-delete-index.adoc[leveloffset=+1]
 include::modules/efk-logging-curator-actions.adoc[leveloffset=+1]
 
 include::modules/efk-logging-curator-cron.adoc[leveloffset=+1]
-

logging/efk-logging-deploy.adoc

@@ -28,6 +28,8 @@ include::modules/efk-logging-deploy-storage-considerations.adoc[leveloffset=+1]
 
 == Additional resources
 
-For more information on installing operators,see xref:../applications/operators/olm-adding-operators-to-cluster.html#olm-installing-operators-from-operatorhub-olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub].
+For more information on installing operators, see xref:../applications/operators/olm-adding-operators-to-cluster.html#olm-installing-operators-from-operatorhub-olm-adding-operators-to-a-cluster[Installing Operators from the OperatorHub].
+
+For more information about storage, see xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Understanding persistent storage].
 
 For information on scaling your Elasticsearch cluster, see xref:../logging/efk-logging-elasticsearch.adoc#efk-logging-elasticsearch-add-remove-efk-logging-elasticsearch[Scaling your Elasticsearch cluster].

logging/efk-logging-elasticsearch-storage.adoc

@@ -39,7 +39,7 @@ metadata:
 
 [NOTE]
 ====
-Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-elasticsearch.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-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-external.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-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-fluentd.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-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise
@@ -29,10 +29,10 @@ include::modules/efk-logging-fluentd-limits.adoc[leveloffset=+1]
 
 ////
 4.1
-::modules/efk-logging-fluentd-collector.adoc[leveloffset=+1]
+modules/efk-logging-fluentd-log-rotation.adoc[leveloffset=+1]
 ////
 
-include::modules/efk-logging-fluentd-log-rotation.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-kibana.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-configuring.html#efk-logging-elasticsearch-management-state-changing-efk-logging-configuring[Changing the cluster logging management state].
+Procedures in this topic require your cluster to be in an unmanaged state. For more information, see xref:../logging/efk-logging-management.adoc#efk-logging-management[Changing the cluster logging management state].
 ====
 
 // The following include statements pull in the module files that comprise

logging/efk-logging-management.adoc

@@ -0,0 +1,23 @@
+:context: efk-logging-curator
+[id='efk-logging-management']
+= Changing cluster logging management state
+include::modules/common-attributes.adoc[]
+
+toc::[]
+
+
+The Cluster Logging Operator and Elasticsearch Operator can be in a _Managed_ or _Unmanaged_ state.
+
+By default, the Cluster Logging and Elasticsearch operators are set to Managed. However, in order to modify the components managed by the Cluster Logging Operator,
+you need to set cluster logging to the _unmanaged_ state. In order to modify the components managed by the Elasticsearch Operator,
+you need to set Elasticsearch to the _unmanaged_ 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-management-state-changing.adoc[leveloffset=+1]
+
+include::modules/efk-logging-management-state-changing-es.adoc[leveloffset=+1]
+