From 89b1908bd7141122d77a003ec2e183d50b823f88 Mon Sep 17 00:00:00 2001 From: Carmi Wisemon Date: Thu, 11 Apr 2024 10:35:29 +0300 Subject: [PATCH] MIG-1518 Wrong Must Gather for MTC --- .../troubleshooting.adoc | 7 +++- modules/migration-using-must-gather.adoc | 38 ++++++++++++------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc index 6c1f5cec0a..e262fd5bbf 100644 --- a/backup_and_restore/application_backup_and_restore/troubleshooting.adoc +++ b/backup_and_restore/application_backup_and_restore/troubleshooting.adoc @@ -4,6 +4,7 @@ include::_attributes/common-attributes.adoc[] include::_attributes/attributes-openshift-dedicated.adoc[] :context: oadp-troubleshooting +:oadp-troubleshooting: :namespace: openshift-adp :local-product: OADP :must-gather: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.1 @@ -95,6 +96,10 @@ include::modules/oadp-restic-issues.adoc[leveloffset=+1] include::modules/oadp-restic-restore-failing-psa-policy.adoc[leveloffset=+2] include::modules/migration-using-must-gather.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources +* xref:../../support/gathering-cluster-data.adoc#gathering-cluster-data[Gathering cluster data] + include::modules/migration-combining-must-gather.adoc[leveloffset=+2] include::modules/oadp-monitoring.adoc[leveloffset=+1] [role="_additional-resources"] @@ -111,4 +116,4 @@ include::modules/oadp-creating-alerting-rule.adoc[leveloffset=+2] include::modules/oadp-list-of-metrics.adoc[leveloffset=+2] include::modules/oadp-viewing-metrics-ui.adoc[leveloffset=+2] -:!oadp-troubleshooting: +:oadp-troubleshooting!: diff --git a/modules/migration-using-must-gather.adoc b/modules/migration-using-must-gather.adoc index 0fa491b166..15e51f60ba 100644 --- a/modules/migration-using-must-gather.adoc +++ b/modules/migration-using-must-gather.adoc @@ -28,8 +28,11 @@ endif::[] * You must be logged in to the {product-title} cluster as a user with the `cluster-admin` role. * 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. +endif::[] .Procedure @@ -38,27 +41,40 @@ endif::[] ifdef::troubleshooting-3-4,troubleshooting-mtc[] * To collect data for the past hour: ++ +[source,terminal] +---- +$ oc adm must-gather --image=registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v1.8 +---- ++ +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]. +* To collect data for the past 24 hours: ++ +[source,terminal] +---- +$ oc adm must-gather --image=registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v1.8 -- /usr/bin/gather_metrics_dump +---- ++ +This operation can take a long time. The data is saved as `must-gather/metrics/prom_data.tar.gz`. endif::[] ifdef::oadp-troubleshooting[] * Full `must-gather` data collection, including Prometheus metrics: -endif::[] .. For OADP 1.2, use the following command: + [source,terminal] ---- -oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2 +$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2 ---- + .. For OADP 1.3, use the following command: + [source,terminal] ---- -oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 +$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 ---- + 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]. -ifdef::oadp-troubleshooting[] * Essential `must-gather` data collection, without Prometheus metrics, for a specific time duration: + [source,terminal,subs="attributes+"] @@ -76,24 +92,20 @@ $ oc adm must-gather --image={must-gather} \ -- /usr/bin/gather_with_timeout <1> ---- <1> Specify a timeout value in seconds. -endif::[] -ifdef::troubleshooting-3-4,troubleshooting-mtc[] -* To collect data for the past 24 hours: -endif::[] -ifdef::oadp-troubleshooting[] + * Prometheus metrics data dump: -endif::[] + .. For OADP 1.2, use the following command: + [source,terminal] ---- -oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2 -- /usr/bin/gather_metrics_dump +$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2 -- /usr/bin/gather_metrics_dump ---- .. For OADP 1.3, use the following command: + [source,terminal] ---- -oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 -- /usr/bin/gather_metrics_dump +$ oc adm must-gather --image=registry.redhat.io/oadp/oadp-mustgather-rhel9:v1.3 -- /usr/bin/gather_metrics_dump ---- This operation can take a long time. The data is saved as `must-gather/metrics/prom_data.tar.gz`. - +endif::[]