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

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

Merged
merged 24 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
68fad11
chore: changelog
sumo-drosiek Sep 5, 2023
b80866b
chore: fail if fluent is being used
sumo-drosiek Sep 5, 2023
1357dec
chore: cleanup values.yaml and Chart.yaml
sumo-drosiek Sep 5, 2023
1f04a47
chore: cleanup tests
sumo-drosiek Sep 5, 2023
676df3d
chore: remove fluentd enable related helper
sumo-drosiek Sep 5, 2023
2f75c05
chore: clean up links to docs
sumo-drosiek Sep 5, 2023
372510e
chore: remove fluent related configuration from otelcol configuration
sumo-drosiek Sep 5, 2023
ae2a10e
chore: remove fluentd related docs
sumo-drosiek Sep 5, 2023
63ea799
chore: fix events template
sumo-drosiek Sep 5, 2023
09cfd10
chore: cleanup events templates
sumo-drosiek Sep 5, 2023
6f57edd
chore: remove fluentd related configuration
sumo-drosiek Sep 5, 2023
0a4835b
tests(inegration): remove fluent related tests
sumo-drosiek Sep 5, 2023
ddcd1b3
chore: remove all flunet mentions except few comments and checks
sumo-drosiek Sep 5, 2023
2a970c8
fix: fix serviceLabels for events
sumo-drosiek Sep 5, 2023
a0bc1e9
chore: use metadata.serviceLabels for events
sumo-drosiek Sep 5, 2023
b61a367
chore: fix docs
sumo-drosiek Sep 5, 2023
9af310e
chore: make format
sumo-drosiek Sep 5, 2023
495c345
tests: update tests
sumo-drosiek Sep 5, 2023
85772cc
tests: fix
sumo-drosiek Sep 5, 2023
548a413
docs: init fluent migration section
sumo-drosiek Sep 6, 2023
969fc16
chore: add link to migration doc to helm fail
sumo-drosiek Sep 6, 2023
901cd96
docs: update migration doc
sumo-drosiek Sep 6, 2023
34b19d2
chore: fix tests
sumo-drosiek Sep 12, 2023
b19b5b0
chore: rebase
sumo-drosiek Sep 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3244.breaking.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat!: remove support for fluent-bit and fluentd
17 changes: 0 additions & 17 deletions ci/check_configuration_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@

DESCRIPTION = 'This program verifies if all configuration from values.yaml has been documented.'
SKIP_DEFAULTS = {
'fluent-bit.enabled',
'fluentd.events.extraEnvVars',
'fluentd.events.extraVolumeMounts',
'fluentd.events.extraVolumes',
'fluentd.events.statefulset.initContainers',
'fluentd.logs.autoscaling.targetMemoryUtilizationPercentage',
'fluentd.logs.extraEnvVars',
'fluentd.logs.extraVolumeMounts',
'fluentd.logs.extraVolumes',
'fluentd.logs.podDisruptionBudget',
'fluentd.logs.statefulset.initContainers',
'fluentd.metrics.autoscaling.targetMemoryUtilizationPercentage',
'fluentd.metrics.extraEnvVars',
'fluentd.metrics.extraVolumeMounts',
'fluentd.metrics.extraVolumes',
'fluentd.metrics.statefulset.initContainers',
'fluentd.persistence.storageClass',
'kube-prometheus-stack.enabled',
'kube-prometheus-stack.global.imagePullSecrets',
'metadata.logs.autoscaling.targetMemoryUtilizationPercentage',
Expand Down
3 changes: 0 additions & 3 deletions deploy/docs/Additional_Fluentd_Plugins.md

This file was deleted.

3 changes: 0 additions & 3 deletions deploy/docs/ContainerLogs.md

This file was deleted.

3 changes: 0 additions & 3 deletions deploy/docs/FluentdPersistence.md

This file was deleted.

3 changes: 0 additions & 3 deletions deploy/docs/fluentd_otc_comparison.md

This file was deleted.

4 changes: 0 additions & 4 deletions deploy/helm/sumologic/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ home: https://github.com/SumoLogic/sumologic-kubernetes-collection
sources:
- https://github.com/SumoLogic/sumologic-kubernetes-collection
dependencies:
- name: fluent-bit
version: 0.34.2
repository: https://fluent.github.io/helm-charts
condition: fluent-bit.enabled,sumologic.logs.enabled
- name: kube-prometheus-stack
version: 40.5.0
repository: https://prometheus-community.github.io/helm-charts
Expand Down
1,072 changes: 446 additions & 626 deletions deploy/helm/sumologic/README.md

Large diffs are not rendered by default.

87 changes: 0 additions & 87 deletions deploy/helm/sumologic/conf/events/fluentd/events.conf

This file was deleted.

2 changes: 1 addition & 1 deletion deploy/helm/sumologic/conf/events/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ processors:
value: {{ .Values.sumologic.clusterName | quote }}
source:
collector: {{ .Values.sumologic.collectorName | default .Values.sumologic.clusterName | quote }}
source_category: {{ .Values.sumologic.events.sourceCategory | default (printf "%s/%s" (include "sumologic.clusterNameReplaceSpaceWithDash" .) (.Values.fluentd.events.sourceName )) | quote}}
source_category: {{ .Values.sumologic.events.sourceCategory | default (printf "%s/%s" (include "sumologic.clusterNameReplaceSpaceWithDash" .) (.Values.sumologic.events.sourceName )) | quote}}
source_category_prefix: ""
source_category_replace_dash: {{ .Values.sumologic.events.sourceCategoryReplaceDash | quote}}
source_name: {{ .Values.sumologic.events.sourceName | quote}}
Expand Down
12 changes: 0 additions & 12 deletions deploy/helm/sumologic/conf/fluentd/buffer.output.conf

This file was deleted.

29 changes: 0 additions & 29 deletions deploy/helm/sumologic/conf/fluentd/common.conf

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/helm/sumologic/conf/logs/fluentd/logs.conf

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions deploy/helm/sumologic/conf/logs/fluentd/logs.output.conf

This file was deleted.

130 changes: 0 additions & 130 deletions deploy/helm/sumologic/conf/logs/fluentd/logs.source.containers.conf

This file was deleted.