Merge pull request #61310 from dfitzmau/OSDOCS-6435

OSDOCS-6435: Updated Gathering data about specific features module

Author: jab-rh

modules/gathering-data-specific-features.adoc

@@ -25,25 +25,25 @@ ifndef::openshift-origin[]
 |===
 |Image |Purpose
 
-|`registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel9:v{HCOVersion}`
+|`registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel9:v<installed_version_virt>`
 |Data collection for {VirtProductName}.
 
 |`registry.redhat.io/openshift-serverless-1/svls-must-gather-rhel8`
 |Data collection for OpenShift Serverless.
 
-|`registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8:2.3`
+|`registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8:v<installed_version_service_mesh>`
 |Data collection for Red Hat OpenShift Service Mesh.
 
 ifndef::openshift-dedicated[]
-|`registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v{mtc-version}`
+|`registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v<installed_version_migration_toolkit>`
 |Data collection for the {mtc-full}.
 endif::openshift-dedicated[]
 ifdef::openshift-dedicated[]
 |`registry.redhat.io/rhcam-1-2/openshift-migration-must-gather-rhel8`
 |Data collection for migration-related information.
 endif::openshift-dedicated[]
 
-|`registry.redhat.io/odf4/ocs-must-gather-rhel8:v4.9`
+|`registry.redhat.io/odf4/ocs-must-gather-rhel8:v<installed_version_ODF>`
 |Data collection for {rh-storage-first}.
 
 |`registry.redhat.io/openshift-logging/cluster-logging-rhel8-operator`
@@ -57,7 +57,7 @@ ifndef::openshift-dedicated[]
 |Data collection for Local Storage Operator.
 endif::openshift-dedicated[]
 
-|`registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:{sandboxed-containers-version}.0`
+|`registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:v<installed_version_sandboxed_containers>`
 |Data collection for {sandboxed-containers-first}.
 
 |`registry.redhat.io/workload-availability/self-node-remediation-must-gather-rhel8:v<installed-version-SNR>`
@@ -66,10 +66,14 @@ endif::openshift-dedicated[]
 |`registry.redhat.io/workload-availability/node-maintenance-must-gather-rhel8:v<installed-version-NMO>`
 |Data collection for the Node Maintenance Operator (NMO).
 
-|`registry.redhat.io/openshift-gitops-1/gitops-must-gather-rhel8:v1.9.0`
+|`registry.redhat.io/openshift-gitops-1/gitops-must-gather-rhel8:v<installed_version_GitOps>`
 |Data collection for {gitops-title}.
 |===
 
+[NOTE]
+====
+To determine the latest version for an {product-title} component's image, see the link:https://access.redhat.com/support/policy/updates/openshift[Red Hat {product-title} Life Cycle Policy] web page on the Red Hat Customer Portal.
+====
 
 endif::openshift-origin[]
 
@@ -107,16 +111,8 @@ endif::openshift-dedicated[]
 
 endif::openshift-origin[]
 
-
 endif::from-main-support-section[]
 
-[NOTE]
-====
-* To collect the default `must-gather` data in addition to specific feature data, add the `--image-stream=openshift/must-gather` argument.
-
-* For information on gathering data about the Custom Metrics Autoscaler, see the Additional resources section that follows.
-====
-
 .Prerequisites
 
 * Access to the cluster as a user with the `cluster-admin` role.
@@ -133,7 +129,16 @@ endif::openshift-dedicated[]
 
 ifndef::openshift-origin[]
 
-. Run the `oc adm must-gather` command with one or more `--image` or `--image-stream` arguments. For example, the following command gathers both the default cluster data and information specific to {VirtProductName}:
+. Run the `oc adm must-gather` command with one or more `--image` or `--image-stream` arguments.
++
+[NOTE]
+====
+* To collect the default `must-gather` data in addition to specific feature data, add the `--image-stream=openshift/must-gather` argument.
+
+* For information on gathering data about the Custom Metrics Autoscaler, see the Additional resources section that follows.
+====
++
+For example, the following command gathers both the default cluster data and information specific to {VirtProductName}:
 +
 [source,terminal,subs="attributes+"]
 ----

support/gathering-cluster-data.adoc

@@ -38,6 +38,8 @@ include::modules/gathering-data-specific-features.adoc[leveloffset=+2]
 
 * xref:../nodes/cma/nodes-cma-autoscaling-custom.adoc#nodes-cma-autoscaling-custom-gather[Gathering debugging data] for the Custom Metrics Autoscaler.
 
+* link:https://access.redhat.com/support/policy/updates/openshift[Red Hat {product-title} Life Cycle Policy]
+
 // Gathering audit logs
 include::modules/gathering-data-audit-logs.adoc[leveloffset=+2]