Follow-up for PR openshift#2122

- Use table for post-reboot "next step".
- Simplify "Upgrading Cluster Metrics" (automatic).
- Simplify "Upgrading Cluster Metrics" (manual).

Author: tnguyen-rh

install_config/upgrading/automated_upgrades.adoc

@@ -211,12 +211,20 @@ used, if needed.
 ----
 
 When the upgrade finishes, a recommendation will be printed to reboot all hosts.
-After rebooting, if you have aggregated logging enable you will need to follow steps outlined in the
-link:#automated-upgrading-efk-logging-stack[Upgrading the EFK Logging Stack] section,
-if you have cluster metrics enabled you will need to follow the setps outlined in the
-link:#automated-upgrading-cluster-metrics[Upgrading Cluster Metrics] section,
- otherwise proceed to
-link:#verifying-the-upgrade[Verifying the Upgrade].
+After rebooting, if there are no features enabled, you can
+link:#verifying-the-upgrade[verify the upgrade].
+Otherwise, the next step depends on what features are enabled.
+
+[cols="1,4"]
+|===
+| Feature | Next Step
+
+| Aggregated Logging
+| link:#automated-upgrading-efk-logging-stack[Upgrade the EFK logging stack.]
+
+| Cluster Metrics
+| link:#automated-upgrading-cluster-metrics[Upgrade cluster metrics.]
+|===
 
 [[upgrading-to-openshift-enterprise-3-2-asynchronous-releases]]
 === Upgrading to OpenShift Enterprise 3.2 Asynchronous Releases
@@ -244,12 +252,11 @@ Upgrades].
 [[automated-upgrading-cluster-metrics]]
 == Upgrading Cluster Metrics
 
-If you have previously link:../../install_config/cluster_metrics.html[deployed
-cluster metrics] you will need to update to the latest metric components, the steps must
-be performed manually as shown in
-link:../../install_config/upgrading/manual_upgrades.html#manual-upgrading-cluster-metrics[Manual
-Upgrades].
-
+If you have previously
+link:../../install_config/cluster_metrics.html[deployed cluster metrics],
+you must manually
+link:../../install_config/upgrading/manual_upgrades.html#manual-upgrading-cluster-metrics[update]
+to the latest metric components.
 
 [[verifying-the-upgrade]]
 == Verifying the Upgrade

install_config/upgrading/manual_upgrades.adoc

@@ -920,53 +920,46 @@ Elasticsearch while running this and it will not perform an install.
 [[manual-upgrading-cluster-metrics]]
 == Upgrading Cluster Metrics
 
-Use the following to upgrade an
-link:../../install_config/cluster_metrics.html[already-deployed Cluster Metrics install].
+After upgrading an
+link:../../install_config/cluster_metrics.html[already-deployed Cluster Metrics install],
+you must update to a newer version of the metrics components.
+
+- The update process stops all the metrics containers,
+updates the metrics configuration files,
+and redeploys the newer components.
 
-To update to a newer version of the metrics components you will need to use the `refresh`
-mode of the deployer. This will stop all the metrics containers, update the metrics configuration
-files and redeploy the newer components. The `refresh` option will not change the metrics route or
-delete the metrics persistent volume claim.
+- It does not change the metrics route.
 
-Metrics stored to persistent volumes will still contain the persisted data when the updated
-metrics are brought back online.
+- It does not delete the metrics persistent volume claim.
+Metrics stored to persistent volumes before the update
+are available after the update completes.
 
 [IMPORTANT]
 ====
-All non-persisted metric values will be lost during the metric `refresh`.
-
-All local changes to the metrics configurations will be overwritten with new configurations meant for the latest install.
-This includes things like number of instances in a replica set.
+The update deletes all non-persisted metric values
+and overwrites local changes to the metrics configurations.
+For example, the number of instances in a replica set is not saved.
 ====
 
-To perform the update you will need to follow the
-link:../../install_config/cluster_metrics.html#deploying-the-metrics-components[same steps]
-as when the metrics components were first deployed except this time you will need to specify the
-`MODE=refresh` option.
-
-You will also need to make sure you are using the correct template for your installation. Please see the following
-link:../../install_config/cluster_metrics.html#modifying-the-deployer-template[section] for the location of this template.
+To update, follow the same steps as when the metrics components were
+link:../../install_config/cluster_metrics.html#deploying-the-metrics-components[first deployed],
+using the
+link:../../install_config/cluster_metrics.html#modifying-the-deployer-template[correct template],
+except this time, specify the `MODE=refresh` option:
 
-For instance, if before you deployed metrics using:
-
-----
-$ oc new-app -f metrics-deployer.yaml \
-    -p HAWKULAR_METRICS_HOSTNAME=hawkular-metrics.example.com
-----
-
-You will now need to run:
+====
 ----
 $ oc new-app -f metrics-deployer.yaml \
-    -p HAWKULAR_METRICS_HOSTNAME=hawkular-metrics.example.com,MODE=redeploy
+    -p HAWKULAR_METRICS_HOSTNAME=hm.example.com,MODE=refresh <1>
 ----
-
-After this the metrics components should have been restarted and are now using the most recent versions.
-
+<1> In the original deployment command, there was no `MODE=refresh`.
+====
 
 [NOTE]
 ====
-It is normal to see a gap in the graphs during the time when the `refresh` is occuring. This is due to the
-metrics components not running and being available to gather metrics during this time.
+During the update, the metrics components do not run.
+Because of this, they cannot collect data
+and a gap normally appears in the graphs.
 ====
 
 [[additional-instructions-per-release]]