[release-6.0]LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124

[vparfonov]

Description

manual cherry-pick for #2830

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

• Depending on PR(s):
• Bugzilla:
• Github issue:
• JIRA: https://issues.redhat.com/browse/LOG-6236
• Enhancement proposal:

[openshift-ci-robot]

@vparfonov: This pull request references LOG-6236 which is a valid jira issue.

In response to this:

Description

manual cherry-pick for #2830

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

• Depending on PR(s):
• Bugzilla:
• Github issue:
• JIRA:
• Enhancement proposal:

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]

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

[vparfonov]

/assign @jcantrill

[vparfonov]

/cherry-pick release-5.9

[openshift-cherrypick-robot]

@vparfonov: 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:

/cherry-pick 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]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, vparfonov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• 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-cherrypick-robot]

@vparfonov: cannot checkout <!--: error checking out "<!--": exit status 1 error: pathspec '<!--' did not match any file(s) known to git

In response to this:

Description

manual cherry-pick for #2830

/cc @cahartma @Clee2691
/assign @jcantrill

/cherry-pick

Links

• Depending on PR(s):
• Bugzilla:
• Github issue:
• JIRA:
• Enhancement proposal:

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]

@vparfonov: #2910 failed to apply on top of branch "release-5.9":

Applying: LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124
.git/rebase-apply/patch:37: space before tab in indent.
   	._internal.syslog.tag = replace(._internal.syslog.tag, r'[^a-zA-Z0-9]', "")
.git/rebase-apply/patch:92: space before tab in indent.
   	._internal.syslog.tag = join!([.kubernetes.namespace_name, .kubernetes.pod_name, .kubernetes.container_name], "")
.git/rebase-apply/patch:93: space before tab in indent.
   	._internal.syslog.severity = .level
.git/rebase-apply/patch:94: space before tab in indent.
   	._internal.syslog.facility = "user"
.git/rebase-apply/patch:95: space before tab in indent.
   	#Remove non-alphanumeric characters
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	internal/generator/vector/output/syslog/syslog.go
M	internal/generator/vector/output/syslog/syslog_test.go
A	internal/generator/vector/output/syslog/tcp_with_defaults.toml
A	internal/generator/vector/output/syslog/tcp_with_tuning.toml
A	internal/generator/vector/output/syslog/tls_with_field_references.toml
A	internal/generator/vector/output/syslog/udp_with_every_setting.toml
A	internal/generator/vector/output/syslog/xyz_defaults.toml
M	test/functional/outputs/syslog/forward_to_syslog_test.go
M	test/functional/outputs/syslog/rfc3164_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/functional/outputs/syslog/rfc3164_test.go
CONFLICT (content): Merge conflict in test/functional/outputs/syslog/rfc3164_test.go
Auto-merging test/functional/outputs/syslog/forward_to_syslog_test.go
CONFLICT (content): Merge conflict in test/functional/outputs/syslog/forward_to_syslog_test.go
CONFLICT (modify/delete): internal/generator/vector/output/syslog/xyz_defaults.toml deleted in HEAD and modified in LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124. Version LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124 of internal/generator/vector/output/syslog/xyz_defaults.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/output/syslog/udp_with_every_setting.toml deleted in HEAD and modified in LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124. Version LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124 of internal/generator/vector/output/syslog/udp_with_every_setting.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/output/syslog/tls_with_field_references.toml deleted in HEAD and modified in LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124. Version LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124 of internal/generator/vector/output/syslog/tls_with_field_references.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/output/syslog/tcp_with_tuning.toml deleted in HEAD and modified in LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124. Version LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124 of internal/generator/vector/output/syslog/tcp_with_tuning.toml left in tree.
CONFLICT (modify/delete): internal/generator/vector/output/syslog/tcp_with_defaults.toml deleted in HEAD and modified in LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124. Version LOG-6236: Align syslog output implementation with spec RFC3164 and RFC5124 of internal/generator/vector/output/syslog/tcp_with_defaults.toml left in tree.
Auto-merging internal/generator/vector/output/syslog/syslog_test.go
CONFLICT (content): Merge conflict in internal/generator/vector/output/syslog/syslog_test.go
Auto-merging internal/generator/vector/output/syslog/syslog.go
CONFLICT (content): Merge conflict in internal/generator/vector/output/syslog/syslog.go
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-6236: Align syslog output implementation with spec RFC3164 and RFC5124

In response to this:

/cherry-pick 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.