Skip to content

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Sep 2, 2025

Version(s):
4.14, 4.16+

Issue:
https://issues.redhat.com/browse/CNV-67472

Link to docs preview:
https://98372--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/monitoring/virt-running-cluster-checkups.html

QE review:
N/A, docs structural changes only.

Additional information:
Currently, the structure of the cluster checkup virt docs is by web console vs. CLI rather than use case, which makes it hard for users to see what content is relevant to the JTBD. This PR fixes that before #98207 can be applied to add additional troubleshooting steps to one of the jobs (storage checkup).

@abrennan89 abrennan89 added this to the Continuous Release milestone Sep 2, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 2, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 2, 2025

@abrennan89: This pull request references CNV-67472 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/CNV-67472

Link to docs preview:

QE review:
N/A, docs structural changes only.

Additional information:
Currently, the structure of the cluster checkup virt docs is by web console vs. CLI rather than use case, which makes it hard for users to see what content is relevant to the JTBD. This PR fixes that before #98207 can be applied to add additional troubleshooting steps to one of the jobs (storage checkup).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 2, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 2, 2025

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 2, 2025

@abrennan89: This pull request references CNV-67472 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/CNV-67472

Link to docs preview:
https://98372--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/monitoring/virt-running-cluster-checkups.html

QE review:
N/A, docs structural changes only.

Additional information:
Currently, the structure of the cluster checkup virt docs is by web console vs. CLI rather than use case, which makes it hard for users to see what content is relevant to the JTBD. This PR fixes that before #98207 can be applied to add additional troubleshooting steps to one of the jobs (storage checkup).

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Copy link
Contributor

@sjhala-ccs sjhala-ccs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @abrennan89!

@abrennan89 abrennan89 added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 3, 2025
@dfitzmau dfitzmau added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 4, 2025
Copy link

openshift-ci bot commented Sep 4, 2025

@abrennan89: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@dfitzmau dfitzmau merged commit 5a004a6 into openshift:main Sep 4, 2025
2 checks passed
@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 4, 2025

/cherrypick enterprise-4.12
/cherrypick enterprise-4.13
/cherrypick enterprise-4.14
/cherrypick enterprise-4.15
/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20

@dfitzmau
Copy link
Contributor

dfitzmau commented Sep 4, 2025

LGTM

@openshift-cherrypick-robot

@dfitzmau: #98372 failed to apply on top of branch "enterprise-4.12":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
M	modules/virt-about-cluster-checkup-framework.adoc
A	modules/virt-checking-storage-configuration.adoc
A	modules/virt-latency-checkup-web-console.adoc
M	modules/virt-measuring-latency-vm-secondary-network.adoc
A	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): virt/monitoring/virt-running-cluster-checkups.adoc deleted in HEAD and modified in CNV-67472: Clean up docs structure before adding new content. Version CNV-67472: Clean up docs structure before adding new content of virt/monitoring/virt-running-cluster-checkups.adoc left in tree.
Auto-merging modules/virt-measuring-latency-vm-secondary-network.adoc
CONFLICT (content): Merge conflict in modules/virt-measuring-latency-vm-secondary-network.adoc
CONFLICT (modify/delete): modules/virt-latency-checkup-web-console.adoc deleted in HEAD and modified in CNV-67472: Clean up docs structure before adding new content. Version CNV-67472: Clean up docs structure before adding new content of modules/virt-latency-checkup-web-console.adoc left in tree.
CONFLICT (modify/delete): modules/virt-checking-storage-configuration.adoc deleted in HEAD and modified in CNV-67472: Clean up docs structure before adding new content. Version CNV-67472: Clean up docs structure before adding new content of modules/virt-checking-storage-configuration.adoc left in tree.
CONFLICT (modify/delete): modules/virt-about-cluster-checkup-framework.adoc deleted in CNV-67472: Clean up docs structure before adding new content and modified in HEAD. Version HEAD of modules/virt-about-cluster-checkup-framework.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.12
/cherrypick enterprise-4.13
/cherrypick enterprise-4.14
/cherrypick enterprise-4.15
/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.16

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.17

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.18

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.19

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@abrennan89: #98372 failed to apply on top of branch "enterprise-4.14":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
A	modules/virt-checking-storage-configuration.adoc
A	modules/virt-latency-checkup-web-console.adoc
M	modules/virt-measuring-latency-vm-secondary-network.adoc
M	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/monitoring/virt-running-cluster-checkups.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-running-cluster-checkups.adoc
Auto-merging modules/virt-measuring-latency-vm-secondary-network.adoc
CONFLICT (modify/delete): modules/virt-latency-checkup-web-console.adoc deleted in HEAD and modified in CNV-67472: Clean up docs structure before adding new content. Version CNV-67472: Clean up docs structure before adding new content of modules/virt-latency-checkup-web-console.adoc left in tree.
CONFLICT (modify/delete): modules/virt-checking-storage-configuration.adoc deleted in HEAD and modified in CNV-67472: Clean up docs structure before adding new content. Version CNV-67472: Clean up docs structure before adding new content of modules/virt-checking-storage-configuration.adoc left in tree.
Removing modules/virt-about-cluster-checkup-framework.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@abrennan89: #98372 failed to apply on top of branch "enterprise-4.16":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
M	modules/virt-checking-storage-configuration.adoc
M	modules/virt-measuring-latency-vm-secondary-network.adoc
M	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/monitoring/virt-running-cluster-checkups.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-running-cluster-checkups.adoc
Auto-merging modules/virt-measuring-latency-vm-secondary-network.adoc
Auto-merging modules/virt-checking-storage-configuration.adoc
Removing modules/virt-about-cluster-checkup-framework.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@abrennan89: #98372 failed to apply on top of branch "enterprise-4.17":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
M	modules/virt-checking-storage-configuration.adoc
M	modules/virt-measuring-latency-vm-secondary-network.adoc
M	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/monitoring/virt-running-cluster-checkups.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-running-cluster-checkups.adoc
Auto-merging modules/virt-measuring-latency-vm-secondary-network.adoc
Auto-merging modules/virt-checking-storage-configuration.adoc
Removing modules/virt-about-cluster-checkup-framework.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@abrennan89: #98372 failed to apply on top of branch "enterprise-4.18":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
M	modules/virt-checking-storage-configuration.adoc
M	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/monitoring/virt-running-cluster-checkups.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-running-cluster-checkups.adoc
Auto-merging modules/virt-checking-storage-configuration.adoc
Removing modules/virt-about-cluster-checkup-framework.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@abrennan89: new pull request created: #98545

In response to this:

/cherrypick enterprise-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

@abrennan89: #98372 failed to apply on top of branch "enterprise-4.19":

Applying: CNV-67472: Clean up docs structure before adding new content
Using index info to reconstruct a base tree...
M	virt/monitoring/virt-running-cluster-checkups.adoc
Falling back to patching base and 3-way merge...
Auto-merging virt/monitoring/virt-running-cluster-checkups.adoc
CONFLICT (content): Merge conflict in virt/monitoring/virt-running-cluster-checkups.adoc
Removing modules/virt-about-cluster-checkup-framework.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 CNV-67472: Clean up docs structure before adding new content

In response to this:

/cherrypick enterprise-4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@abrennan89
Copy link
Contributor Author

Changes will need to be applied to older branches manually since the DPDK checkup was removed for 4.20 and other differences in the branches are causing conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.14 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants