Skip to content
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

Merged
merged 6 commits into from
Nov 29, 2022

Conversation

kkujawa-sumo
Copy link
Contributor

@kkujawa-sumo kkujawa-sumo commented Nov 24, 2022

  • tests(fluentd): add tests for setting logs metadata

  • chore!: move parameters from fluentd.logs.containers into sumologic.log.container

    • move fluentd.logs.containers.sourceHost to sumologic.log.container.sourceHost
    • move fluentd.logs.containers.sourceName to sumologic.log.container.sourceName
    • move fluentd.logs.contianers.sourceCategory to sumologic.log.container.sourceCategory
    • move fluentd.logs.containers.sourceCategoryPrefix to sumologic.log.container.sourceCategoryPrefix
    • move fluentd.logs.contianers.sourceCategoryReplaceDash to sumologic.log.container.sourceCategoryReplaceDash
    • move fluentd.logs.containers.excludeContainerRegex to sumologic.log.container.excludeContainerRegex
    • move fluentd.logs.containers.excludeHostRegex to sumologic.log.container.excludeHostRegex
    • move fluentd.logs.containers.excludeNamespaceRegex to sumologic.log.container.excludeNamespaceRegex
    • move fluentd.logs.containers.excludePodRegex to sumologic.log.container.excludePodRegex
    • move fluentd.logs.containers.sourceHost to sumologic.log.container.sourceHost
    • move fluentd.logs.containers.perContainerAnnotationsEnabled to sumologic.log.container.perContainerAnnotationsEnabled
    • move fluentd.logs.containers.perContainerAnnotationPrefixes to sumologic.log.container.perContainerAnnotationPrefixes
  • chore!: move parameters from fluentd.logs.kubelet into sumologic.logs.kubelet

    • 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
  • chore!: move parameters from fluentd.logs.systemd to sumologic.log.systemd

    • 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.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
  • chore!: move parameters from fluentd.logs.default to sumologic.logs.defaultFluentd

    • 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

@swiatekm swiatekm force-pushed the feat/logs-metadata-config branch 2 times, most recently from ae8d028 to 037f630 Compare November 24, 2022 11:25
Base automatically changed from feat/logs-metadata-config to main November 24, 2022 14:16
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from 70a165d to 2ca86fc Compare November 24, 2022 14:54
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from 2ca86fc to 846ba7c Compare November 24, 2022 14:55
@github-actions github-actions bot removed the documentation documentation label Nov 24, 2022
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from 846ba7c to 96db415 Compare November 24, 2022 14:56
@kkujawa-sumo kkujawa-sumo added this to the v3.0 milestone Nov 24, 2022
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch 3 times, most recently from 3c7a1df to a2e0daf Compare November 25, 2022 13:08
@github-actions github-actions bot added the documentation documentation label Nov 28, 2022
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch 2 times, most recently from e6409f1 to b58d706 Compare November 28, 2022 12:18
@kkujawa-sumo kkujawa-sumo changed the title [WIP] Remove references to fluentd logs configuration in otelcol logs configuration Remove references to fluentd logs configuration in otelcol logs configuration Nov 28, 2022
@kkujawa-sumo kkujawa-sumo marked this pull request as ready for review November 28, 2022 12:21
@kkujawa-sumo kkujawa-sumo requested a review from a team as a code owner November 28, 2022 12:21
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from b58d706 to 9b7e7cb Compare November 28, 2022 12:29
Copy link

@swiatekm swiatekm left a 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.

@kkujawa-sumo kkujawa-sumo self-assigned this Nov 28, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from 9b7e7cb to 220e43c Compare November 29, 2022 08:16
Copy link
Contributor

@sumo-drosiek sumo-drosiek left a 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`
@kkujawa-sumo kkujawa-sumo force-pushed the kk-remove-fluentd-references-in-otelcol-config branch from 220e43c to c7cf6ea Compare November 29, 2022 09:36
Copy link
Contributor

@andrzej-stencel andrzej-stencel left a 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 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants