cluster-logging-operator
cluster-logging-operator copied to clipboard
openshift
LOG-5998: fix max_line_bytes for audit logs
Description
This PR:
- bumps the max_line_bytes for audit logs
- bumps the max_read_line_bytes for audit logs
Links
https://issues.redhat.com/browse/LOG-5998
@jcantrill: This pull request references LOG-5998 which is a valid jira issue.
In response to this:
Description
This PR:
- bumps the max_line_bytes for audit logs
- bumps the max_read_line_bytes for audit logs
Links
https://issues.redhat.com/browse/LOG-5998
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.
@jcantrill: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.
In response to this:
/cherrypick master
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.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: jcantrill
The full list of commands accepted by this bot can be found here.
The pull request process is described here
- ~~OWNERS~~ [jcantrill]
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
![openshift-ci[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@jcantrill: once the present PR merges, I will cherry-pick it on top of release-5.9 in a new PR and assign it to you.
In response to this:
/cherrypick release-5.9
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.
/retest-required
Remaining retests: 0 against base HEAD a047172b3433ed9a6cf6ed985b62d13cc09c17ae and 2 for PR HEAD cfb49fc70aad547b7d28519f5e11ad7351c2f782 in total
/retest-required
Remaining retests: 0 against base HEAD a047172b3433ed9a6cf6ed985b62d13cc09c17ae and 2 for PR HEAD cfb49fc70aad547b7d28519f5e11ad7351c2f782 in total
@jcantrill: 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.
@jcantrill: new pull request created: #2861
In response to this:
/cherrypick master
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.
@jcantrill: #2844 failed to apply on top of branch "release-5.9":
Applying: LOG-5998: fix max_line_bytes for audit logs
Using index info to reconstruct a base tree...
M internal/generator/vector/conf/complex.toml
M internal/generator/vector/conf/complex_http_receiver.toml
A internal/generator/vector/input/audit.toml
A internal/generator/vector/input/audit_host.toml
A internal/generator/vector/input/audit_kube.toml
A internal/generator/vector/input/audit_openshift.toml
A internal/generator/vector/input/audit_ovn.toml
M internal/generator/vector/source/audit_logs.go
Falling back to patching base and 3-way merge...
Auto-merging internal/generator/vector/source/audit_logs.go
CONFLICT (content): Merge conflict in internal/generator/vector/source/audit_logs.go
CONFLICT (modify/delete): internal/generator/vector/input/audit_ovn.toml deleted in HEAD and modified in LOG-5998: fix max_line_bytes for audit logs. Version LOG-5998: fix max_line_bytes for audit logs of internal/generator/vector/input/audit_ovn.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/input/audit_openshift.toml deleted in HEAD and modified in LOG-5998: fix max_line_bytes for audit logs. Version LOG-5998: fix max_line_bytes for audit logs of internal/generator/vector/input/audit_openshift.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/input/audit_kube.toml deleted in HEAD and modified in LOG-5998: fix max_line_bytes for audit logs. Version LOG-5998: fix max_line_bytes for audit logs of internal/generator/vector/input/audit_kube.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/input/audit_host.toml deleted in HEAD and modified in LOG-5998: fix max_line_bytes for audit logs. Version LOG-5998: fix max_line_bytes for audit logs of internal/generator/vector/input/audit_host.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/input/audit.toml deleted in HEAD and modified in LOG-5998: fix max_line_bytes for audit logs. Version LOG-5998: fix max_line_bytes for audit logs of internal/generator/vector/input/audit.toml left in tree.
Auto-merging internal/generator/vector/conf/complex_http_receiver.toml
CONFLICT (content): Merge conflict in internal/generator/vector/conf/complex_http_receiver.toml
Auto-merging internal/generator/vector/conf/complex.toml
CONFLICT (content): Merge conflict in internal/generator/vector/conf/complex.toml
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 LOG-5998: fix max_line_bytes for audit logs
In response to this:
/cherrypick release-5.9
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.
@jcantrill: new pull request created: #2877
In response to this:
/cherrypick release-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.