Skip to content

OSDOCS-19542 [NETOBSERV] Tags#113088

Merged
cbippley merged 1 commit into
openshift:mainfrom
gwynnemonahan:OSDOCS-19542
Jul 13, 2026
Merged

OSDOCS-19542 [NETOBSERV] Tags#113088
cbippley merged 1 commit into
openshift:mainfrom
gwynnemonahan:OSDOCS-19542

Conversation

@gwynnemonahan

@gwynnemonahan gwynnemonahan commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

OSDOCS-19542 [NETOBSERV] Tags

Version(s):
4.16+ since migration related

Issue:
https://redhat.atlassian.net/browse/OSDOCS-19542

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

  • include::modules/network-observability-logging-loki-log-access.adoc[leveloffset=+1] replaces includes::modules/logging-loki-log-access.adoc. The Logging file on main has not been maintained since Logging docs moved to the stand alone format, and tags are not supported with the move to DITA. However, some content in the Logging file is applicable only to Network Observability Operator, and that content is what has become the include::modules/network-observability-role-based-access-control-for-loki-logs.adoc[leveloffset=+1] file.
  • This is already noted in https://redhat.atlassian.net/browse/OSDOCS-20182 to address post-migration.
  • Also addresses DOCBUG https://redhat.atlassian.net/browse/OSDOCS-19779 as restructuring of content and removal of tags addressed issues raised in the reported doc bug.
  • Also addresses https://redhat.atlassian.net/browse/OSDOCS-19782 as removing tags has required restructuring the assembly file.
  • Cherry-pick failures are possible. Manual cherry-picks will be created accordingly.

@openshift-ci openshift-ci Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 10, 2026
@ocpdocs-previewbot

ocpdocs-previewbot commented Jun 10, 2026

Copy link
Copy Markdown

@openshift-ci openshift-ci Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2026
Comment thread observability/network_observability/installing-operators.adoc Outdated
@gwynnemonahan

Copy link
Copy Markdown
Contributor Author

Rebased 06/18/2026 AM.

@gwynnemonahan

Copy link
Copy Markdown
Contributor Author

Rebased 06/22/2026 AM.

Comment thread modules/network-observability-logging-loki-log-access.adoc Outdated
Comment thread observability/network_observability/installing-operators.adoc
@openshift-ci openshift-ci Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 23, 2026
Comment thread modules/network-observability-logging-loki-log-access.adoc Outdated
Comment on lines +35 to +40
tenants:
mode: openshift-network
openshift:
adminGroups:
- cluster-admin
- custom-admin-group

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@memodi @jotak was this ever been tested ? I'm discovering it 😺

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

yes, I remember to test this Loki feature in past

Comment thread modules/network-observability-role-based-access-control-for-loki-logs.adoc Outdated
Comment thread observability/network_observability/installing-operators.adoc Outdated
@Amoghrd

Amoghrd commented Jul 10, 2026

Copy link
Copy Markdown

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Jul 10, 2026
@gwynnemonahan

Copy link
Copy Markdown
Contributor Author

Rebased 07/10/2026 PM.

@openshift-ci

openshift-ci Bot commented Jul 10, 2026

Copy link
Copy Markdown

@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

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 Jul 10, 2026
@cbippley

Copy link
Copy Markdown
Contributor

/label merge-review-in-progress

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@cbippley: once the present PR merges, I will cherry-pick it on top of enterprise-5.0 in a new PR and assign it to you.

Details

In response to this:

/cherrypick enterprise-5.0

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.

@cbippley cbippley merged commit 4eba8c8 into openshift:main Jul 13, 2026
2 checks passed
@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown

@cbippley: #113088 failed to apply on top of branch "enterprise-5.0":

Applying: OSDOCS-19542 [NETOBSERV] Tags
Using index info to reconstruct a base tree...
M	observability/network_observability/installing-operators.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/installing-operators.adoc
CONFLICT (content): Merge conflict in observability/network_observability/installing-operators.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19542 [NETOBSERV] Tags

Details

In response to this:

/cherrypick enterprise-5.0

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

@cbippley: new pull request created: #115216

Details

In response to this:

/cherrypick enterprise-4.22

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.

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.21

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.20

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.19

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.18

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.17

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

Copy link
Copy Markdown

@cbippley: new pull request created: #115226

Details

In response to this:

/cherrypick enterprise-4.21

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

@cbippley: new pull request created: #115227

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.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@cbippley: new pull request created: #115228

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

@cbippley: #113088 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-19542 [NETOBSERV] Tags
Using index info to reconstruct a base tree...
M	observability/network_observability/installing-operators.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/installing-operators.adoc
CONFLICT (content): Merge conflict in observability/network_observability/installing-operators.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19542 [NETOBSERV] Tags

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

@cbippley: new pull request created: #115229

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

@cbippley: #113088 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-19542 [NETOBSERV] Tags
Using index info to reconstruct a base tree...
M	observability/network_observability/installing-operators.adoc
M	observability/network_observability/network-observability-overview.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/installing-operators.adoc
CONFLICT (content): Merge conflict in observability/network_observability/installing-operators.adoc
Auto-merging observability/network_observability/network-observability-overview.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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19542 [NETOBSERV] Tags

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.

@cbippley

Copy link
Copy Markdown
Contributor

/cherrypick enterprise-5.0

@openshift-cherrypick-robot

Copy link
Copy Markdown

@cbippley: new pull request created: #115279

Details

In response to this:

/cherrypick enterprise-5.0

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants