-
Notifications
You must be signed in to change notification settings - Fork 183
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
Remove references to fluentd logs configuration in otelcol logs configuration #2635
Remove references to fluentd logs configuration in otelcol logs configuration #2635
Conversation
ae8d028
to
037f630
Compare
70a165d
to
2ca86fc
Compare
2ca86fc
to
846ba7c
Compare
846ba7c
to
96db415
Compare
3c7a1df
to
a2e0daf
Compare
e6409f1
to
b58d706
Compare
b58d706
to
9b7e7cb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This all looks good to me, but I'd prefer if someone else reviewed it as well, since it's a pretty big change.
9b7e7cb
to
220e43c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
….container - move `fluentd.logs.containers.sourceHost` to `sumologic.logs.container.sourceHost` - move `fluentd.logs.containers.sourceName` to `sumologic.logs.container.sourceName` - move `fluentd.logs.contianers.sourceCategory` to `sumologic.logs.container.sourceCategory` - move `fluentd.logs.containers.sourceCategoryPrefix` to `sumologic.logs.container.sourceCategoryPrefix` - move `fluentd.logs.contianers.sourceCategoryReplaceDash` to `sumologic.logs.container.sourceCategoryReplaceDash` - move `fluentd.logs.containers.excludeContainerRegex` to `sumologic.logs.container.excludeContainerRegex` - move `fluentd.logs.containers.excludeHostRegex` to `sumologic.log.container.excludeHostRegex` - move `fluentd.logs.containers.excludeNamespaceRegex` to `sumologic.logs.container.excludeNamespaceRegex` - move `fluentd.logs.containers.excludePodRegex` to `sumologic.logs.container.excludePodRegex` - move `fluentd.logs.containers.sourceHost` to `sumologic.log.container.sourceHost` - move `fluentd.logs.containers.perContainerAnnotationsEnabled` to `sumologic.logs.container.perContainerAnnotationsEnabled` - move `fluentd.logs.containers.perContainerAnnotationPrefixes` to `sumologic.logs.container.perContainerAnnotationPrefixes`
…ubelet - move `fluentd.logs.kubelet.sourceName` to `sumologic.logs.kubelet.sourceName` - move `fluentd.logs.kubelet.sourceCategory` to `sumologic.logs.kubelet.sourceCategory` - move `fluentd.logs.kubelet.sourceCategoryPrefix` to `sumologic.logs.kubelet.sourceCategoryPrefix` - move `fluentd.logs.kubelet.sourceCategoryReplaceDash` to `sumologic.logs.kubelet.sourceCategoryReplaceDash` - move `fluentd.logs.kubelet.excludeFacilityRegex` to `sumologic.logs.kubelet.excludeFacilityRegex` - move `fluentd.logs.kubelet.excludeHostRegex` to `sumologic.logs.kubelet.excludeHostRegex` - move `fluentd.logs.kubelet.excludePriorityRegex` to `sumologic.logs.kubelet.excludePriorityRegex` - move `fluentd.logs.kubelet.excludeUnitRegex` to `sumologic.logs.kubelet.excludeUnitRegex`
…stemd - move `fluentd.logs.systemd.sourceName` to `sumologic.logs.systemd.sourceName` - move `fluentd.logs.systemd.sourceCategory` to `sumologic.logs.systemd.sourceCategory` - move `fluentd.logs.systemd.sourceCategoryPrefix` to `sumologic.logs.systemd.sourceCategoryPrefix` - move `fluentd.logs.systemd.sourceCategoryReplaceDash` to `sumologic.logs.systemd.sourceCategoryReplaceDash` - move `fluentd.logs.systemd.excludeFacilityRegex` to `sumologic.logs.systemd.excludeFacilityRegex` - move `fluentd.logs.systemd.excludeHostRegex` to `sumologic.logs.systemd.excludeHostRegex` - move `fluentd.logs.systemd.excludePriorityRegex` to `sumologic.logs.systemd.excludePriorityRegex` - move `fluentd.logs.systemd.excludeUnitRegex` to `sumologic.logs.systemd.excludeUnitRegex`
…efaultFluentd - move `fluentd.logs.default.sourceName` to `sumologic.logs.defaultFluentd.sourceName` - move `fluentd.logs.default.sourceCategory` to `sumologic.logs.defaultFluentd.sourceCategory` - move `fluentd.logs.default.sourceCategoryPrefix` to `sumologic.logs.defaultFluentd.sourceCategoryPrefix` - move `fluentd.logs.default.sourceCategoryReplaceDash` to `sumologic.logs.defaultFluentd.sourceCategoryReplaceDash` - move `fluentd.logs.default.excludeFacilityRegex` to `sumologic.logs.defaultFluentd.excludeFacilityRegex` - move `fluentd.logs.default.excludeHostRegex` to `sumologic.logs.defaultFluentd.excludeHostRegex` - move `fluentd.logs.default.excludePriorityRegex` to `sumologic.logs.defaultFluentd.excludePriorityRegex` - move `fluentd.logs.default.excludeUnitRegex` to `sumologic.logs.defaultFluentd.excludeUnitRegex`
220e43c
to
c7cf6ea
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need a migration for this 👍
tests(fluentd): add tests for setting logs metadata
chore!: move parameters from fluentd.logs.containers into sumologic.log.container
fluentd.logs.containers.sourceHost
tosumologic.log.container.sourceHost
fluentd.logs.containers.sourceName
tosumologic.log.container.sourceName
fluentd.logs.contianers.sourceCategory
tosumologic.log.container.sourceCategory
fluentd.logs.containers.sourceCategoryPrefix
tosumologic.log.container.sourceCategoryPrefix
fluentd.logs.contianers.sourceCategoryReplaceDash
tosumologic.log.container.sourceCategoryReplaceDash
fluentd.logs.containers.excludeContainerRegex
tosumologic.log.container.excludeContainerRegex
fluentd.logs.containers.excludeHostRegex
tosumologic.log.container.excludeHostRegex
fluentd.logs.containers.excludeNamespaceRegex
tosumologic.log.container.excludeNamespaceRegex
fluentd.logs.containers.excludePodRegex
tosumologic.log.container.excludePodRegex
fluentd.logs.containers.sourceHost
tosumologic.log.container.sourceHost
fluentd.logs.containers.perContainerAnnotationsEnabled
tosumologic.log.container.perContainerAnnotationsEnabled
fluentd.logs.containers.perContainerAnnotationPrefixes
tosumologic.log.container.perContainerAnnotationPrefixes
chore!: move parameters from fluentd.logs.kubelet into sumologic.logs.kubelet
fluentd.logs.kubelet.sourceName
tosumologic.logs.kubelet.sourceName
fluentd.logs.kubelet.sourceCategory
tosumologic.logs.kubelet.sourceCategory
fluentd.logs.kubelet.sourceCategoryPrefix
tosumologic.logs.kubelet.sourceCategoryPrefix
fluentd.logs.kubelet.sourceCategoryReplaceDash
tosumologic.logs.kubelet.sourceCategoryReplaceDash
fluentd.logs.kubelet.excludeFacilityRegex
tosumologic.logs.kubelet.excludeFacilityRegex
fluentd.logs.kubelet.excludeHostRegex
tosumologic.logs.kubelet.excludeHostRegex
fluentd.logs.kubelet.excludePriorityRegex
tosumologic.logs.kubelet.excludePriorityRegex
fluentd.logs.kubelet.excludeUnitRegex
tosumologic.logs.kubelet.excludeUnitRegex
chore!: move parameters from fluentd.logs.systemd to sumologic.log.systemd
fluentd.logs.systemd.sourceName
tosumologic.logs.systemd.sourceName
fluentd.logs.systemd.sourceCategory
tosumologic.logs.systemd.sourceCategory
fluentd.logs.systemd.sourceCategoryPrefix
tosumologic.logs.systemd.sourceCategoryPrefix
fluentd.logs.systemd.sourceCategoryReplaceDash
tosumologic.logs.systemd.sourceCategoryReplaceDash
fluentd.logs.systemd.sourceCategoryReplaceDash
tosumologic.logs.systemd.sourceCategoryReplaceDash
fluentd.logs.systemd.excludeFacilityRegex
tosumologic.logs.systemd.excludeFacilityRegex
fluentd.logs.systemd.excludeHostRegex
tosumologic.logs.systemd.excludeHostRegex
fluentd.logs.systemd.excludePriorityRegex
tosumologic.logs.systemd.excludePriorityRegex
fluentd.logs.systemd.excludeUnitRegex
tosumologic.logs.systemd.excludeUnitRegex
chore!: move parameters from fluentd.logs.default to sumologic.logs.defaultFluentd
fluentd.logs.default.sourceName
tosumologic.logs.defaultFluentd.sourceName
fluentd.logs.default.sourceCategory
tosumologic.logs.defaultFluentd.sourceCategory
fluentd.logs.default.sourceCategoryPrefix
tosumologic.logs.defaultFluentd.sourceCategoryPrefix
fluentd.logs.default.sourceCategoryReplaceDash
tosumologic.logs.defaultFluentd.sourceCategoryReplaceDash
fluentd.logs.default.excludeFacilityRegex
tosumologic.logs.defaultFluentd.excludeFacilityRegex
fluentd.logs.default.excludeHostRegex
tosumologic.logs.defaultFluentd.excludeHostRegex
fluentd.logs.default.excludePriorityRegex
tosumologic.logs.defaultFluentd.excludePriorityRegex
fluentd.logs.default.excludeUnitRegex
tosumologic.logs.defaultFluentd.excludeUnitRegex