Merge pull request #66129 from mburke5678/enterprise-4.14

[enterprise-4.14][OSDOCS-3997] OCP content port to ROSA and OSD: Support

_topic_maps/_topic_map_osd.yml

@@ -56,9 +56,6 @@ Topics:
       File: policy-understand-availability
     - Name: Update life cycle
       File: osd-life-cycle
-- Name: Support for OpenShift Dedicated
-  File: osd-support
-  Distros: openshift-dedicated
 ---
 #Name: Tutorials
 #Dir: cloud_experts_tutorials
@@ -107,6 +104,87 @@ Topics:
 - Name: Deleting an OpenShift Dedicated cluster
   File: osd-deleting-a-cluster
 ---
+Name: Support
+Dir: support
+Distros: openshift-dedicated
+Topics:
+- Name: Support overview
+  File: index
+- Name: Managing your cluster resources
+  File: managing-cluster-resources
+- Name: Getting support
+  File: getting-support
+  Distros: openshift-dedicated
+- Name: Remote health monitoring with connected clusters
+  Dir: remote_health_monitoring
+  Distros: openshift-dedicated
+  Topics:
+  - Name: About remote health monitoring
+    File: about-remote-health-monitoring
+  - Name: Showing data collected by remote health monitoring
+    File: showing-data-collected-by-remote-health-monitoring
+# cannot get resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Opting out of remote health reporting
+#    File: opting-out-of-remote-health-reporting
+# cannot get resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Enabling remote health reporting
+#    File: enabling-remote-health-reporting
+  - Name: Using Insights to identify issues with your cluster
+    File: using-insights-to-identify-issues-with-your-cluster
+  - Name: Using Insights Operator
+    File: using-insights-operator
+# Not supported per Michael McNeill
+# - Name: Using remote health reporting in a restricted network
+#   File: remote-health-reporting-from-restricted-network
+# cannot list resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Importing simple content access entitlements with Insights Operator
+#    File: insights-operator-simple-access
+# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces" 
+# - Name: Gathering data about your cluster
+#   File: gathering-cluster-data
+#   Distros: openshift-dedicated
+- Name: Summarizing cluster specifications
+  File: summarizing-cluster-specifications
+  Distros: openshift-dedicated
+- Name: Troubleshooting
+  Dir: troubleshooting
+  Distros: openshift-dedicated
+  Topics:
+#  - Name: Troubleshooting installations
+#    File: troubleshooting-installations
+  - Name: Verifying node health
+    File: verifying-node-health
+#  cannot create resource "namespaces", cannot patch resource "nodes"
+#  - Name: Troubleshooting CRI-O container runtime issues
+#    File: troubleshooting-crio-issues
+# requires ostree, butane, and other plug-ins
+#  - Name: Troubleshooting operating system issues
+#    File: troubleshooting-operating-system-issues
+#    Distros: openshift-dedicated
+# cannot patch resource "nodes", "nodes/proxy", "namespaces"  
+#  - Name: Troubleshooting network issues
+#    File: troubleshooting-network-issues
+#    Distros: openshift-dedicated
+  - Name: Troubleshooting Operator issues
+    File: troubleshooting-operator-issues
+  - Name: Investigating pod issues
+    File: investigating-pod-issues
+# Hiding from ROSA and OSD until it is decided who should port the Build book
+#  - Name: Troubleshooting the Source-to-Image process
+#    File: troubleshooting-s2i
+  - Name: Troubleshooting storage issues
+    File: troubleshooting-storage-issues
+# Not supported per WINC team
+#  - Name: Troubleshooting Windows container workload issues
+#    File: troubleshooting-windows-container-workload-issues
+  - Name: Investigating monitoring issues
+    File: investigating-monitoring-issues
+  - Name: Diagnosing OpenShift CLI (oc) issues
+    File: diagnosing-oc-issues
+  - Name: OpenShift Dedicated managed resources
+    File: osd-managed-resources
+    Distros: openshift-dedicated
+---
 Name: CLI tools
 Dir: cli_reference
 Distros: openshift-dedicated
@@ -645,24 +723,3 @@ Topics:
   Topics:
   - Name: Serverless overview
     File: about-serverless
----
-Name: Troubleshooting
-Dir: sd_support
-Distros: openshift-dedicated
-Topics:
-- Name: Remote health monitoring with connected clusters
-  Dir: remote_health_monitoring
-  Distros: openshift-dedicated
-  Topics:
-  - Name: About remote health monitoring
-    File: about-remote-health-monitoring
-  - Name: Showing data collected by remote health monitoring
-    File: showing-data-collected-by-remote-health-monitoring
-  - Name: Using Insights to identify issues with your cluster
-    File: using-insights-to-identify-issues-with-your-cluster
-- Name: Summarizing cluster specifications
-  File: osd-summarizing-cluster-specifications
-  Distros: openshift-dedicated
-- Name: OpenShift Dedicated managed resources
-  File: osd-managed-resources
-  Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

@@ -73,8 +73,6 @@ Topics:
   File: rosa-sts-about-iam-resources
 - Name: OpenID Connect Overview
   File: rosa-oidc-overview
-- Name: Support for ROSA
-  File: rosa-getting-support
 # - Name: Training for ROSA
 #   File: rosa-training
 ---
@@ -205,6 +203,99 @@ Topics:
   - Name: Command quick reference for creating clusters and users
     File: rosa-quickstart
 ---
+Name: Support
+Dir: support
+Distros: openshift-rosa
+Topics:
+- Name: Support overview
+  File: index
+- Name: Managing your cluster resources
+  File: managing-cluster-resources
+- Name: Getting support
+  File: getting-support
+  Distros: openshift-rosa
+- Name: Remote health monitoring with connected clusters
+  Dir: remote_health_monitoring
+  Distros: openshift-rosa
+  Topics:
+  - Name: About remote health monitoring
+    File: about-remote-health-monitoring
+  - Name: Showing data collected by remote health monitoring
+    File: showing-data-collected-by-remote-health-monitoring
+# cannot get resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Opting out of remote health reporting
+#    File: opting-out-of-remote-health-reporting
+# cannot get resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Enabling remote health reporting
+#    File: enabling-remote-health-reporting
+  - Name: Using Insights to identify issues with your cluster
+    File: using-insights-to-identify-issues-with-your-cluster
+  - Name: Using Insights Operator
+    File: using-insights-operator
+# Not supported per Michael McNeill
+# - Name: Using remote health reporting in a restricted network
+#   File: remote-health-reporting-from-restricted-network
+# cannot list resource "secrets" in API group "" in the namespace "openshift-config"
+#  - Name: Importing simple content access entitlements with Insights Operator
+#    File: insights-operator-simple-access
+# must-gather not supported for customers, per Dustin Row, cannot create resource "namespaces" 
+# - Name: Gathering data about your cluster
+#   File: gathering-cluster-data
+#   Distros: openshift-rosa
+- Name: Summarizing cluster specifications
+  File: summarizing-cluster-specifications
+  Distros: openshift-rosa
+- Name: Troubleshooting
+  Dir: troubleshooting
+  Distros: openshift-rosa
+  Topics:
+# rosa has own troubleshooting installations
+#  - Name: Troubleshooting installations
+#    File: troubleshooting-installations
+  - Name: Troubleshooting ROSA installations
+    File: rosa-troubleshooting-installations
+  - Name: Verifying node health
+    File: verifying-node-health
+#  cannot create resource "namespaces", cannot patch resource "nodes"
+#  - Name: Troubleshooting CRI-O container runtime issues
+#    File: troubleshooting-crio-issues
+# requires ostree, butane, and other plug-ins
+#  - Name: Troubleshooting operating system issues
+#    File: troubleshooting-operating-system-issues
+#    Distros: openshift-rosa
+# cannot patch resource "nodes", "nodes/proxy", "namespaces"  
+#  - Name: Troubleshooting network issues
+#    File: troubleshooting-network-issues
+#    Distros: openshift-rosa
+  - Name: Troubleshooting Operator issues
+    File: troubleshooting-operator-issues
+  - Name: Investigating pod issues
+    File: investigating-pod-issues
+# Hiding from ROSA and OSD until it is decided who should port the Build book
+#  - Name: Troubleshooting the Source-to-Image process
+#    File: troubleshooting-s2i
+  - Name: Troubleshooting storage issues
+    File: troubleshooting-storage-issues
+# Not supported per WINC team
+#  - Name: Troubleshooting Windows container workload issues
+#    File: troubleshooting-windows-container-workload-issues
+  - Name: Investigating monitoring issues
+    File: investigating-monitoring-issues
+  - Name: Diagnosing OpenShift CLI (oc) issues
+    File: diagnosing-oc-issues
+  - Name: Troubleshooting expired offline access tokens
+    File: rosa-troubleshooting-expired-tokens
+    Distros: openshift-rosa
+  - Name: Troubleshooting IAM roles
+    File: rosa-troubleshooting-iam-resources
+    Distros: openshift-rosa
+  - Name: Troubleshooting cluster deployments
+    File: rosa-troubleshooting-deployments
+    Distros: openshift-rosa
+  - Name: Red Hat OpenShift Service on AWS managed resources
+    File: rosa-managed-resources
+    Distros: openshift-rosa
+---
 Name: CLI tools
 Dir: cli_reference
 Distros: openshift-rosa
@@ -888,27 +979,3 @@ Topics:
   Topics:
   - Name: Serverless overview
     File: about-serverless
----
-Name: Troubleshooting
-Dir: sd_support
-Distros: openshift-rosa
-Topics:
-- Name: Remote health monitoring with connected clusters
-  Dir: remote_health_monitoring
-  Topics:
-  - Name: About remote health monitoring
-    File: about-remote-health-monitoring
-  - Name: Showing data collected by remote health monitoring
-    File: showing-data-collected-by-remote-health-monitoring
-  - Name: Using Insights to identify issues with your cluster
-    File: using-insights-to-identify-issues-with-your-cluster
-- Name: Troubleshooting expired offline access tokens
-  File: rosa-troubleshooting-expired-tokens
-- Name: Troubleshooting installations
-  File: rosa-troubleshooting-installations
-- Name: Troubleshooting IAM roles
-  File: rosa-troubleshooting-iam-resources
-- Name: Troubleshooting cluster deployments
-  File: rosa-troubleshooting-deployments
-- Name: Red Hat OpenShift Service on AWS managed resources
-  File: rosa-managed-resources

authentication/managing-security-context-constraints.adoc

@@ -47,12 +47,4 @@ include::modules/security-context-constraints-command-reference.adoc[leveloffset
 [id="additional-resources_configuring-internal-oauth"]
 == Additional resources
 
-ifndef::openshift-dedicated,openshift-rosa[]
-* xref:../support/getting-support.adoc#getting-support[Getting support]
-endif::[]
-ifdef::openshift-dedicated[]
-* xref:../osd_architecture/osd-support.adoc#osd-getting-support[Getting support]
-endif::[]
-ifdef::openshift-rosa[]
-* xref:../rosa_architecture/rosa-getting-support.adoc#rosa-getting-support[Getting support]
-endif::[]
+* xref:../support/getting-support.adoc#getting-support[Getting support]

modules/about-must-gather.adoc

@@ -44,7 +44,13 @@ $ oc adm must-gather -- /usr/bin/gather_audit_logs
 Audit logs are not collected as part of the default set of information to reduce the size of the files.
 ====
 
-When you run `oc adm must-gather`, a new pod with a random name is created in a new project on the cluster. The data is collected on that pod and saved in a new directory that starts with `must-gather.local`. This directory is created in the current working directory.
+ifndef::openshift-rosa,openshift-dedicated[]
+When you run `oc adm must-gather`, a new pod with a random name is created in a new project on the cluster. The data is collected on that pod and saved in a new directory that starts with `must-gather.local` in the current working directory.
+endif::openshift-rosa,openshift-dedicated[]
+
+ifdef::openshift-rosa,openshift-dedicated[]
+When you run `oc adm must-gather`, the data is collected and saved in a new directory that starts with `must-gather.local` in the current working directory.
+endif::openshift-rosa,openshift-dedicated[]
 
 For example:
 
@@ -65,4 +71,4 @@ For example:
 ----
 $ oc adm must-gather --run-namespace <namespace> \
   --image=registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel9:v{HCOVersion}
-----
+----

modules/accessing-running-pods.adoc

@@ -10,7 +10,12 @@ You can review running pods dynamically by opening a shell inside a pod or by ga
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/cluster-resources.adoc

@@ -6,7 +6,12 @@ You can interact with cluster resources by using the OpenShift CLI (`oc`) tool i
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have access to the web console or you have installed the `oc` CLI tool.
 
 .Procedure

modules/copying-files-pods-and-containers.adoc

@@ -10,7 +10,12 @@ You can copy files to and from a pod to test configuration changes or gather dia
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/disabling-insights-advisor-recommendations.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: PROCEDURE
 [id="disabling-insights-advisor-recommendations_{context}"]

modules/disabling-insights-operator-gather.adoc

@@ -19,7 +19,12 @@ If you enable Technology Preview in your cluster, the Insights Operator runs gat
 
 .Prerequisites
 
-* You are logged in to the {product-title} web console as a user with `cluster-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

modules/displaying-all-insights-advisor-recommendations.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: PROCEDURE
 [id="displaying-all-insights-advisor-recommendations_{context}"]

modules/displaying-potential-issues-with-your-cluster.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: PROCEDURE
 [id="displaying-potential-issues-with-your-cluster_{context}"]

modules/displaying-the-insights-status-in-the-web-console.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: PROCEDURE
 [id="displaying-the-insights-status-in-the-web-console_{context}"]

modules/enabling-insights-advisor-recommendations.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: PROCEDURE
 [id="enabling-insights-advisor-recommendations_{context}"]

modules/gathering-application-diagnostic-data.adoc

@@ -14,7 +14,12 @@ Application failures can occur within running application pods. In these situati
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure
@@ -71,6 +76,8 @@ $ oc exec -it my-app-1-akdlg /bin/bash
 Root privileges are required to run some diagnostic binaries. In these situations you can start a debug pod with root access, based on a problematic pod's `DeploymentConfig` object, by running `oc debug dc/<deployment_configuration> --as-root`. Then, you can run diagnostic binaries as root from within the debug pod.
 ====
 
+// cannot create resource "namespaces" in API group 
+ifndef::openshift-rosa,openshift-dedicated[]
 . If diagnostic binaries are not available within a container, you can run a host's diagnostic binaries within a container's namespace by using `nsenter`. The following example runs `ip ad` within a container's namespace, using the host`s `ip` binary.
 .. Enter into a debug session on the target node. This step instantiates a debug pod called `<node_name>-debug`:
 +
@@ -116,3 +123,4 @@ $ oc debug node/my-cluster-node
 ====
 Running a host's diagnostic binaries within a container's namespace is only possible if you are using a privileged container such as a debug node.
 ====
+endif::openshift-rosa,openshift-dedicated[]

modules/gathering-crio-logs.adoc

@@ -10,7 +10,12 @@ If you experience CRI-O issues, you can obtain CRI-O journald unit logs from a n
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 * You have the fully qualified domain names of the control plane or control plane machines.

modules/gathering-data-specific-features.adoc

@@ -121,12 +121,17 @@ endif::from-main-support-section[]
 
 .Prerequisites
 
-* Access to the cluster as a user with the `cluster-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 ifndef::openshift-dedicated[]
-* The {product-title} CLI (`oc`) installed.
+* The {product-title} CLI (`oc`) is installed.
 endif::openshift-dedicated[]
 ifdef::openshift-dedicated[]
-* The OpenShift CLI (`oc`) installed.
+* The OpenShift CLI (`oc`) is installed.
 endif::openshift-dedicated[]
 
 .Procedure

modules/gathering-operator-logs.adoc

@@ -10,7 +10,12 @@ If you experience Operator issues, you can gather detailed diagnostic informatio
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 * You have the fully qualified domain names of the control plane or control plane machines.

modules/gathering-s2i-diagnostic-data.adoc

@@ -10,7 +10,12 @@ The S2I tool runs a build pod and a deployment pod in sequence. The deployment p
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/images-update-global-pull-secret.adoc

@@ -3,7 +3,6 @@
 // * post_installation_configuration/cluster-tasks.adoc
 // * updating/updating_a_cluster/updating_disconnected_cluster/disconnected-update-osus.adoc
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
-// * sd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 //
 // Not included, but linked to from:
 // * operators/admin/olm-managing-custom-catalogs.adoc

modules/insights-operator-about.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/about-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 :_content-type: CONCEPT
 [id="insights-operator-about_{context}"]

modules/insights-operator-advisor-overview.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: CONCEPT
 [id="insights-operator-advisor-overview_{context}"]

modules/insights-operator-advisor-recommendations.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
-// * sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc
 
 :_content-type: CONCEPT
 [id="insights-operator-advisor-recommendations_{context}"]

modules/insights-operator-configuring-sca.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/insights-operator-simple-access.adoc
-// * sd_support/remote_health_monitoring/insights-operator-simple-access.adoc
 
 
 :_content-type: PROCEDURE
@@ -14,7 +13,12 @@ This procedure describes how to update the import interval to one hour.
 
 .Prerequisites
 
-* You are logged in to the {product-title} web console as `cluster-admin`.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You are logged in to the {product-title} web console as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

modules/insights-operator-disabling-sca.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/insights-operator-simple-access.adoc
-// * sd_support/remote_health_monitoring/insights-operator-simple-access.adoc
 
 
 :_content-type: PROCEDURE

modules/insights-operator-downloading-archive.adoc

@@ -10,7 +10,12 @@ Insights Operator stores gathered data in an archive located in the `openshift-i
 
 .Prerequisites
 
-* Access to the cluster as a user with the `cluster-admin` role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

modules/insights-operator-enable-obfuscation.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
-// * sd_support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
 
 
 

modules/insights-operator-manual-upload.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
-// * sd_support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
 
 
 

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

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
-// * sd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 
 :_content-type: PROCEDURE
 [id="insights-operator-new-pull-secret_{context}"]
@@ -11,7 +10,12 @@ You can modify your existing global cluster pull secret to disable remote health
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

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

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/enabling-remote-health-reporting.adoc
-// * sd_support/remote_health_monitoring/enabling-remote-health-reporting.adoc
 
 :_content-type: PROCEDURE
 [id="insights-operator-new-pull-secret-enable_{context}"]

modules/insights-operator-one-time-gather.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
-// * sd_support/remote_health_monitoring/remote-health-reporting-from-restricted-network.adoc
 
 
 

modules/insights-operator-register-disconnected-cluster.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
-// * sd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 
 
 :_content-type: PROCEDURE

modules/insights-operator-showing-data-collected-from-the-cluster.adoc

@@ -1,8 +1,6 @@
 // Module included in the following assemblies:
 //
-// * rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
 // * support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
 
 :_content-type: PROCEDURE
 [id="insights-operator-showing-data-collected-from-the-cluster_{context}"]

modules/insights-operator-what-information-is-collected.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/about-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 [id="insights-operator-what-information-is-collected_{context}"]
 = Information collected by the Insights Operator

modules/inspecting-pod-and-container-logs.adoc

@@ -10,7 +10,12 @@ You can inspect pod and container logs for warnings and error messages related t
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/investigating-etcd-installation-issues.adoc

@@ -10,7 +10,12 @@ If you experience etcd issues during installation, you can check etcd pod status
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have SSH access to your hosts.
 * You have the fully qualified domain names of the control plane nodes.

modules/investigating-kubelet-api-installation-issues.adoc

@@ -10,7 +10,12 @@ To investigate control plane node kubelet and API server issues during installat
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have SSH access to your hosts.
 * You have the fully qualified domain names of the control plane nodes.

modules/investigating-master-node-installation-issues.adoc

@@ -10,7 +10,12 @@ If you experience control plane node installation issues, determine the control
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have SSH access to your hosts.
 * You have the fully qualified domain names of the bootstrap and control plane nodes.

modules/investigating-worker-node-installation-issues.adoc

@@ -10,7 +10,12 @@ If you experience worker node installation issues, you can review the worker nod
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have SSH access to your hosts.
 * You have the fully qualified domain names of the bootstrap and worker nodes.

modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc

@@ -11,7 +11,12 @@
 
 .Prerequisites
 
-* You have access to the cluster as a user with the `cluster-admin` cluster role.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have enabled and configured monitoring for user-defined workloads.
 * You have created the `user-workload-monitoring-config` `ConfigMap` object.

modules/olm-cs-status-cli.adoc

@@ -18,12 +18,12 @@ You can view the status of an Operator catalog source by using the CLI.
 
 .Prerequisites
 
-ifndef::openshift-dedicated,openshift-rosa[]
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
-endif::openshift-dedicated,openshift-rosa[]
-ifdef::openshift-dedicated,openshift-rosa[]
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `dedicated-admin` role.
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/olm-status-viewing-cli.adoc

@@ -11,12 +11,12 @@ You can view Operator subscription status by using the CLI.
 
 .Prerequisites
 
-ifndef::openshift-dedicated,openshift-rosa[]
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
-endif::openshift-dedicated,openshift-rosa[]
-ifdef::openshift-dedicated,openshift-rosa[]
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `dedicated-admin` role.
-endif::openshift-dedicated,openshift-rosa[]
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/querying-cluster-node-journal-logs.adoc

@@ -11,7 +11,12 @@ You can gather `journald` unit logs and other logs within `/var/log` on individu
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 * You have SSH access to your hosts.

modules/querying-kubelet-status-on-a-node.adoc

@@ -10,7 +10,12 @@ You can review cluster node health status, resource consumption statistics, and
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/querying-operator-pod-status.adoc

@@ -10,7 +10,12 @@ You can list Operator pods within a cluster and their status. You can also colle
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 
@@ -37,6 +42,7 @@ $ oc get pod -n <operator_namespace>
 $ oc describe pod <operator_pod_name> -n <operator_namespace>
 ----
 
+ifndef::openshift-rosa,openshift-dedicated[]
 . If an Operator issue is node-specific, query Operator container status on that node.
 .. Start a debug pod for the node:
 +
@@ -72,3 +78,4 @@ $ oc debug node/my-node
 ----
 +
 .. Exit from the debug shell.
+endif::openshift-rosa,openshift-dedicated[]

modules/querying-operator-status-after-installation.adoc

@@ -10,7 +10,12 @@ You can check Operator status at the end of an installation. Retrieve diagnostic
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/reviewing-node-status-usage-and-configuration.adoc

@@ -10,7 +10,12 @@ Review cluster node health status, resource consumption statistics, and node log
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/reviewing-pod-status.adoc

@@ -10,7 +10,12 @@ You can query pod status and error states. You can also query a pod's associated
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * `skopeo` is installed.
 

modules/rosa-deleting-cluster.adoc

@@ -145,7 +145,7 @@ $ rosa delete operator-roles -c <cluster_id> --mode auto <1>
 endif::sts[]
 
 .Troubleshooting
-* If the cluster cannot be deleted because of missing IAM roles, see xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted].
+* If the cluster cannot be deleted because of missing IAM roles, see xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted].
 * If the cluster cannot be deleted for other reasons:
 ** Check that there are no Add-ons for your cluster pending in the link:https://console.redhat.com/openshift[Hybrid Cloud Console].
 ** Check that all AWS resources and dependencies have been deleted in the Amazon Web Console.

modules/rosa-sts-aws-requirements-creating-association.adoc

@@ -1,6 +1,5 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-iam-resources.adoc
 // * rosa_planning/rosa-sts-ocm-role.adoc
 // * rosa_planning/rosa-sts-aws-prereqs.adoc
 :_content-type: PROCEDURE

modules/rosa-sts-aws-requirements-creating-multi-association.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-iam-resources.adoc
+// * support/rosa-troubleshooting-iam-resources.adoc
 // * rosa_planning/rosa-sts-ocm-role.adoc
 // * rosa_planning/rosa-sts-aws-prereqs.adoc
 :_content-type: PROCEDURE

modules/rosa-sts-ocm-and-user-role-troubleshooting.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-iam-resources.adoc
+// * support/rosa-troubleshooting-iam-resources.adoc
 
 :_content-type: PROCEDURE
 [id="rosa-sts-ocm-roles-and-permissions-troubleshooting_{context}"]

modules/rosa-sts-ocm-role-creation.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //* rosa_architecture/rosa-sts-about-iam-resources.adoc
-// * sd_support/rosa-troubleshooting-iam-resources.adoc
+// * support/rosa-troubleshooting-iam-resources.adoc
 // * rosa_planning/rosa-sts-ocm-role.adoc
 :_content-type: PROCEDURE
 [id="rosa-sts-ocm-roles-and-permissions-iam-basic-role_{context}"]

modules/rosa-sts-user-role-creation.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-iam-resources.adoc
+// * support/rosa-troubleshooting-iam-resources.adoc
 // * rosa_planning/rosa-sts-ocm-role.adoc
 :_content-type: PROCEDURE
 [id="rosa-sts-user-role-iam-basic-role_{context}"]

modules/rosa-troubleshooting-cluster-deletion.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-deployments.adoc
+// * support/rosa-troubleshooting-deployments.adoc
 :_content-type: PROCEDURE
 [id="rosa-troubleshooting-cluster-deletion_{context}"]
 = Repairing a cluster that cannot be deleted

modules/rosa-troubleshooting-elb-service-role.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-deployments.adoc
+// * support/rosa-troubleshooting-deployments.adoc
 :_content-type: PROCEDURE
 [id="rosa-troubleshooting-elb-service-role_{context}"]
 = Creating the Elastic Load Balancing (ELB) service-linked role

modules/rosa-troubleshooting-expired-token.adoc

@@ -1,7 +1,7 @@
 
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-expired-tokens.adoc
+// * support/rosa-troubleshooting-expired-tokens.adoc
 
 
 :_content-type: PROCEDURE

modules/rosa-troubleshooting-general-deployment.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-deployments.adoc
+// * support/rosa-troubleshooting-deployments.adoc
 :_content-type: PROCEDURE
 [id="rosa-troubleshooting-general-deployment-failure_{context}"]
 = Obtaining information on a failed cluster

modules/rosa-troubleshooting-installing.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-installations.adoc
+// * support/rosa-troubleshooting-installations.adoc
 [id="rosa-troubleshooting-installing_{context}"]
 = Installation troubleshooting
 

modules/rosa-troubleshooting-osdccsadmin-deployment.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/rosa-troubleshooting-deployments.adoc
+// * support/rosa-troubleshooting-deployments.adoc
 :_content-type: PROCEDURE
 [id="rosa-troubleshooting-deployment-failure-osdccsadmin_{context}"]
 = Failing to create a cluster with an `osdCcsAdmin` error

modules/security-audit-log-filtering.adoc

@@ -17,7 +17,12 @@ The following procedure provides examples of using `jq` to filter audit logs on
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed `jq`.
 
 .Procedure

modules/starting-debug-pods-with-root-access.adoc

@@ -10,7 +10,12 @@ You can start a debug pod with root access, based on a problematic pod's deploym
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * Your API service is still functional.
 * You have installed the OpenShift CLI (`oc`).
 

modules/summarizing-cluster-specifications-through-clusterversion.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/summarizing-cluster-specifications.adoc
-// * sd_support/osd-summarizing-cluster-specifications.adoc
 
 :_content-type: PROCEDURE
 [id="summarizing-cluster-specifications-through-clusterversion_{context}"]
@@ -11,7 +10,12 @@ You can obtain a summary of {product-title} cluster specifications by querying t
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/support-collecting-host-network-trace.adoc

@@ -30,7 +30,12 @@ However, you can run any command in the container image that is specified in the
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 * You have installed the OpenShift CLI (`oc`).
 

modules/support-collecting-network-trace.adoc

@@ -10,7 +10,12 @@ When investigating potential network-related {product-title} issues, Red Hat Sup
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 * You have a Red Hat standard or premium Subscription.
 * You have a Red Hat Customer Portal account.

modules/support-gather-data.adoc

@@ -10,8 +10,13 @@ You can gather debugging information about your cluster by using the `oc adm mus
 
 .Prerequisites
 
-* Access to the cluster as a user with the `cluster-admin` role.
-* The {product-title} CLI (`oc`) installed.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+* The {product-title} CLI (`oc`) is installed.
 
 .Procedure
 

modules/support-generating-a-sosreport-archive.adoc

@@ -10,7 +10,12 @@ The recommended way to generate a `sosreport` for an {product-title} {product-ve
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have SSH access to your hosts.
 * You have installed the OpenShift CLI (`oc`).
 * You have a Red Hat standard or premium Subscription.

modules/support-get-cluster-id.adoc

@@ -10,8 +10,13 @@ When providing information to Red Hat Support, it is helpful to provide the uniq
 
 .Prerequisites
 
-* Access to the cluster as a user with the `cluster-admin` role.
-* Access to the web console or the OpenShift CLI (`oc`) installed.
+ifndef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+* You have access to the web console or the OpenShift CLI (`oc`) installed.
 
 .Procedure
 ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated[]

modules/support-providing-diagnostic-data-to-red-hat.adoc

@@ -10,7 +10,12 @@ When investigating {product-title} issues, Red Hat Support might ask you to uplo
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have SSH access to your hosts.
 * You have installed the OpenShift CLI (`oc`).
 * You have a Red Hat standard or premium Subscription.

modules/support-submitting-a-case.adoc

@@ -13,8 +13,11 @@
 
 ifndef::openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
-* You have installed the OpenShift CLI (`oc`).
 endif::openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+* You have installed the OpenShift CLI (`oc`).
 ifdef::openshift-dedicated[]
 * You have access to the {cluster-manager-first}.
 endif::openshift-dedicated[]

modules/telemetry-about-telemetry.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/about-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 :_content-type: CONCEPT
 [id="telemetry-about-telemetry_{context}"]

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

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
-// * sd_support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc
 
 [id="telemetry-consequences-of-disabling-telemetry_{context}"]
 = Consequences of disabling remote health reporting

modules/telemetry-showing-data-collected-from-the-cluster.adoc

@@ -1,8 +1,6 @@
 // Module included in the following assemblies:
 //
-// * rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
 // * support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc
 
 :_content-type: PROCEDURE
 [id="showing-data-collected-from-the-cluster_{context}"]
@@ -20,7 +18,12 @@ ifndef::openshift-enterprise,openshift-webscale,openshift-origin[]
 OpenShift Container Platform
 endif::openshift-enterprise,openshift-webscale,openshift-origin[]
 CLI (`oc`).
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role or the `cluster-monitoring-view` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

modules/telemetry-user-telemetry.adoc

@@ -1,6 +1,6 @@
 // Module included in the following assemblies:
 //
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
+// * support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 :_content-type: CONCEPT
 [id="telemetry-user-telemetry_{context}"]

modules/telemetry-what-information-is-collected.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/about-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 :_content-type: REFERENCE
 [id="what-information-is-collected_{context}"]

modules/troubleshooting-disabling-autoreboot-mco-cli.adoc

@@ -15,7 +15,12 @@ See second `NOTE` in xref:../../support/troubleshooting/troubleshooting-operator
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

modules/troubleshooting-disabling-autoreboot-mco-console.adoc

@@ -15,7 +15,12 @@ See second `NOTE` in xref:../../support/troubleshooting/troubleshooting-operator
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 
 .Procedure
 

modules/understanding-telemetry-and-insights-operator-data-flow.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * support/remote_health_monitoring/about-remote-health-monitoring.adoc
-// * sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc
 
 :_content-type: CONCEPT
 [id="understanding-telemetry-and-insights-operator-data-flow_{context}"]

modules/verifying-crio-status.adoc

@@ -10,7 +10,12 @@ You can verify CRI-O container runtime engine status on each cluster node.
 
 .Prerequisites
 
+ifndef::openshift-rosa,openshift-dedicated[]
 * You have access to the cluster as a user with the `cluster-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
+ifdef::openshift-rosa,openshift-dedicated[]
+* You have access to the cluster as a user with the `dedicated-admin` role.
+endif::openshift-rosa,openshift-dedicated[]
 * You have installed the OpenShift CLI (`oc`).
 
 .Procedure

monitoring/troubleshooting-monitoring-issues.adoc

@@ -37,12 +37,4 @@ include::modules/monitoring-determining-why-prometheus-is-consuming-disk-space.a
 .Additional resources
 
 * See xref:../monitoring/configuring-the-monitoring-stack.adoc#setting-scrape-sample-and-label-limits-for-user-defined-projects_configuring-the-monitoring-stack[Setting a scrape sample limit for user-defined projects] for details on how to set a scrape sample limit and create related alerting rules
-ifndef::openshift-dedicated,openshift-rosa[]
 * xref:../support/getting-support.adoc#support-submitting-a-case_getting-support[Submitting a support case]
-endif::openshift-dedicated,openshift-rosa[]
-ifdef::openshift-rosa[]
-* xref:../rosa_architecture/rosa-getting-support.adoc#rosa-getting-support_rosa-getting-support[Submitting a support case]
-endif::openshift-rosa[]
-ifdef::openshift-dedicated[]
-* xref:../osd_architecture/osd-support.adoc#support_osd-getting-support[Submitting a support case]
-endif::openshift-dedicated[]

osd_architecture/osd-support.adoc

@@ -1,23 +0,0 @@
-:_content-type: ASSEMBLY
-[id="osd-getting-support"]
-= Getting support
-include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated[]
-include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::[]
-:context: osd-getting-support
-
-toc::[]
-
-Get support for {product-title}.
-
-include::modules/support.adoc[leveloffset=+1]
-include::modules/support-knowledgebase-about.adoc[leveloffset=+1]
-include::modules/support-knowledgebase-search.adoc[leveloffset=+1]
-include::modules/support-submitting-a-case.adoc[leveloffset=+1]
-
-[id="osd-getting-support-additional-resources"]
-[role="_additional-resources"]
-== Additional resources
-
-* For details about identifying issues with your cluster, see xref:../sd_support/remote_health_monitoring/using-insights-to-identify-issues-with-your-cluster.adoc#using-insights-to-identify-issues-with-your-cluster[Using Insights to identify issues with your cluster].

osd_architecture/osd-understanding.adoc

@@ -13,4 +13,4 @@ include::modules/osd-intro.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* For more information about Telemetry and remote health monitoring for {product-title} clusters, see xref:../sd_support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]
+* For more information about Telemetry and remote health monitoring for {product-title} clusters, see xref:../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring]

rosa_architecture/rosa-getting-support.adoc

@@ -1,10 +0,0 @@
-:_content-type: ASSEMBLY
-[id="rosa-getting-support"]
-= Getting support for {product-title}
-include::_attributes/attributes-openshift-dedicated.adoc[]
-:context: rosa-getting-support
-toc::[]
-
-Get support for {product-title} (ROSA).
-
-include::modules/rosa-getting-support.adoc[leveloffset=+1]

rosa_hcp/rosa-hcp-sts-creating-a-cluster-quickly.adoc

@@ -130,5 +130,5 @@ include::modules/rosa-hcp-sts-creating-a-cluster-cli.adoc[leveloffset=+1]
 * For information about the prerequisites to installing ROSA with STS, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prereqs[AWS prerequisites for ROSA with STS].
 * For details about using the `auto` and `manual` modes to create the required STS resources, see xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-with-customizations.adoc#rosa-understanding-deployment-modes_rosa-sts-creating-a-cluster-with-customizations[Understanding the auto and manual deployment modes].
 * For more information about using OpenID Connect (OIDC) identity providers in AWS IAM, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html[Creating OpenID Connect (OIDC) identity providers] in the AWS documentation.
-* For more information about troubleshooting ROSA cluster installations, see xref:../sd_support/rosa-troubleshooting-installations.adoc#rosa-troubleshooting-installations[Troubleshooting installations].
-* For steps to contact Red Hat Support for assistance, see xref:../rosa_architecture/rosa-getting-support.adoc#rosa-getting-support[Getting support for Red Hat OpenShift Service on AWS].
+* For more information about troubleshooting ROSA cluster installations, see xref:../support/troubleshooting/rosa-troubleshooting-installations.adoc#rosa-troubleshooting-installations[Troubleshooting installations].
+* For steps to contact Red Hat Support for assistance, see xref:../support/getting-support.adoc#getting-support[Getting support for Red Hat OpenShift Service on AWS].

rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-quickly.adoc

@@ -60,5 +60,5 @@ include::modules/rosa-sts-creating-a-cluster-quickly-cli.adoc[leveloffset=+1]
 * For information about the prerequisites to installing ROSA with STS, see xref:../rosa_planning/rosa-sts-aws-prereqs.adoc#rosa-sts-aws-prereqs[AWS prerequisites for ROSA with STS].
 * For details about using the `auto` and `manual` modes to create the required STS resources, see xref:../rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-with-customizations.adoc#rosa-understanding-deployment-modes_rosa-sts-creating-a-cluster-with-customizations[Understanding the auto and manual deployment modes].
 * For more information about using OpenID Connect (OIDC) identity providers in AWS IAM, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html[Creating OpenID Connect (OIDC) identity providers] in the AWS documentation.
-* For more information about troubleshooting ROSA cluster installations, see xref:../sd_support/rosa-troubleshooting-installations.adoc#rosa-troubleshooting-installations[Troubleshooting installations].
-* For steps to contact Red Hat Support for assistance, see xref:../rosa_architecture/rosa-getting-support.adoc#rosa-getting-support[Getting support for Red Hat OpenShift Service on AWS].
+* For more information about troubleshooting ROSA cluster installations, see xref:../support/troubleshooting/rosa-troubleshooting-installations.adoc#rosa-troubleshooting-installations[Troubleshooting installations].
+* For steps to contact Red Hat Support for assistance, see xref:../support/getting-support.adoc#getting-support[Getting support for Red Hat OpenShift Service on AWS].

rosa_install_access_delete_clusters/rosa-sts-creating-a-cluster-with-customizations.adoc

@@ -63,5 +63,5 @@ include::modules/rosa-sts-creating-a-cluster-with-customizations-cli.adoc[levelo
 * For more information about using OpenID Connect (OIDC) identity providers in AWS IAM, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_oidc.html[Creating OpenID Connect (OIDC) identity providers] in the AWS documentation.
 * For more information about etcd encryption, see the xref:../rosa_architecture/rosa_policy_service_definition/rosa-service-definition.adoc#rosa-sdpolicy-etcd-encryption_rosa-service-definition[etcd encryption service definition].
 * For information about configuring a proxy with ROSA, see xref:../networking/configuring-cluster-wide-proxy.adoc#configuring-a-cluster-wide-proxy[Configuring a cluster-wide proxy].
-* For more information about troubleshooting ROSA cluster installations, see xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deployments[Troubleshooting cluster deployments].
-* For steps to contact Red Hat Support for assistance, see xref:../rosa_architecture/rosa-getting-support.adoc#rosa-getting-support[Getting support for Red Hat OpenShift Service on AWS].
+* For more information about troubleshooting ROSA cluster installations, see xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deployments[Troubleshooting cluster deployments].
+* For steps to contact Red Hat Support for assistance, see xref:../support/getting-support.adoc#getting-support[Getting support for Red Hat OpenShift Service on AWS].

rosa_install_access_delete_clusters/rosa-sts-deleting-cluster.adoc

@@ -35,4 +35,4 @@ include::modules/rosa-unlinking-and-deleting-ocm-and-user-iam-roles.adoc[levelof
 == Additional resources
 
 * For information about the AWS IAM resources for ROSA clusters that use STS, see xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-about-iam-resources[About IAM resources for ROSA clusters that use STS].
-* For information on cluster errors that are due to missing IAM roles, see xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted].
+* For information on cluster errors that are due to missing IAM roles, see xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted].

rosa_planning/rosa-hcp-prereqs.adoc

@@ -25,7 +25,7 @@ include::modules/rosa-sts-aws-requirements-account.adoc[leveloffset=+2]
 [id="additional-resources_aws-account-requirements_{context}"]
 .Additional resources
 * xref:../rosa_planning/rosa-limits-scalability.adoc#rosa-limits-scalability[Limits and scalability]
-* xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-elb-service-role_rosa-troubleshooting-cluster-deployments[Creating the Elastic Load Balancing (ELB) service-linked role]
+* xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-elb-service-role_rosa-troubleshooting-cluster-deployments[Creating the Elastic Load Balancing (ELB) service-linked role]
 
 include::modules/rosa-sts-aws-requirements-access-req.adoc[leveloffset=+2]
 

rosa_planning/rosa-sts-aws-prereqs.adoc

@@ -27,7 +27,7 @@ include::modules/rosa-sts-aws-requirements-account.adoc[leveloffset=+2]
 [id="additional-resources_aws-account-requirements_{context}"]
 .Additional resources
 * xref:../rosa_planning/rosa-limits-scalability.adoc#rosa-limits-scalability[Limits and scalability]
-* xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-elb-service-role_rosa-troubleshooting-cluster-deployments[Creating the Elastic Load Balancing (ELB) service-linked role]
+* xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-elb-service-role_rosa-troubleshooting-cluster-deployments[Creating the Elastic Load Balancing (ELB) service-linked role]
 
 include::modules/rosa-sts-aws-requirements-access-req.adoc[leveloffset=+2]
 

rosa_planning/rosa-sts-ocm-role.adoc

@@ -54,7 +54,7 @@ include::modules/rosa-sts-user-role-creation.adoc[leveloffset=+2]
 
 [IMPORTANT]
 ====
-If you unlink or delete your `user-role` IAM role prior to deleting your cluster, an error prevents you from deleting your cluster. You must create or relink this role to proceed with the deletion process. See xref:../sd_support/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted] for more information.
+If you unlink or delete your `user-role` IAM role prior to deleting your cluster, an error prevents you from deleting your cluster. You must create or relink this role to proceed with the deletion process. See xref:../support/troubleshooting/rosa-troubleshooting-deployments.adoc#rosa-troubleshooting-cluster-deletion_rosa-troubleshooting-cluster-deployments[Repairing a cluster that cannot be deleted] for more information.
 ====
 
 include::modules/rosa-sts-aws-requirements-association-concept.adoc[leveloffset=+1]
@@ -63,5 +63,5 @@ include::modules/rosa-sts-aws-requirements-creating-multi-association.adoc[level
 
 [role="_additional-resources"]
 == Additional resources
-* See xref:../sd_support/rosa-troubleshooting-iam-resources.adoc#rosa-sts-ocm-roles-and-permissions-troubleshooting[Troubleshooting IAM roles]
+* See xref:../support/troubleshooting/rosa-troubleshooting-iam-resources.adoc#rosa-sts-ocm-roles-and-permissions-troubleshooting[Troubleshooting IAM roles]
 * See xref:../rosa_architecture/rosa-sts-about-iam-resources.adoc#rosa-sts-account-wide-roles-and-policies[Account-wide IAM role and policy reference] for a list of IAM roles needed for cluster creation.

rosa_support/_attributes

@@ -1 +0,0 @@
-../_attributes/

rosa_support/images

@@ -1 +0,0 @@
-../images

rosa_support/modules

@@ -1 +0,0 @@
-../modules

rosa_support/remote_health_monitoring/_attributes

@@ -1 +0,0 @@
-../../_attributes/

rosa_support/remote_health_monitoring/images

@@ -1 +0,0 @@
-../../images/

rosa_support/remote_health_monitoring/modules

@@ -1 +0,0 @@
-../../modules/

rosa_support/remote_health_monitoring/showing-data-collected-by-remote-health-monitoring.adoc

@@ -1,16 +0,0 @@
-:_content-type: ASSEMBLY
-[id="showing-data-collected-by-remote-health-monitoring"]
-= Showing data collected by remote health monitoring
-include::_attributes/common-attributes.adoc[]
-ifdef::openshift-dedicated[]
-include::_attributes/attributes-openshift-dedicated.adoc[]
-endif::[]
-:context: showing-data-collected-by-remote-health-monitoring
-
-toc::[]
-
-As an administrator, you can review the metrics collected by Telemetry and the Insights Operator.
-
-include::modules/telemetry-showing-data-collected-from-the-cluster.adoc[leveloffset=+1]
-
-include::modules/insights-operator-showing-data-collected-from-the-cluster.adoc[leveloffset=+1]

rosa_support/remote_health_monitoring/snippets

@@ -1 +0,0 @@
-../../snippets/

rosa_support/snippets

@@ -1 +0,0 @@
-../snippets

sd_support/_attributes

@@ -1 +0,0 @@
-../_attributes/

sd_support/images

@@ -1 +0,0 @@
-../images