diff --git a/_attributes/common-attributes.adoc b/_attributes/common-attributes.adoc index 818aba5341..46d63746c6 100644 --- a/_attributes/common-attributes.adoc +++ b/_attributes/common-attributes.adoc @@ -16,6 +16,7 @@ :op-system-base: RHEL :op-system-base-full: Red Hat Enterprise Linux (RHEL) :op-system-version: 9.x +:op-system-version-9: 9 ifdef::openshift-origin[] :op-system-first: Fedora CoreOS (FCOS) :op-system: FCOS diff --git a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc index 1d937dd1bb..b940eed326 100644 --- a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc +++ b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc @@ -7,7 +7,8 @@ include::_attributes/attributes-openshift-dedicated.adoc[] :oadp-troubleshooting: :namespace: openshift-adp :local-product: OADP -:must-gather: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.1 +:must-gather-v1-3: registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 +:must-gather-v1-4: registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.4 toc::[] diff --git a/modules/migration-combining-must-gather.adoc b/modules/migration-combining-must-gather.adoc index 2271e1c8c6..0502c79459 100644 --- a/modules/migration-combining-must-gather.adoc +++ b/modules/migration-combining-must-gather.adoc @@ -7,9 +7,9 @@ Currently, it is not possible to combine must-gather scripts, for example specifying a timeout threshold while permitting insecure TLS connections. In some situations, you can get around this limitation by setting up internal variables on the must-gather command line, such as the following example: -[source,terminal] +[source,terminal,subs="attributes+"] ---- -oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 -- skip_tls=true /usr/bin/gather_with_timeout +$ oc adm must-gather --image={must-gather-v1-4} -- skip_tls=true /usr/bin/gather_with_timeout ---- In this example, set the `skip_tls` variable before running the `gather_with_timeout` script. The result is a combination of `gather_with_timeout` and `gather_without_tls`. @@ -21,7 +21,7 @@ The only other variables that you can specify this way are the following: If `DataProtectionApplication` custom resource (CR) is configured with `s3Url` and `insecureSkipTLS: true`, the CR does not collect the necessary logs because of a missing CA certificate. To collect those logs, run the `must-gather` command with the following option: -[source,terminal] +[source,terminal,subs="attributes+"] ---- -$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 -- /usr/bin/gather_without_tls true +$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather_without_tls true ---- \ No newline at end of file diff --git a/modules/migration-using-must-gather.adoc b/modules/migration-using-must-gather.adoc index 49f1937963..97c67a71b7 100644 --- a/modules/migration-using-must-gather.adoc +++ b/modules/migration-using-must-gather.adoc @@ -30,8 +30,7 @@ endif::[] * You must have the OpenShift CLI (`oc`) installed. ifdef::oadp-troubleshooting[] -* You must use {op-system-base-full} 8.x with OADP 1.2. -* You must use {op-system-base-full} {op-system-version} with OADP 1.3. +* You must use {op-system-base-full} {op-system-version-9} with {oadp-short} 1.4. endif::[] .Procedure @@ -77,18 +76,10 @@ This operation can take a long time. This command saves the data as the `must-ga endif::[] ifdef::oadp-troubleshooting[] * Full `must-gather` data collection, including Prometheus metrics: -.. For OADP 1.2, run the following command: + -[source,terminal] +[source,terminal,subs="attributes+"] ---- -$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2 ----- -+ -.. For OADP 1.3, run the following command: -+ -[source,terminal] ----- -$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 +$ oc adm must-gather --image={must-gather-v1-4} ---- + The data is saved as `must-gather/must-gather.tar.gz`. You can upload this file to a support case on the link:https://access.redhat.com/[Red Hat Customer Portal]. @@ -97,7 +88,7 @@ The data is saved as `must-gather/must-gather.tar.gz`. You can upload this file + [source,terminal,subs="attributes+"] ---- -$ oc adm must-gather --image={must-gather} \ +$ oc adm must-gather --image={must-gather-v1-4} \ -- /usr/bin/gather_