Skip to content

Conversation

@theashiot
Copy link
Contributor

@theashiot theashiot commented Jun 7, 2025

@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/M Denotes a PR that changes 30-99 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-1 branch from 73b5c15 to 03be7c1 Compare June 11, 2025 11:50
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 11, 2025
Copy link
Contributor Author

@theashiot theashiot left a comment

Choose a reason for hiding this comment

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

Thanks, @jcantrill for the review! I've made some of suggested changes and added comments where I couldn't, and also added a question. Mind having another look?

best,
ashwin

@theashiot theashiot marked this pull request as ready for review June 11, 2025 11:52
@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 11, 2025
@theashiot theashiot force-pushed the config-log-forwarding-1 branch 2 times, most recently from fb7a66e to 067317f Compare August 11, 2025 07:25
@theashiot theashiot changed the title config-log-forwarding-1 PT1: Port the Log collection and forwarding chapter to 6.x Aug 18, 2025
Copy link

@cahartma cahartma left a comment

Choose a reason for hiding this comment

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

Minor change and possibly some verbiage updates/additions.

@theashiot theashiot force-pushed the config-log-forwarding-1 branch from 067317f to 29ee1d6 Compare September 5, 2025 11:08
@theashiot
Copy link
Contributor Author

Thanks, @cahartma for the review! I've made all the changes. Mind having another look?

best,
ashwin

Copy link

@cahartma cahartma left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2025
@theashiot theashiot force-pushed the config-log-forwarding-1 branch from 29ee1d6 to c96af39 Compare September 15, 2025 07:23
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 15, 2025
@openshift-ci
Copy link

openshift-ci bot commented Sep 15, 2025

New changes are detected. LGTM label has been removed.

@QiaolingTang
Copy link

LGTM.

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 - very minor comments, but xref does need to be removed from module

@theashiot theashiot force-pushed the config-log-forwarding-1 branch from c96af39 to 1ff2ca9 Compare September 18, 2025 14:33
@theashiot
Copy link
Contributor Author

Thanks, @gabriel-rh for the review! I've made all the changes.

best,
ashwin

@theashiot
Copy link
Contributor Author

/retest

@theashiot theashiot force-pushed the config-log-forwarding-1 branch from 1ff2ca9 to 5f52bf4 Compare September 19, 2025 11:58
@theashiot theashiot force-pushed the config-log-forwarding-1 branch from 5f52bf4 to 83cd89b Compare September 19, 2025 12:01
@openshift-ci
Copy link

openshift-ci bot commented Sep 19, 2025

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

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

/cherrypick standalone-logging-docs-6.0

@openshift-cherrypick-robot

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

Applying: OBSDOCS-2305: PT1: Port the Log collection and forwarding chapter to 6.x
.git/rebase-apply/patch:233: trailing whitespace.
metadata:  
.git/rebase-apply/patch:240: trailing whitespace.
      type: <output_type> 
.git/rebase-apply/patch:242: trailing whitespace.
    - name: <input_name>  
.git/rebase-apply/patch:243: trailing whitespace.
      type: <input_type>  
.git/rebase-apply/patch:246: trailing whitespace.
      type: <filter_type> 
warning: squelched 1 whitespace error
warning: 6 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-2305: PT1: Port the Log collection and forwarding chapter to 6.x

Details

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.

@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: #94409 failed to apply on top of branch "standalone-logging-docs-6.1":

Applying: OBSDOCS-2305: PT1: Port the Log collection and forwarding chapter to 6.x
.git/rebase-apply/patch:233: trailing whitespace.
metadata:  
.git/rebase-apply/patch:240: trailing whitespace.
      type: <output_type> 
.git/rebase-apply/patch:242: trailing whitespace.
    - name: <input_name>  
.git/rebase-apply/patch:243: trailing whitespace.
      type: <input_type>  
.git/rebase-apply/patch:246: trailing whitespace.
      type: <filter_type> 
warning: squelched 1 whitespace error
warning: 6 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-2305: PT1: Port the Log collection and forwarding chapter to 6.x

Details

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: #99394

Details

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: #99395

Details

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: #94409 failed to apply on top of branch "standalone-logging-docs-6.4":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Details

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