OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ by gwynnemonahan · Pull Request #95709 · openshift/openshift-docs

gwynnemonahan · 2025-07-07T14:39:44Z

https://issues.redhat.com/browse/OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+

Version(s):
4.14+

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

Link to docs preview:
https://95709--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

QE review:
QE Review is not needed for this PR.

Additional information:
Found during cherry-picks. Applies to 4.14+ as it is fixed in 4.12 manual cp #95608

ocpdocs-previewbot · 2025-07-07T14:49:45Z

🤖 Mon Jul 07 14:49:44 - Prow CI generated the docs preview:

https://95709--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

openshift-ci · 2025-07-07T14:51:28Z

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

gwynnemonahan · 2025-07-07T15:38:37Z

/label peer-review-needed

gwynnemonahan · 2025-07-07T16:28:08Z

/label merge-review-needed

mburke5678 · 2025-07-07T18:02:18Z

/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

openshift-cherrypick-robot · 2025-07-07T18:03:03Z

@mburke5678: #95709 failed to apply on top of branch "enterprise-4.14":

Applying: Fix NetObserv 1.9 advisory link 4.14+
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.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 Fix NetObserv 1.9 advisory link 4.14+

Details

In response to this:

/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.

mburke5678 · 2025-07-07T18:09:06Z

/cherrypick enterprise-4.15

openshift-cherrypick-robot · 2025-07-07T18:09:51Z

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

Applying: Fix NetObserv 1.9 advisory link 4.14+
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.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 Fix NetObserv 1.9 advisory link 4.14+

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.

mburke5678 · 2025-07-07T18:15:33Z

/cherrypick enterprise-4.16

openshift-cherrypick-robot · 2025-07-07T18:16:21Z

@mburke5678: new pull request created: #95729

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.

mburke5678 · 2025-07-07T18:16:29Z

/cherrypick enterprise-4.17

mburke5678 · 2025-07-07T18:16:33Z

/cherrypick enterprise-4.18

mburke5678 · 2025-07-07T18:16:38Z

/cherrypick enterprise-4.19

mburke5678 · 2025-07-07T18:16:44Z

/cherrypick enterprise-4.20

openshift-cherrypick-robot · 2025-07-07T18:17:18Z

@mburke5678: new pull request created: #95730

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 · 2025-07-07T18:17:22Z

@mburke5678: new pull request created: #95731

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 · 2025-07-07T18:17:25Z

@mburke5678: new pull request created: #95732

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 · 2025-07-07T18:17:32Z

@mburke5678: new pull request created: #95733

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.

mburke5678 · 2025-07-07T18:18:17Z

@gwynnemonahan It appears that the Network Observability Operator 1.9 are not in OCP 4.14 or 4.15. Is this what you expected?

gwynnemonahan · 2025-07-07T18:20:48Z

@mburke5678 ,

Nope. Starting manual-cp process for those 2.

[NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+

241e0e5

openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 7, 2025

gwynnemonahan mentioned this pull request Jul 7, 2025

[enterprise-4.12] OSDOCS-14862 NETOBSERV 1.9 Features, Bugs, Known Issues #95608

Merged

openshift-ci Bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jul 7, 2025

dfitzmau added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jul 7, 2025

dfitzmau approved these changes Jul 7, 2025

View reviewed changes

Comment thread observability/network_observability/network-observability-operator-release-notes.adoc

openshift-ci Bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jul 7, 2025

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 Jul 7, 2025

mburke5678 merged commit e97f0d7 into openshift:main Jul 7, 2025
2 checks passed

openshift-cherrypick-robot mentioned this pull request Jul 7, 2025

[enterprise-4.16] OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95729

Merged

openshift-cherrypick-robot mentioned this pull request Jul 7, 2025

[enterprise-4.17] OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95730

Merged

openshift-cherrypick-robot mentioned this pull request Jul 7, 2025

[enterprise-4.18] OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95731

Merged

openshift-cherrypick-robot mentioned this pull request Jul 7, 2025

[enterprise-4.19] OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95732

Merged

openshift-cherrypick-robot mentioned this pull request Jul 7, 2025

[enterprise-4.20] OSDOCS-15175 [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95733

Merged

gwynnemonahan mentioned this pull request Jul 7, 2025

[enterprise-4.14] [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95734

Merged

gwynnemonahan mentioned this pull request Jul 7, 2025

[enterprise-4.15] [NETOBSERV] Fix NetObserv 1.9 advisory link 4.14+ #95735

Merged

Conversation

gwynnemonahan commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ocpdocs-previewbot commented Jul 7, 2025

Uh oh!

openshift-ci Bot commented Jul 7, 2025

Uh oh!

gwynnemonahan commented Jul 7, 2025

Uh oh!

Uh oh!

gwynnemonahan commented Jul 7, 2025

Uh oh!

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

openshift-cherrypick-robot commented Jul 7, 2025

Uh oh!

mburke5678 commented Jul 7, 2025

Uh oh!

gwynnemonahan commented Jul 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gwynnemonahan commented Jul 7, 2025 •

edited

Loading