Skip to content

OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6… #94423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

theashiot
Copy link
Contributor

@theashiot theashiot commented Jun 9, 2025

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-1726

Link to docs preview: https://94423--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html

QE review:

  • QE has approved this change.

Additional information: To be cherry-picked to: standalone-logging-docs-6.3, standalone-logging-docs-6.2, standalone-logging-docs-6.1, standalone-logging-docs-6.0

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 9, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 9, 2025

@theashiot: This pull request references OBSDOCS-1726 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-1726

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 9, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 9, 2025

Copy link
Contributor

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

The "Deploying a Loki log store on a cluster that uses short-term credentials" section contains duplicated information from the "Install Log Store" that should be removed.

@theashiot theashiot force-pushed the OBSDOCS-1726-standalone branch from 139fe88 to dae433a Compare June 11, 2025 20:15
@theashiot
Copy link
Contributor Author

The "Deploying a Loki log store on a cluster that uses short-term credentials" section contains duplicated information from the "Install Log Store" that should be removed.

removed

@JoaoBraveCoding
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 12, 2025
@theashiot
Copy link
Contributor Author

Thanks, @JoaoBraveCoding!

@theashiot
Copy link
Contributor Author

Hi @anpingli, @kabirbhartiRH, @QiaolingTang, can you please provide a QE review for the changes?

thanks,
ashwin

@kabirbhartiRH
Copy link

/lgtm

@theashiot
Copy link
Contributor Author

Thanks, @kabirbhartiRH!

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 16, 2025

@theashiot: This pull request references OBSDOCS-1726 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-1726

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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.

@theashiot
Copy link
Contributor Author

/label peer-review-required

Copy link

openshift-ci bot commented Jun 16, 2025

@theashiot: The label(s) /label peer-review-required cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, downstream-change-needed, rebase/manual, cluster-config-api-changed, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, cloud-experts, cnv, dev-tools, distributed-tracing, ims, jira/valid-bug, merge-review-in-progress, merge-review-needed, mtc, multi-arch, oadp, peer-review-done, peer-review-in-progress, peer-review-needed, rhacs, rhv, sd-docs, serverless, service-mesh, sme-review-done, sme-review-needed, stability-fix-approved, staff-eng-approved, telco. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label peer-review-required

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.

@theashiot
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 16, 2025
@jeana-redhat jeana-redhat added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Jun 16, 2025
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Nice migration! A couple issues I would address in the ccoctl intro, and otherwise just some docs plumbing that should accompany this type of work

/remove-label peer-review-in-progress
/remove-label peer-review-needed
/label peer-review-done

[id="installing-log-storage-loki-sts"]
=== Deploying a Loki log store on a cluster that uses short-term credentials

For some storage providers, you can use the CCO utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {ocp-product-title} cluster. link:https://docs.openshift.com/container-platform/latest/authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components].
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
For some storage providers, you can use the CCO utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {ocp-product-title} cluster. link:https://docs.openshift.com/container-platform/latest/authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds[Manual mode with short-term credentials for components].
For some storage providers, you can use the Cloud Credential Operator utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {ocp-product-title} cluster. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/authentication_and_authorization/managing-cloud-provider-credentials#cco-short-term-creds[Manual mode with short-term credentials for components].

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done!

Copy link
Contributor

Choose a reason for hiding this comment

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

Every module in this assembly should be updated to have the assembly listed under

// Module included in the following assemblies:

And if they are no longer included in e.g. configuring/configuring-lokistack-storage.adoc, that line should be removed from the list

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks, I know that's a pain!

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 16, 2025
@theashiot theashiot force-pushed the OBSDOCS-1726-standalone branch from dae433a to 52d65a2 Compare June 16, 2025 20:05
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2025
Copy link

openshift-ci bot commented Jun 16, 2025

New changes are detected. LGTM label has been removed.

@theashiot theashiot force-pushed the OBSDOCS-1726-standalone branch 2 times, most recently from 0217378 to 67889fe Compare June 16, 2025 20:23
@theashiot
Copy link
Contributor Author

Thanks, @jeana-redhat for the review!

best,
ashwin

@theashiot
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 Jun 17, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 17, 2025

@theashiot: This pull request references OBSDOCS-1726 which is a valid jira issue.

In response to this:

Version(s): 6.0+

Issue: https://issues.redhat.com/browse/OBSDOCS-1726

Link to docs preview: https://94423--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html

QE review:

  • QE has approved this change.

Additional information: To be cherry-picked to: standalone-logging-docs-6.3, standalone-logging-docs-6.2, standalone-logging-docs-6.1, standalone-logging-docs-6.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 openshift-eng/jira-lifecycle-plugin repository.

@kcarmichael08 kcarmichael08 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 Jun 17, 2025
Copy link
Contributor

@kcarmichael08 kcarmichael08 left a comment

Choose a reason for hiding this comment

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

Looks good, but I would fix the filename in the metadata just to avoid future confusion.

//
// * logging/log_storage/installing-log-storage.adoc
// * configuring/configuring-the-log-storage.adoc
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like filename is configuring-the-log-store and not configuring-the-log-storage? Not a big deal but could be confusing for someone unfamiliar with the docs so I would fix this in the modules.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed!

@kcarmichael08 kcarmichael08 removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jun 17, 2025
@theashiot theashiot force-pushed the OBSDOCS-1726-standalone branch from 67889fe to 61a696a Compare June 17, 2025 14:59
Copy link

openshift-ci bot commented Jun 17, 2025

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

@theashiot
Copy link
Contributor Author

Thanks, @kcarmichael08 for the review! I've updated the file name in all the relevant modules.

@kcarmichael08 kcarmichael08 added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jun 17, 2025
@kcarmichael08 kcarmichael08 merged commit b5f1ebe into openshift:standalone-logging-docs-main Jun 17, 2025
2 checks passed
@kcarmichael08
Copy link
Contributor

/cherrypick standalone-logging-docs-6.3

@kcarmichael08
Copy link
Contributor

/cherrypick standalone-logging-docs-6.2

@kcarmichael08
Copy link
Contributor

standalone-logging-docs-6.1

@kcarmichael08
Copy link
Contributor

/cherrypick standalone-logging-docs-6.1

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #94860

In response to this:

/cherrypick standalone-logging-docs-6.3

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.

@kcarmichael08
Copy link
Contributor

/cherrypick standalone-logging-docs-6.0

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #94861

In response to this:

/cherrypick standalone-logging-docs-6.2

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

@kcarmichael08: #94423 failed to apply on top of branch "standalone-logging-docs-6.1":

Applying: OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	configuring/configuring-lokistack-storage.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): configuring/configuring-lokistack-storage.adoc deleted in OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs and modified in HEAD. Version HEAD of configuring/configuring-lokistack-storage.adoc left in tree.
Auto-merging _topic_maps/_topic_map.yml
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 OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs

In response to this:

/cherrypick standalone-logging-docs-6.1

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

@kcarmichael08: #94423 failed to apply on top of branch "standalone-logging-docs-6.0":

Applying: OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	configuring/configuring-lokistack-storage.adoc
M	modules/loki-retention.adoc
A	modules/loki-sizing.adoc
M	modules/loki-zone-fail-recovery.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/loki-zone-fail-recovery.adoc
CONFLICT (content): Merge conflict in modules/loki-zone-fail-recovery.adoc
Auto-merging modules/loki-retention.adoc
Auto-merging modules/loki-deployment-sizing.adoc
CONFLICT (content): Merge conflict in modules/loki-deployment-sizing.adoc
CONFLICT (modify/delete): configuring/configuring-lokistack-storage.adoc deleted in OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs and modified in HEAD. Version HEAD of configuring/configuring-lokistack-storage.adoc left in tree.
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
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 OBSDOCS-1726: Port the "Installing log storage" sections to 5.8 and 6.y docs

In response to this:

/cherrypick standalone-logging-docs-6.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
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants