Merge pull request #14443 from mburke5678/BZ-1699178

mburke5678 · web-flow · commit 34f786d3c1f5 · 2019-04-17T10:24:56.000-04:00
Delete the managementState explanation in efk-logging-configuring-about
diff --git a/logging/config/efk-logging-management.adoc b/logging/config/efk-logging-management.adoc
@@ -12,6 +12,8 @@ By default, the Cluster Logging and Elasticsearch operators are set to Managed.
 you must set cluster logging to the _unmanaged_ state. In order to modify the components managed by the Elasticsearch Operator,
 you must set Elasticsearch to the _unmanaged_ state.
 
+The {product-title} documentation indictes in a prerequisite step when you need to set the cluster to Unmanaged.
+
 // 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
diff --git a/logging/efk-logging-deploying-about.adoc b/logging/efk-logging-deploying-about.adoc
@@ -7,11 +7,6 @@ toc::[]
 
 Before installing cluster logging into your cluster, review the following sections.
 
-[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
diff --git a/modules/efk-logging-curator-actions.adoc b/modules/efk-logging-curator-actions.adoc
@@ -13,8 +13,6 @@ If you are an advanced Curator user and want to configure other Curator actions,
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-curator-schedule.adoc b/modules/efk-logging-curator-schedule.adoc
@@ -12,8 +12,6 @@ created by the cluster logging installation.
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-deploying-about.adoc b/modules/efk-logging-deploying-about.adoc
@@ -14,11 +14,6 @@ If you want to use the default cluster logging install, you can use the sample C
 
 If you want to customize your deployment, make changes to the sample CR as needed. The following describes the configurations you can make when installing your cluster logging instance or modify after installtion. See the Configuring sections for more information on working with each component, including modifications you can make outside of the Cluster Logging Custom Resource.
 
-[IMPORTANT]
-====
-If you change the default Cluster Logging Custom Resource, you must set your Cluster Logging Custom Resource to `Unmanaged`. In an unmanaged deployment the Cluster Logging Operator does not respond to changes in the CR after installation and does not receive updates until the cluster logging is placed back into a managed state.
-====
-
 [id="efk-logging-deploy-about-config-{context}"]
 == Configuring and Tuning Cluster Logging
 
@@ -28,15 +23,18 @@ in the `openshift-logging` project.
 You can modify any of the following components upon install or after install
 
 Management state::
-Cluster logging is managed by the Cluster Logging Operator. You can place the Cluster Logging Operator into an _unmanaged_ state allowing an administrator to assume full control of individual
-component configurations and upgrades by changing the `managementState` from `Managed` to `Unmanaged`.
+Cluster logging is managed by the Cluster Logging Operator. The operator monitor the Cluster Logging CR and applies changes when they are made.   
+
+The Curator CronJob, the Elasticsearch CR, the Kibana Deployment, and the log collection DaemonSet are managed by Cluster Logging Operator. To modify these files directly rather than in `clusterlogging` instance, you must place the Cluster Logging Operator into an Unmanaged state. Otherwise, the Cluster Logging Operator overwrites the changes automatically. In an unmanaged deployment the Cluster Logging Operator does not overwrite these changes and does not respond to changes in the CR.
 
 ----
   spec:
     managementState: "Managed"
 ----
 
-[NOTE]
+The {product-title} documentation indictes in a prerequisite step when you need to set the cluster to Unmanaged.
+
+[IMPORTANT]
 ==== 
 An unmanaged deployment will not receive updates until the `ClusterLogging` custom resource is placed back into a managed state.
 ====
diff --git a/modules/efk-logging-elasticsearch-add-remove.adoc b/modules/efk-logging-elasticsearch-add-remove.adoc
@@ -18,8 +18,6 @@ The Elasticsearch Operator does not allow more than three Elasticsearch master n
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Elasticsearch Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-elasticsearch-exposing.adoc b/modules/efk-logging-elasticsearch-exposing.adoc
@@ -11,7 +11,7 @@ for external access to Elasticsearch for those tools that want to access its dat
 
 Externally, you can access Elasticsearch by creating a reencrypt route, your {product-title} token and the installed
 Elasticsearch CA certificate. The request must contain three HTTP headers:
-+
+
 ----
 Authorization: Bearer $token
 X-Proxy-Remote-User: $username
diff --git a/modules/efk-logging-elasticsearch-ha.adoc b/modules/efk-logging-elasticsearch-ha.adoc
@@ -25,8 +25,6 @@ implemented your own disk/PVC backup/restore strategy.
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-elasticsearch-limits.adoc b/modules/efk-logging-elasticsearch-limits.adoc
@@ -13,8 +13,6 @@ Operator sets values sufficient for your environment.
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-elasticsearch-persistent-storage-empty.adoc b/modules/efk-logging-elasticsearch-persistent-storage-empty.adoc
@@ -17,8 +17,6 @@ When using emptyDir, you will lose data if Elasticsearch is restarted or redeplo
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-elasticsearch-storage.adoc b/modules/efk-logging-elasticsearch-storage.adoc
@@ -11,8 +11,6 @@ Elasticsearch requires persistent storage.  The faster the storage, the faster t
  
 * Cluster logging and Elasticsearch must be installed.
 
-* Set cluster logging to the unmanaged state.
-
 * If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 +
 ----
diff --git a/modules/efk-logging-fluentd-limits.adoc b/modules/efk-logging-fluentd-limits.adoc
@@ -9,9 +9,7 @@ Each component specification allows for adjustments to both the CPU and memory l
 
 .Prerequisite
 
-* Set cluster logging to the unmanaged state.
-
-* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
+If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 
 ----
 $ oc get ClusterLogging
diff --git a/modules/efk-logging-kibana-scaling.adoc b/modules/efk-logging-kibana-scaling.adoc
@@ -9,16 +9,14 @@ You can scale the Kibana deployment for redundancy.
 
 .Prerequisite
 
-* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
+If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
 
 ----
 $ oc get ClusterLogging
 NAME       AGE
 instance   112m
 ----
 
-* Set cluster logging to the unmanaged state. In managed state, the Cluster Logging Operator reverts changes made to the `logging-curator` configuration map.
-
 .Procedure
 
 Edit the Cluster Logging Custom Resource (CR) in the `openshift-logging` project: 
diff --git a/modules/efk-logging-manual-rollout-rolling.adoc b/modules/efk-logging-manual-rollout-rolling.adoc
@@ -15,8 +15,6 @@ runs requires a reboot.
 
 * Cluster logging and Elasticsearch must be installed.
 
-* Set the Elasticsearch Custom Resource to the unmanaged state.
-
 .Procedure
 
 To perform a rolling cluster restart:
diff --git a/modules/efk-logging-systemd-scaling.adoc b/modules/efk-logging-systemd-scaling.adoc
@@ -15,7 +15,7 @@ For example, if you are missing logs, you might have to increase the rate limits
 . Update to *systemd-219-22.el7.x86_64*.
 
 . Add the following to the *_/etc/systemd/journald.conf_* file:
-
++
 ----
 # Disable rate limiting
 RateLimitInterval=1s
@@ -25,13 +25,13 @@ Compress=no
 MaxRetentionSec=30s
 ----
 
-. Restart the services.
-
+. Restart the services:
++
 ----
 $ systemctl restart systemd-journald.service
 $ systemctl restart rsyslog.service
 ----
-
++
 These settings account for the bursty nature of uploading in bulk.
 
 After removing the rate limit, you might see increased CPU utilization on the

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ If you are an advanced Curator user and want to configure other Curator actions,`
`13`	`13`
`14`	`14`	`* Cluster logging and Elasticsearch must be installed.`
`15`	`15`
`16`		`-* Set cluster logging to the unmanaged state.`
`17`		`-`
`18`	`16`	* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
`19`	`17`	`+`
`20`	`18`	`----`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ created by the cluster logging installation.`
`12`	`12`
`13`	`13`	`* Cluster logging and Elasticsearch must be installed.`
`14`	`14`
`15`		`-* Set cluster logging to the unmanaged state.`
`16`		`-`
`17`	`15`	* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
`18`	`16`	`+`
`19`	`17`	`----`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ The Elasticsearch Operator does not allow more than three Elasticsearch master n`
`18`	`18`
`19`	`19`	`* Cluster logging and Elasticsearch must be installed.`
`20`	`20`
`21`		`-* Set cluster logging to the unmanaged state.`
`22`		`-`
`23`	`21`	* If needed, get the name of the Elasticsearch Custom Resource in the `openshift-logging` project:
`24`	`22`	`+`
`25`	`23`	`----`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ implemented your own disk/PVC backup/restore strategy.`
`25`	`25`
`26`	`26`	`* Cluster logging and Elasticsearch must be installed.`
`27`	`27`
`28`		`-* Set cluster logging to the unmanaged state.`
`29`		`-`
`30`	`28`	* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
`31`	`29`	`+`
`32`	`30`	`----`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@ Operator sets values sufficient for your environment.`
`13`	`13`
`14`	`14`	`* Cluster logging and Elasticsearch must be installed.`
`15`	`15`
`16`		`-* Set cluster logging to the unmanaged state.`
`17`		`-`
`18`	`16`	* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
`19`	`17`	`+`
`20`	`18`	`----`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ When using emptyDir, you will lose data if Elasticsearch is restarted or redeplo`
`17`	`17`
`18`	`18`	`* Cluster logging and Elasticsearch must be installed.`
`19`	`19`
`20`		`-* Set cluster logging to the unmanaged state.`
`21`		`-`
`22`	`20`	* If needed, get the name of the Cluster Logging Custom Resource in the `openshift-logging` project:
`23`	`21`	`+`
`24`	`22`	`----`