Skip to content

OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes#97152

Merged
mburke5678 merged 1 commit intoopenshift:mainfrom
gwynnemonahan:OSDOCS-15287
Aug 6, 2025
Merged

OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes#97152
mburke5678 merged 1 commit intoopenshift:mainfrom
gwynnemonahan:OSDOCS-15287

Conversation

@gwynnemonahan
Copy link
Copy Markdown
Contributor

@gwynnemonahan gwynnemonahan commented Aug 5, 2025

OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes

Version(s):
4.12, 4.14+

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

Link to docs preview:
https://97152--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/observing-network-traffic.html

QE review:
QE review is not required for this PR. This PR addresses style and template compliance.

Additional information:

  • Since not all content applies to every OCP branch, it is possible there will be cherry-pick failures. I will verify and create manual cherry-picks accordingly.
  • There seem to have been some extra spaces in some files that are now removed.

@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 5, 2025
@ocpdocs-previewbot
Copy link
Copy Markdown

ocpdocs-previewbot commented Aug 5, 2025

@gwynnemonahan
Copy link
Copy Markdown
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 Aug 5, 2025
@gwynnemonahan
Copy link
Copy Markdown
Contributor Author

Rebased to catch other updates 08/05/2025 PM

@gwynnemonahan
Copy link
Copy Markdown
Contributor Author

Rebased to catch updates 08/06/2025 AM

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Aug 6, 2025

@gwynnemonahan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@mburke5678 mburke5678 added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Aug 6, 2025
@mburke5678 mburke5678 merged commit 57c7918 into openshift:main Aug 6, 2025
2 checks passed
@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.12

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.14

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.15

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.16

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.17

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.18

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.19

@mburke5678
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.20

@openshift-cherrypick-robot
Copy link
Copy Markdown

@mburke5678: #97152 failed to apply on top of branch "enterprise-4.12":

Applying: OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes
Using index info to reconstruct a base tree...
M	modules/network-observability-filtering-ebpf-rule.adoc
A	modules/network-observability-pktdrop-overview.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/network-observability-pktdrop-overview.adoc deleted in HEAD and modified in OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes. Version OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes of modules/network-observability-pktdrop-overview.adoc left in tree.
Auto-merging modules/network-observability-filtering-ebpf-rule.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 OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes

Details

In response to this:

/cherrypick enterprise-4.12

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
Copy link
Copy Markdown

@mburke5678: #97152 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes
Using index info to reconstruct a base tree...
M	modules/network-observability-ebpf-rule-flow-filter.adoc
M	modules/network-observability-filtering-ebpf-rule.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/network-observability-filtering-ebpf-rule.adoc
CONFLICT (content): Merge conflict in modules/network-observability-filtering-ebpf-rule.adoc
Auto-merging modules/network-observability-ebpf-rule-flow-filter.adoc
CONFLICT (content): Merge conflict in modules/network-observability-ebpf-rule-flow-filter.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 OSDOCS-15287 [NETOBSERV] Line breaks for observing-network-traffic.adoc assembly and its includes

Details

In response to this:

/cherrypick enterprise-4.15

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
Copy link
Copy Markdown

@mburke5678: new pull request created: #97239

Details

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
Copy link
Copy Markdown

@mburke5678: new pull request created: #97240

Details

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
Copy link
Copy Markdown

@mburke5678: new pull request created: #97241

Details

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
Copy link
Copy Markdown

@mburke5678: new pull request created: #97242

Details

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
Copy link
Copy Markdown

@mburke5678: new pull request created: #97243

Details

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@mburke5678: new pull request created: #97244

Details

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.

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

Labels

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.

4 participants