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.

Sign up for GitHub

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

Jump to bottom

feat!: remove support for fluent-bit and fluentd #3244

Merged
merged 24 commits into from Sep 13, 2023
Merged

feat!: remove support for fluent-bit and fluentd #3244

merged 24 commits into from Sep 13, 2023

Conversation

sumo-drosiek
Copy link
Contributor

Checklist

  • Changelog updated or skip changelog label added
  • Documentation updated
  • Template tests added for new features
  • Integration tests added or modified for major features

@sumo-drosiek sumo-drosiek requested a review from a team as a code owner September 5, 2023 07:06
@sumo-drosiek sumo-drosiek force-pushed the drosiek-remove-fluent branch 2 times, most recently from 0d8340a to 34daa12 Compare September 5, 2023 07:22
@sumo-drosiek sumo-drosiek marked this pull request as draft September 5, 2023 07:23
@sumo-drosiek sumo-drosiek force-pushed the drosiek-remove-fluent branch 6 times, most recently from e92a730 to 4d5a3d4 Compare September 5, 2023 12:45
@sumo-drosiek sumo-drosiek added this to the v4.0 milestone Sep 6, 2023
@sumo-drosiek sumo-drosiek marked this pull request as ready for review September 6, 2023 07:33
github-actions[bot]
github-actions bot requested changes Sep 6, 2023
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This pull request contains invalid labels. Please remove all of the following labels: ['do-not-merge/hold']

@sumo-drosiek sumo-drosiek linked an issue Sep 6, 2023 that may be closed by this pull request
Drop support for Fluentd and Fluent Bit #3218
Closed
1 task
swiatekm-sumo
swiatekm-sumo reviewed Sep 7, 2023
View reviewed changes
deploy/helm/sumologic/conf/logs/otelcol/config.yaml
- key: fluent.tag
value: containers\..+
{{ end }}

{{ if .Values.sumologic.logs.systemd.enabled }}
filter/include_fluent_tag_host:
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we create a separate issue to remove these kinds of holdouts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure what you mean by it, but we should get rid of fluent.tag concept

swiatekm-sumo
swiatekm-sumo reviewed Sep 7, 2023
View reviewed changes
docs/v4-migration-doc.md Show resolved Hide resolved
docs/README.md Show resolved Hide resolved
docs/collecting-container-logs.md
@@ -214,8 +214,46 @@ Whereas log line 2 will be displayed as JSON:
}
```

> **Warning** Setting the format to `text` has certain consequences for multiline detection. See [here][troubleshooting_text_format] for
> more details.
##### Problem
Copy link
Contributor

Choose a reason for hiding this comment

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

This is from #3247, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not at that time. I moved it here from fluentd documentation, because it is linked somewhere else (outside of fluentd documentation)

@sumo-drosiek sumo-drosiek enabled auto-merge (squash) September 13, 2023 09:01
@sumo-drosiek
chore: changelog
68fad11 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: fail if fluent is being used
b80866b 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: cleanup values.yaml and Chart.yaml
1357dec 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: cleanup tests
1f04a47 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: remove fluentd enable related helper
676df3d 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: clean up links to docs
2f75c05 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: remove fluent related configuration from otelcol configuration
372510e 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: remove fluentd related docs
ae2a10e 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: fix events template
63ea799 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: cleanup events templates
09cfd10 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: remove fluentd related configuration
6f57edd 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
tests(inegration): remove fluent related tests
0a4835b 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: remove all flunet mentions except few comments and checks
ddcd1b3 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
fix: fix serviceLabels for events
2a970c8 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: use metadata.serviceLabels for events
a0bc1e9 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: fix docs
b61a367 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: make format
9af310e 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
tests: update tests
495c345 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
tests: fix
85772cc 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
docs: init fluent migration section
548a413 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: add link to migration doc to helm fail
969fc16 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
docs: update migration doc
901cd96 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: fix tests
34b19d2 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek
chore: rebase
b19b5b0 
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek sumo-drosiek merged commit 8f0ef5e into main Sep 13, 2023
32 checks passed
@sumo-drosiek sumo-drosiek deleted the drosiek-remove-fluent branch September 13, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions approved these changes

@swiatekm-sumo swiatekm-sumo swiatekm-sumo approved these changes

Assignees
No one assigned
Labels
breaking-change documentation documentation integration-tests
Projects
None yet
Milestone
v4.0
Development

Successfully merging this pull request may close these issues.

Drop support for Fluentd and Fluent Bit
2 participants
@sumo-drosiek @swiatekm-sumo