Skip to content

Conversation

@theashiot
Copy link
Contributor

@theashiot theashiot commented Jun 7, 2025

Version(s): 6.0+

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

Link to docs preview: https://94410--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-log-forwarding.html

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 7, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jun 7, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@theashiot
Copy link
Contributor Author

/test all

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 7, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jun 7, 2025

@theashiot theashiot force-pushed the config-log-forwarding-2 branch from 9ea74ae to 42f7c5b Compare June 13, 2025 12:49
@theashiot theashiot marked this pull request as ready for review June 16, 2025 12:37
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2025
@theashiot theashiot force-pushed the config-log-forwarding-2 branch from 42f7c5b to 850fefa Compare August 13, 2025 07:35
@theashiot theashiot changed the title config-log-forwarding-2 PT2: Port the Log collection and forwarding chapter to 6.x Aug 15, 2025
@theashiot theashiot force-pushed the config-log-forwarding-2 branch 2 times, most recently from d46c304 to da4df46 Compare September 1, 2025 13:03
@QiaolingTang
Copy link

LGTM.

@theashiot
Copy link
Contributor Author

Thanks, @QiaolingTang!

Copy link
Contributor

@gabriel-rh gabriel-rh left a comment

Choose a reason for hiding this comment

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

LGTM - only very minor suggestions

@theashiot theashiot force-pushed the config-log-forwarding-2 branch from 7be1ae9 to 2a8af90 Compare September 16, 2025 12:28
@theashiot
Copy link
Contributor Author

Thanks, @gabriel-rh for the review!
best,
ashwin

Copy link
Contributor

@briandooley briandooley left a comment

Choose a reason for hiding this comment

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

Need to fix typo. Also, the "Versions" in the initial description is blank. These must be resolved before merging.

@theashiot theashiot force-pushed the config-log-forwarding-2 branch from 2a8af90 to 799a31c Compare September 17, 2025 08:41
@theashiot
Copy link
Contributor Author

/retest

@theashiot
Copy link
Contributor Author

Thanks, @briandooley for the review, I've made the required changes.

best,

ashwin

Copy link
Contributor

@briandooley briandooley left a comment

Choose a reason for hiding this comment

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

Fix typo.

@theashiot theashiot force-pushed the config-log-forwarding-2 branch from 799a31c to bd6fe50 Compare September 17, 2025 10:25
@theashiot theashiot force-pushed the config-log-forwarding-2 branch from bd6fe50 to ee280a4 Compare September 17, 2025 11:06
@openshift-ci
Copy link

openshift-ci bot commented Sep 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.

@briandooley briandooley merged commit 5a2bc54 into openshift:standalone-logging-docs-main Sep 17, 2025
2 checks passed
@briandooley
Copy link
Contributor

/cherrypick standalone-logging-docs-6.0

@briandooley
Copy link
Contributor

/cherrypick standalone-logging-docs-6.1

@briandooley
Copy link
Contributor

/cherrypick standalone-logging-docs-6.2

@briandooley
Copy link
Contributor

/cherrypick standalone-logging-docs-6.3

@briandooley
Copy link
Contributor

/cherrypick standalone-logging-docs-6.4

@openshift-cherrypick-robot

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

Applying: OBSDOCS-2306: PT2: Port the Log collection and forwarding chapter to 6.x
.git/rebase-apply/patch:101: trailing whitespace.
  serviceAccount: 
.git/rebase-apply/patch:250: trailing whitespace.
 
.git/rebase-apply/patch:285: trailing whitespace.
    type: application    #<2> 
.git/rebase-apply/patch:288: trailing whitespace.
      - namespace: my-project 
.git/rebase-apply/patch:348: trailing whitespace.
<4> Specify the labels to be applied to log records passing through this pipeline. These labels appear in the `openshift.labels` map in the log record. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	configuring/configuring-log-forwarding.adoc
Falling back to patching base and 3-way merge...
Auto-merging configuring/configuring-log-forwarding.adoc
CONFLICT (content): Merge conflict in configuring/configuring-log-forwarding.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 OBSDOCS-2306: PT2: Port the Log collection and forwarding chapter to 6.x

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.

@openshift-cherrypick-robot

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

Applying: OBSDOCS-2306: PT2: Port the Log collection and forwarding chapter to 6.x
.git/rebase-apply/patch:101: trailing whitespace.
  serviceAccount: 
.git/rebase-apply/patch:250: trailing whitespace.
 
.git/rebase-apply/patch:285: trailing whitespace.
    type: application    #<2> 
.git/rebase-apply/patch:288: trailing whitespace.
      - namespace: my-project 
.git/rebase-apply/patch:348: trailing whitespace.
<4> Specify the labels to be applied to log records passing through this pipeline. These labels appear in the `openshift.labels` map in the log record. 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	configuring/configuring-log-forwarding.adoc
Falling back to patching base and 3-way merge...
Auto-merging configuring/configuring-log-forwarding.adoc
CONFLICT (content): Merge conflict in configuring/configuring-log-forwarding.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 OBSDOCS-2306: PT2: Port the Log collection and forwarding chapter to 6.x

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

@briandooley: new pull request created: #99194

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

@briandooley: new pull request created: #99195

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.

@openshift-cherrypick-robot

@briandooley: new pull request created: #99196

In response to this:

/cherrypick standalone-logging-docs-6.4

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