From 43f11c2e45c944459d59cbd7896aa3cef5c8df9c Mon Sep 17 00:00:00 2001 From: michaelryanmcneill Date: Wed, 1 May 2024 00:32:14 -0400 Subject: [PATCH] OSDOCS-10406: updating and re-enabling the gather data support page --- _topic_maps/_topic_map_osd.yml | 7 ++--- _topic_maps/_topic_map_rosa.yml | 7 ++--- modules/about-must-gather.adoc | 6 ---- modules/gathering-data-network-logs.adoc | 2 +- modules/gathering-data-specific-features.adoc | 30 ++++++++----------- .../querying-cluster-node-journal-logs.adoc | 19 ++++++++---- ...support-collecting-host-network-trace.adoc | 14 +++++---- modules/support-collecting-network-trace.adoc | 21 +++++++++---- modules/support-gather-data.adoc | 19 ++++++++++-- modules/support-get-cluster-id.adoc | 8 ++++- ...-providing-diagnostic-data-to-red-hat.adoc | 21 +++++++++---- modules/support-submitting-a-case.adoc | 18 +++++------ .../logging/cluster-logging-support.adoc | 9 +----- security/audit-log-view.adoc | 2 +- support/gathering-cluster-data.adoc | 30 +++++++++++-------- 15 files changed, 121 insertions(+), 92 deletions(-) diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml index 28d6709e84..d2fa2efbab 100644 --- a/_topic_maps/_topic_map_osd.yml +++ b/_topic_maps/_topic_map_osd.yml @@ -158,10 +158,9 @@ Topics: # 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: Gathering data about your cluster + File: gathering-cluster-data + Distros: openshift-dedicated - Name: Summarizing cluster specifications File: summarizing-cluster-specifications Distros: openshift-dedicated diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index baa27e7fef..29890b8a6c 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -328,10 +328,9 @@ Topics: # 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: Gathering data about your cluster + File: gathering-cluster-data + Distros: openshift-rosa - Name: Summarizing cluster specifications File: summarizing-cluster-specifications Distros: openshift-rosa diff --git a/modules/about-must-gather.adoc b/modules/about-must-gather.adoc index d8db653204..193d451b29 100644 --- a/modules/about-must-gather.adoc +++ b/modules/about-must-gather.adoc @@ -44,13 +44,7 @@ $ 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. ==== -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: diff --git a/modules/gathering-data-network-logs.adoc b/modules/gathering-data-network-logs.adoc index 84a8f98222..950fe9c177 100644 --- a/modules/gathering-data-network-logs.adoc +++ b/modules/gathering-data-network-logs.adoc @@ -17,7 +17,7 @@ You can gather network logs on all nodes in a cluster. ---- $ oc adm must-gather -- gather_network_logs ---- - ++ [NOTE] ==== By default, the `must-gather` tool collects the OVN `nbdb` and `sbdb` databases from all of the nodes in the cluster. Adding the `-- gather_network_logs` option to include additional logs that contain OVN-Kubernetes transactions for OVN `nbdb` database. diff --git a/modules/gathering-data-specific-features.adoc b/modules/gathering-data-specific-features.adoc index e3894ac6e4..e16726d851 100644 --- a/modules/gathering-data-specific-features.adoc +++ b/modules/gathering-data-specific-features.adoc @@ -34,17 +34,13 @@ ifndef::openshift-origin[] |`registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8:` |Data collection for Red Hat OpenShift Service Mesh. -ifndef::openshift-dedicated[] |`registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v` |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[] +ifndef::openshift-rosa,openshift-dedicated[] |`registry.redhat.io/odf4/ocs-must-gather-rhel8:v` |Data collection for {rh-storage-first}. +endif::openshift-rosa,openshift-dedicated[] |`registry.redhat.io/openshift-logging/cluster-logging-rhel9-operator:v` |Data collection for {logging}. @@ -52,10 +48,9 @@ endif::openshift-dedicated[] |`registry.redhat.io/openshift4/ose-csi-driver-shared-resource-mustgather-rhel8` |Data collection for OpenShift Shared Resource CSI Driver. -ifndef::openshift-dedicated[] +ifndef::openshift-rosa,openshift-dedicated[] |`registry.redhat.io/openshift4/ose-local-storage-mustgather-rhel8:v` |Data collection for Local Storage Operator. -endif::openshift-dedicated[] |`registry.redhat.io/openshift-sandboxed-containers/osc-must-gather-rhel8:v` |Data collection for {sandboxed-containers-first}. @@ -71,6 +66,7 @@ endif::openshift-dedicated[] |`registry.redhat.io/workload-availability/node-maintenance-must-gather-rhel8:v` |Data collection for the Node Maintenance Operator (NMO). +endif::openshift-rosa,openshift-dedicated[] |`registry.redhat.io/openshift-gitops-1/must-gather-rhel8:v` |Data collection for {gitops-title}. @@ -78,14 +74,16 @@ endif::openshift-dedicated[] |`registry.redhat.io/openshift4/ose-secrets-store-csi-mustgather-rhel8:v` |Data collection for the {secrets-store-operator}. +ifndef::openshift-rosa,openshift-dedicated[] |`registry.redhat.io/lvms4/lvms-must-gather-rhel9:v` |Data collection for the LVM Operator. +endif::openshift-rosa,openshift-dedicated[] |=== [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. +To determine the latest version for an {product-title} component's image, see the link:https://access.redhat.com/support/policy/updates/openshift_operators[OpenShift Operator Life Cycles] web page on the Red Hat Customer Portal. ==== endif::openshift-origin[] @@ -131,18 +129,13 @@ endif::from-main-support-section[] .Prerequisites -ifndef::openshift-rosa,openshift-dedicated[] * You have access to the cluster as a user with the `cluster-admin` role. +ifndef::openshift-rosa,openshift-dedicated[] +* The {product-title} CLI (`oc`) is installed. 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`) is installed. -endif::openshift-dedicated[] -ifdef::openshift-dedicated[] * The OpenShift CLI (`oc`) is installed. -endif::openshift-dedicated[] +endif::openshift-rosa,openshift-dedicated[] .Procedure @@ -155,8 +148,9 @@ ifndef::openshift-origin[] [NOTE] ==== * To collect the default `must-gather` data in addition to specific feature data, add the `--image-stream=openshift/must-gather` argument. - +ifndef::openshift-rosa,openshift-dedicated[] * For information on gathering data about the Custom Metrics Autoscaler, see the Additional resources section that follows. +endif::openshift-rosa,openshift-dedicated[] ==== + For example, the following command gathers both the default cluster data and information specific to {VirtProductName}: diff --git a/modules/querying-cluster-node-journal-logs.adoc b/modules/querying-cluster-node-journal-logs.adoc index b73406ead0..2528c2064a 100644 --- a/modules/querying-cluster-node-journal-logs.adoc +++ b/modules/querying-cluster-node-journal-logs.adoc @@ -11,15 +11,20 @@ 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. +ifdef::openshift-dedicated[] ++ +[NOTE] +==== +In {product-title} deployments, customers who are not using the Customer Cloud Subscription (CCS) model cannot use the `oc adm node-logs` command as it requires `cluster-admin` privileges. +==== ++ +endif::openshift-dedicated[] * You have installed the OpenShift CLI (`oc`). +ifndef::openshift-rosa,openshift-dedicated[] +* Your API service is still functional. * You have SSH access to your hosts. +endif::openshift-rosa,openshift-dedicated[] .Procedure @@ -46,6 +51,7 @@ $ oc adm node-logs --role=master --path=openshift-apiserver $ oc adm node-logs --role=master --path=openshift-apiserver/audit.log ---- + +ifndef::openshift-rosa,openshift-dedicated[] .. If the API is not functional, review the logs on each node using SSH instead. The following example tails `/var/log/openshift-apiserver/audit.log`: + [source,terminal] @@ -57,3 +63,4 @@ $ ssh core@.. sudo tail -f /var/log/open ==== {product-title} {product-version} cluster nodes running {op-system-first} are immutable and rely on Operators to apply cluster changes. Accessing cluster nodes by using SSH is not recommended. Before attempting to collect diagnostic data over SSH, review whether the data collected by running `oc adm must gather` and other `oc` commands is sufficient instead. However, if the {product-title} API is not available, or the kubelet is not properly functioning on the target node, `oc` operations will be impacted. In such situations, it is possible to access nodes using `ssh core@..`. ==== +endif::openshift-rosa,openshift-dedicated[] \ No newline at end of file diff --git a/modules/support-collecting-host-network-trace.adoc b/modules/support-collecting-host-network-trace.adoc index a2a4347e83..c2091326f0 100644 --- a/modules/support-collecting-host-network-trace.adoc +++ b/modules/support-collecting-host-network-trace.adoc @@ -30,13 +30,15 @@ However, you can run any command in the container image that is specified in the .Prerequisites -ifndef::openshift-rosa,openshift-dedicated[] * You are logged in to {product-title} as a user with the `cluster-admin` role. -endif::openshift-rosa,openshift-dedicated[] -ifdef::openshift-rosa,openshift-dedicated[] -* You are logged in to {product-title} as a user with the `dedicated-admin` role. -endif::openshift-rosa,openshift-dedicated[] - ++ +ifdef::openshift-dedicated[] +[NOTE] +==== +In {product-title} deployments, customers who are not using the Customer Cloud Subscription (CCS) model cannot use the `oc adm must-gather` command as it requires `cluster-admin` privileges. +==== +endif::openshift-dedicated[] ++ * You have installed the OpenShift CLI (`oc`). .Procedure diff --git a/modules/support-collecting-network-trace.adoc b/modules/support-collecting-network-trace.adoc index 3c5eda30df..c94c7ee97c 100644 --- a/modules/support-collecting-network-trace.adoc +++ b/modules/support-collecting-network-trace.adoc @@ -10,17 +10,22 @@ 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[] ++ +ifdef::openshift-dedicated[] +[NOTE] +==== +In {product-title} deployments, customers who are not using the Customer Cloud Subscription (CCS) model cannot use the `oc debug` command as it requires `cluster-admin` privileges. +==== +endif::openshift-dedicated[] ++ * You have installed the OpenShift CLI (`oc`). +* You have an existing Red Hat Support case ID. +ifndef::openshift-rosa,openshift-dedicated[] * You have a Red Hat standard or premium Subscription. * You have a Red Hat Customer Portal account. -* You have an existing Red Hat Support case ID. * You have SSH access to your hosts. +endif::openshift-rosa,openshift-dedicated[] .Procedure @@ -45,11 +50,13 @@ $ oc debug node/my-cluster-node # chroot /host ---- + +ifndef::openshift-rosa,openshift-dedicated[] [NOTE] ==== {product-title} {product-version} cluster nodes running {op-system-first} are immutable and rely on Operators to apply cluster changes. Accessing cluster nodes by using SSH is not recommended. However, if the {product-title} API is not available, or the kubelet is not properly functioning on the target node, `oc` operations will be impacted. In such situations, it is possible to access nodes using `ssh core@..` instead. ==== + +endif::openshift-rosa,openshift-dedicated[] . From within the `chroot` environment console, obtain the node's interface names: + [source,terminal] @@ -120,11 +127,13 @@ $ oc debug node/my-cluster-node -- bash -c 'cat /host/var/tmp/my-tcpdump-capture ---- <1> The debug container mounts the host's root directory at `/host`. Reference the absolute path from the debug container's root directory, including `/host`, when specifying target files for concatenation. + +ifndef::openshift-rosa,openshift-dedicated[] [NOTE] ==== {product-title} {product-version} cluster nodes running {op-system-first} are immutable and rely on Operators to apply cluster changes. Transferring a `tcpdump` capture file from a cluster node by using `scp` is not recommended. However, if the {product-title} API is not available, or the kubelet is not properly functioning on the target node, `oc` operations will be impacted. In such situations, it is possible to copy a `tcpdump` capture file from a node by running `scp core@..: `. ==== + +endif::openshift-rosa,openshift-dedicated[] .. Navigate to an existing support case within link:https://access.redhat.com/support/cases/#/case/list[the *Customer Support* page] of the Red Hat Customer Portal. + .. Select *Attach files* and follow the prompts to upload the file. diff --git a/modules/support-gather-data.adoc b/modules/support-gather-data.adoc index 6de9e037b0..3d0f395e20 100644 --- a/modules/support-gather-data.adoc +++ b/modules/support-gather-data.adoc @@ -10,19 +10,29 @@ You can gather debugging information about your cluster by using the `oc adm mus .Prerequisites -ifndef::openshift-rosa,openshift-dedicated[] * You have access to the cluster as a user with the `cluster-admin` role. ++ +ifdef::openshift-dedicated[] +[NOTE] +==== +In {product-title} deployments, customers who are not using the Customer Cloud Subscription (CCS) model cannot use the `oc adm must-gather` command as it requires `cluster-admin` privileges. +==== +endif::openshift-dedicated[] ++ +ifndef::openshift-rosa,openshift-dedicated[] +* The {product-title} CLI (`oc`) is installed. endif::openshift-rosa,openshift-dedicated[] ifdef::openshift-rosa,openshift-dedicated[] -* You have access to the cluster as a user with the `dedicated-admin` role. +* The OpenShift CLI (`oc`) is installed. endif::openshift-rosa,openshift-dedicated[] -* The {product-title} CLI (`oc`) is installed. + .Procedure . Navigate to the directory where you want to store the `must-gather` data. + +ifndef::openshift-rosa,openshift-dedicated[] [NOTE] ==== If your cluster is in a disconnected environment, you must take additional steps. If your mirror registry has a trusted CA, you must first add the trusted CA to the cluster. For all clusters in disconnected environments, you must import the default `must-gather` image as an image stream. @@ -32,6 +42,7 @@ If your cluster is in a disconnected environment, you must take additional steps $ oc import-image is/must-gather -n openshift ---- ==== +endif::openshift-rosa,openshift-dedicated[] . Run the `oc adm must-gather` command: + @@ -41,11 +52,13 @@ $ oc import-image is/must-gather -n openshift $ oc adm must-gather ---- + +ifndef::openshift-rosa,openshift-dedicated[] [IMPORTANT] ==== If you are in a disconnected environment, use the `--image` flag as part of must-gather and point to the payload image. ==== + +endif::openshift-rosa,openshift-dedicated[] [NOTE] ==== Because this command picks a random control plane node by default, the pod might be scheduled to a control plane node that is in the `NotReady` and `SchedulingDisabled` state. diff --git a/modules/support-get-cluster-id.adoc b/modules/support-get-cluster-id.adoc index c519570aba..f07861b99a 100644 --- a/modules/support-get-cluster-id.adoc +++ b/modules/support-get-cluster-id.adoc @@ -19,7 +19,13 @@ 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[] +ifdef::openshift-rosa,openshift-dedicated[] +* To manually obtain your cluster ID using {cluster-manager-url}: +.. Navigate to *Clusters*. +.. Click on the name of the cluster you need to open a support case for. +.. Find the value in the *Cluster ID* field of the *Details* section of the *Overview* tab. +endif::[] +ifdef::openshift-enterprise,openshift-webscale,openshift-dedicated,openshift-rosa[] * To open a support case and have your cluster ID autofilled using the web console: .. From the toolbar, navigate to *(?) Help* and select *Share Feedback* from the list. .. Click *Open a support case* from the *Tell us about your experience* window. diff --git a/modules/support-providing-diagnostic-data-to-red-hat.adoc b/modules/support-providing-diagnostic-data-to-red-hat.adoc index 0023f5ab9a..b943e81120 100644 --- a/modules/support-providing-diagnostic-data-to-red-hat.adoc +++ b/modules/support-providing-diagnostic-data-to-red-hat.adoc @@ -10,16 +10,21 @@ 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. ++ +ifdef::openshift-dedicated[] +[NOTE] +==== +In {product-title} deployments, customers who are not using the Customer Cloud Subscription (CCS) model cannot use the `oc debug` command as it requires `cluster-admin` privileges. +==== +endif::openshift-dedicated[] ++ * You have installed the OpenShift CLI (`oc`). +ifndef::openshift-rosa,openshift-dedicated[] +* You have SSH access to your hosts. * You have a Red Hat standard or premium Subscription. * You have a Red Hat Customer Portal account. +endif::openshift-rosa,openshift-dedicated[] * You have an existing Red Hat Support case ID. .Procedure @@ -33,11 +38,13 @@ $ oc debug node/my-cluster-node -- bash -c 'cat /host/var/tmp/my-diagnostic-data ---- <1> The debug container mounts the host's root directory at `/host`. Reference the absolute path from the debug container's root directory, including `/host`, when specifying target files for concatenation. + +ifndef::openshift-rosa,openshift-dedicated[] [NOTE] ==== {product-title} {product-version} cluster nodes running {op-system-first} are immutable and rely on Operators to apply cluster changes. Transferring files from a cluster node by using `scp` is not recommended. However, if the {product-title} API is not available, or the kubelet is not properly functioning on the target node, `oc` operations will be impacted. In such situations, it is possible to copy diagnostic files from a node by running `scp core@..: `. ==== + +endif::openshift-rosa,openshift-dedicated[] . Navigate to an existing support case within link:https://access.redhat.com/support/cases/#/case/list[the *Customer Support* page] of the Red Hat Customer Portal. + . Select *Attach files* and follow the prompts to upload the file. @@ -64,11 +71,13 @@ $ oc debug node/my-cluster-node # chroot /host ---- + +ifndef::openshift-rosa,openshift-dedicated[] [NOTE] ==== {product-title} {product-version} cluster nodes running {op-system-first} are immutable and rely on Operators to apply cluster changes. Accessing cluster nodes by using SSH is not recommended. However, if the {product-title} API is not available, or the kubelet is not properly functioning on the target node, `oc` operations will be impacted. In such situations, it is possible to access nodes using `ssh core@..` instead. ==== + +endif::openshift-rosa,openshift-dedicated[] . Start a `toolbox` container, which includes the required binaries to run `redhat-support-tool`: + [source,terminal] diff --git a/modules/support-submitting-a-case.adoc b/modules/support-submitting-a-case.adoc index 02c3ed3bf9..7fdac42025 100644 --- a/modules/support-submitting-a-case.adoc +++ b/modules/support-submitting-a-case.adoc @@ -11,20 +11,20 @@ .Prerequisites -ifndef::openshift-dedicated[] +ifndef::openshift-rosa,openshift-dedicated[] * You have access to the cluster as a user with the `cluster-admin` role. -endif::openshift-dedicated[] +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`). -ifdef::openshift-dedicated[] +ifdef::openshift-rosa,openshift-dedicated[] * You have access to the {cluster-manager-first}. -endif::openshift-dedicated[] +endif::openshift-rosa,openshift-dedicated[] +ifndef::openshift-rosa,openshift-dedicated[] * You have a Red Hat Customer Portal account. -ifndef::openshift-dedicated[] * You have a Red Hat Standard or Premium subscription. -endif::openshift-dedicated[] +endif::openshift-rosa,openshift-dedicated[] .Procedure @@ -62,7 +62,6 @@ ifdef::openshift-dedicated[] .. Click on the name of the cluster you need to open a support case for. .. Find the value in the *Cluster ID* field of the *Details* section of the *Overview* tab. endif::openshift-dedicated[] -ifndef::openshift-dedicated[] + * To manually obtain your cluster ID using the {product-title} web console: .. Navigate to *Home* -> *Overview*. @@ -78,7 +77,6 @@ ifndef::openshift-dedicated[] ---- $ oc get clusterversion -o jsonpath='{.items[].spec.clusterID}{"\n"}' ---- -endif::openshift-dedicated[] . Complete the following questions where prompted and then click *Continue*: + @@ -88,9 +86,9 @@ endif::openshift-dedicated[] * When does this behavior occur? Frequency? Repeatedly? At certain times? . Upload relevant diagnostic data files and click *Continue*. -ifndef::openshift-dedicated[] +ifndef::openshift-rosa,openshift-dedicated[] It is recommended to include data gathered using the `oc adm must-gather` command as a starting point, plus any issue specific data that is not collected by that command. -endif::openshift-dedicated[] +endif::openshift-rosa,openshift-dedicated[] . Input relevant case management details and click *Continue*. diff --git a/observability/logging/cluster-logging-support.adoc b/observability/logging/cluster-logging-support.adoc index cfd9793652..d61c021bc4 100644 --- a/observability/logging/cluster-logging-support.adoc +++ b/observability/logging/cluster-logging-support.adoc @@ -56,14 +56,7 @@ include::modules/unmanaged-operators.adoc[leveloffset=+1] When opening a support case, it is helpful to provide debugging information about your cluster to Red{nbsp}Hat Support. -You can use the -ifdef::openshift-enterprise,openshift-origin[] -xref:../../support/gathering-cluster-data.adoc#gathering-cluster-data[`must-gather` tool] -endif::[] -ifdef::openshift-rosa,openshift-dedicated[] -link:https://docs.openshift.com/container-platform/latest/support/gathering-cluster-data.html#gathering-cluster-data[`must-gather` tool] -endif::[] -to collect diagnostic information for project-level resources, cluster-level resources, and each of the {logging} components. +You can use the xref:../../support/gathering-cluster-data.adoc#gathering-cluster-data[`must-gather` tool] to collect diagnostic information for project-level resources, cluster-level resources, and each of the {logging} components. For prompt support, supply diagnostic information for both {product-title} and {logging}. diff --git a/security/audit-log-view.adoc b/security/audit-log-view.adoc index 797c081e2b..4a29965d3b 100644 --- a/security/audit-log-view.adoc +++ b/security/audit-log-view.adoc @@ -27,8 +27,8 @@ include::modules/gathering-data-audit-logs.adoc[leveloffset=+1] [role="_additional-resources"] == Additional resources -ifndef::openshift-rosa,openshift-dedicated[] * xref:../support/gathering-cluster-data.adoc#about-must-gather_gathering-cluster-data[Must-gather tool] +ifndef::openshift-rosa,openshift-dedicated[] * link:https://github.com/kubernetes/apiserver/blob/master/pkg/apis/audit/v1/types.go#L72[API audit log event structure] * xref:../security/audit-log-policy-config.adoc#audit-log-policy-config[Configuring the audit log policy] endif::[] diff --git a/support/gathering-cluster-data.adoc b/support/gathering-cluster-data.adoc index 48f2a49de9..59786bf019 100644 --- a/support/gathering-cluster-data.adoc +++ b/support/gathering-cluster-data.adoc @@ -2,14 +2,14 @@ [id="gathering-cluster-data"] = Gathering data about your cluster include::_attributes/common-attributes.adoc[] -ifdef::openshift-dedicated[] +ifdef::openshift-rosa,openshift-dedicated[] include::_attributes/attributes-openshift-dedicated.adoc[] endif::[] :context: gathering-cluster-data toc::[] -ifndef::openshift-origin[] +ifndef::openshift-origin,openshift-rosa,openshift-dedicated[] When opening a support case, it is helpful to provide debugging information about your cluster to Red Hat Support. @@ -17,11 +17,11 @@ It is recommended to provide: * xref:../support/gathering-cluster-data.adoc#support_gathering_data_gathering-cluster-data[Data gathered using the `oc adm must-gather` command] * The xref:../support/gathering-cluster-data.adoc#support-get-cluster-id_gathering-cluster-data[unique cluster ID] -endif::openshift-origin[] +endif::openshift-origin,openshift-rosa,openshift-dedicated[] -ifdef::openshift-origin[] +ifdef::openshift-origin,openshift-rosa,openshift-dedicated[] You can use the following tools to get debugging information about your {product-title} cluster. -endif::openshift-origin[] +endif::openshift-origin,openshift-rosa,openshift-dedicated[] // About the must-gather tool include::modules/about-must-gather.adoc[leveloffset=+1] @@ -38,15 +38,17 @@ include::modules/gathering-data-specific-features.adoc[leveloffset=+2] ifndef::openshift-rosa,openshift-dedicated[] * xref:../nodes/cma/nodes-cma-autoscaling-custom.adoc#nodes-cma-autoscaling-custom-gather[Gathering debugging data] for the Custom Metrics Autoscaler. -endif::openshift-rosa,openshift-dedicated[] - * link:https://access.redhat.com/support/policy/updates/openshift[Red Hat {product-title} Life Cycle Policy] - -ifdef::openshift-rosa,openshift-dedicated[] -// Gathering audit logs -include::modules/gathering-data-audit-logs.adoc[leveloffset=+2] endif::openshift-rosa,openshift-dedicated[] +ifdef::openshift-rosa[] +* xref:../rosa_architecture/rosa_policy_service_definition/rosa-life-cycle.html[{product-title} update life cycle] +endif::openshift-rosa[] + +ifdef::openshift-dedicated[] +* xref:../osd_architecture/osd_policy/osd-life-cycle.html[{product-title} update life cycle] +endif::openshift-dedicated[] + // Gathering network logs include::modules/gathering-data-network-logs.adoc[leveloffset=+2] @@ -56,16 +58,20 @@ include::modules/must-gather-storage-limit.adoc[leveloffset=+2] ifndef::openshift-origin[] // Obtain your cluster identifier include::modules/support-get-cluster-id.adoc[leveloffset=+1] +endif::openshift-origin[] +ifndef::openshift-origin,openshift-rosa,openshift-dedicated[] // About `sosreport` include::modules/about-sosreport.adoc[leveloffset=+1] // Generating a `sosreport` archive for an {product-title} cluster node include::modules/support-generating-a-sosreport-archive.adoc[leveloffset=+1] -endif::openshift-origin[] +endif::openshift-origin,openshift-rosa,openshift-dedicated[] +ifndef::openshift-rosa,openshift-dedicated[] // Querying bootstrap node journal logs include::modules/querying-bootstrap-node-journal-logs.adoc[leveloffset=+1] +endif::openshift-rosa,openshift-dedicated[] // Querying cluster node journal logs include::modules/querying-cluster-node-journal-logs.adoc[leveloffset=+1]