Skip to content

Conversation

gwynnemonahan
Copy link
Contributor

@gwynnemonahan gwynnemonahan commented Jul 21, 2025

OSDOCS-15282 [NETOBSERV] Line breaks for metrics-alerts-dashboards.adoc and its includes

Version(s):
4.12, 4.14, 4.16+

Issue:
https://issues.redhat.com/browse/OSDOCS-15282

Link to docs preview:
https://96425--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/metrics-alerts-dashboards.html

QE review:
QE is not required for this PR. This PR addresses style/template issues.

Additional information:

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

ocpdocs-previewbot commented Jul 21, 2025

Copy link

openshift-ci bot commented Jul 21, 2025

@gwynnemonahan: 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.

@gwynnemonahan
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 22, 2025
@bscott-rh bscott-rh added this to the Continuous Release milestone Jul 22, 2025
@bscott-rh bscott-rh merged commit ba0fb2b into openshift:main Jul 22, 2025
2 checks passed
@bscott-rh bscott-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jul 22, 2025
@bscott-rh
Copy link
Contributor

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

@openshift-cherrypick-robot

@bscott-rh: #96425 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-15282 [NETOBSERV] Line breaks for metrics-alerts-dashboards.adoc and its includes
Using index info to reconstruct a base tree...
A	modules/network-observability-includelist-example.adoc
M	modules/network-observability-metrics-names.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/network-observability-metrics-names.adoc
CONFLICT (modify/delete): modules/network-observability-includelist-example.adoc deleted in HEAD and modified in OSDOCS-15282 [NETOBSERV] Line breaks for metrics-alerts-dashboards.adoc and its includes. Version OSDOCS-15282 [NETOBSERV] Line breaks for metrics-alerts-dashboards.adoc and its includes of modules/network-observability-includelist-example.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 OSDOCS-15282 [NETOBSERV] Line breaks for metrics-alerts-dashboards.adoc and its includes

In response to this:

/cherrypick enterprise-4.12
/cherrypick enterprise-4.14
/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.

@bscott-rh
Copy link
Contributor

/cherrypick enterprise-4.14
/cherrypick enterprise-4.16
/cherrypick enterprise-4.17
/cherrypick enterprise-4.18
/cherrypick enterprise-4.19
/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96445

In response to this:

/cherrypick enterprise-4.14
/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.

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96446

In response to this:

/cherrypick enterprise-4.14
/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.

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96447

In response to this:

/cherrypick enterprise-4.14
/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.

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96448

In response to this:

/cherrypick enterprise-4.14
/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.

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96449

In response to this:

/cherrypick enterprise-4.14
/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.

@openshift-cherrypick-robot

@bscott-rh: new pull request created: #96450

In response to this:

/cherrypick enterprise-4.14
/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.

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

Successfully merging this pull request may close these issues.

5 participants