OCPBUGS-60988: Added update secret step to insights-operator-new-pull-secret

Author: dfitzmau

_topic_maps/_topic_map.yml

@@ -821,8 +821,8 @@ Topics:
     File: about-remote-health-monitoring
   - Name: Showing data collected by remote health monitoring
     File: showing-data-collected-by-remote-health-monitoring
-  - Name: Opting out of remote health reporting
-    File: opting-out-of-remote-health-reporting
+  - Name: Remote health reporting
+    File: remote-health-reporting
   - Name: Enabling remote health reporting
     File: enabling-remote-health-reporting
   - Name: Using Insights to identify issues with your cluster

modules/enabling-remote-health-reporting.adoc

@@ -0,0 +1,13 @@
+:_mod-docs-content-type: CONCEPT
+[id="enabling-remote-health-reporting"]
+= Enabling remote health reporting
+
+If you or your organization have disabled remote health reporting, you can enable this feature again. You can see that remote health reporting is disabled from the message "Insights not available" in the *Status* tile on the {product-title} web console *Overview* page.
+
+To enable remote health reporting, you must change the global cluster pull secret with a new authorization token.
+
+[NOTE]
+====
+Enabling remote health reporting enables both Insights Operator and Telemetry.
+====
+

modules/insights-operator-new-pull-secret-disabled.adoc

@@ -4,9 +4,9 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="insights-operator-new-pull-secret_{context}"]
-= Modifying the global cluster pull secret to disable remote health reporting
+= Changing the global cluster pull secret to disable remote health reporting
 
-You can modify your existing global cluster pull secret to disable remote health reporting. This disables both Telemetry and the Insights Operator.
+You can change your existing global cluster pull secret to disable remote health reporting. This configuration disables both Telemetry and the Insights Operator.
 
 .Prerequisites
 
@@ -19,16 +19,14 @@ endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 
-. Download the global cluster pull secret to your local file system.
+. Download the global cluster pull secret to your local file system:
 +
 [source,terminal]
 ----
 $ oc extract secret/pull-secret -n openshift-config --to=.
 ----
 
-. In a text editor, edit the `.dockerconfigjson` file that was downloaded.
-
-. Remove the `cloud.openshift.com` JSON entry, for example:
+. In a text editor, edit the `.dockerconfigjson` file that you downloaded by removing the `cloud.openshift.com` JSON entry:
 +
 [source,json]
 ----
@@ -37,4 +35,13 @@ $ oc extract secret/pull-secret -n openshift-config --to=.
 
 . Save the file.
 
-You can now update your cluster to use this modified pull secret.
+. Update the secret in your cluster by running the following command:
++
+[source,terminal]
+----
+$ oc set data secret/pull-secret -n openshift-config \
+  --from-file=.dockerconfigjson=pull-secret
+----
++
+You might need to wait several minutes for the secret to update in your cluster. 
+

modules/insights-operator-new-pull-secret-enable.adoc

@@ -4,9 +4,9 @@
 
 :_mod-docs-content-type: PROCEDURE
 [id="insights-operator-new-pull-secret-enable_{context}"]
-= Modifying your global cluster pull secret to enable remote health reporting
+= Changing your global cluster pull secret to enable remote health reporting
 
-You can modify your existing global cluster pull secret to enable remote health reporting. If you have previously disabled remote health monitoring, you must first download a new pull secret with your `console.openshift.com` access token from {cluster-manager-first}.
+You can change your existing global cluster pull secret to enable remote health reporting. If you have disabled remote health monitoring, you must first download a new pull secret with your `console.openshift.com` access token from {cluster-manager-first}.
 
 .Prerequisites
 
@@ -16,6 +16,7 @@ You can modify your existing global cluster pull secret to enable remote health
 .Procedure
 
 . Navigate to link:https://console.redhat.com/openshift/downloads[https://console.redhat.com/openshift/downloads].
+
 . From *Tokens* -> *Pull Secret*, click *Download*.
 +
 The file `pull-secret.txt` containing your `cloud.openshift.com` access token in JSON format downloads:
@@ -40,26 +41,32 @@ $ oc get secret/pull-secret -n openshift-config \
   --template='{{index .data ".dockerconfigjson" | base64decode}}' \
   > pull-secret
 ----
+
 . Make a backup copy of your pull secret.
 +
 [source,terminal]
 ----
 $ cp pull-secret pull-secret-backup
 ----
+
 . Open the `pull-secret` file in a text editor.
+
 . Append the `cloud.openshift.com` JSON entry from `pull-secret.txt` into `auths`.
+
 . Save the file.
-. Update the secret in your cluster.
+
+. Update the secret in your cluster by running the following command:
 +
 [source,terminal]
 ----
 $ oc set data secret/pull-secret -n openshift-config \
   --from-file=.dockerconfigjson=pull-secret
 ----
-
-It may take several minutes for the secret to update and your cluster to begin reporting.
++
+You might need to wait several minutes for the secret to update and your cluster to begin reporting.
 
 .Verification
 
 . Navigate to the {product-title} Web Console Overview page.
+
 . *Insights* in the *Status* tile reports the number of issues found.

modules/telemetry-consequences-of-disabling-telemetry.adoc

@@ -2,6 +2,7 @@
 //
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 
+:_mod-docs-content-type: CONCEPT
 [id="telemetry-consequences-of-disabling-telemetry_{context}"]
 = Consequences of disabling remote health reporting
 

support/remote_health_monitoring/enabling-remote-health-reporting.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="opting-out-remote-health-reporting"]
-= Opting out of remote health reporting
+[id="remote-health-reporting"]
+= Remote health reporting
 include::_attributes/common-attributes.adoc[]
 ifdef::openshift-dedicated[]
 include::_attributes/attributes-openshift-dedicated.adoc[]
@@ -10,29 +10,33 @@ endif::[]
 toc::[]
 
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
-You may choose to opt out of reporting health and usage data for your cluster.
-endif::[]
-
-// moved OSD note on not able to opt out to about telemetery
-
-ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
+You can opt in or opt out of reporting health and usage data for your cluster.
 
-To opt out of remote health reporting, you must:
+// Enabling remote health reporting
+include::modules/enabling-remote-health-reporting.adoc[leveloffset=+1]
 
-. xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#insights-operator-new-pull-secret_opting-out-remote-health-reporting[Modify the global cluster pull secret] to disable remote health reporting.
-. xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#images-update-global-pull-secret_opting-out-remote-health-reporting[Update the cluster] to use this modified pull secret.
+// Changing your global cluster pull secret to enable remote health reporting
+include::modules/insights-operator-new-pull-secret-enable.adoc[leveloffset=+1]
 
+// Consequences of disabling remote health reporting
 include::modules/telemetry-consequences-of-disabling-telemetry.adoc[leveloffset=+1]
 
+// Changing the global cluster pull secret to disable remote health reporting
 include::modules/insights-operator-new-pull-secret-disabled.adoc[leveloffset=+1]
 
+[role="_additional-resources"]
+.Additional resources
+* xref:../../support/remote-health-monitoring-with-connected-clusters.adoc#images-update-global-pull-secret_opting-out-remote-health-reporting[Changing your global cluster pull secret to enable remote health reporting]
+
+// Registering your disconnected cluster
 include::modules/insights-operator-register-disconnected-cluster.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
 * xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#telemetry-consequences-of-disabling-telemetry_opting-out-remote-health-reporting[Consequences of disabling remote health reporting]
 * link:https://access.redhat.com/documentation/en-us/subscription_central/2023/html/getting_started_with_the_subscriptions_service/con-how-does-subscriptionwatch-show-data_assembly-viewing-understanding-subscriptionwatch-data-ctxt[How does the subscriptions service show my subscription data?](Getting Started with the Subscription Service)
 
+// Updating the global cluster pull secret
 include::modules/images-update-global-pull-secret.adoc[leveloffset=+1]
 
 endif::[]