Skip to content

Commit eb038e1

Browse files
rnishtala-sumornishtala-sumo
committed
Move the compression config to the top-level, change default to gzip
1 parent 99b58e2 commit eb038e1

31 files changed

+73
-66
lines changed

‎.changelog/3705.added.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
feat(compression): Make the compression type configurable, default: zstd
1+
feat(compression): Make the compression type configurable, default: gzip

‎deploy/helm/sumologic/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
432432
| `otellogswindows.metrics.enabled` | Enable OpenTelemetry Logs Collector for Windows Nodes metrics | `true` |
433433
| `otellogswindows.serviceLabels` | Add custom labels to OpenTelemetry Logs Collector for Windows Nodes Service | `{}` |
434434
| `otellogswindows.additionalDaemonSets` | OpenTelemetry Logs Collector for Windows Nodes Daemonset per node customization options. See [Best Practices](https://help.sumologic.com/docs/send-data/kubernetes/best-practices/#setting-different-resources-on-different-nodes-for-logs-collector). | `{}` |
435-
| `metadata.compression` | Compression for logs, metrics and events | `zstd` |
435+
| `compression` | Compression for logs, metrics and events | `gzip` |
436436
| `metadata.image.repository` | Image repository for otelcol docker container. | `` |
437437
| `metadata.image.tag` | Image tag for otelcol docker container. | `` |
438438
| `metadata.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` |

‎deploy/helm/sumologic/conf/events/otelcol/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ exporters:
22
sumologic:
33
client: {{ include "sumologic.sumo_client" . }}
44
endpoint: {{ include "sumologic.events.exporter.endpoint" . }}
5-
compression: {{ .Values.metadata.compression }}
5+
compression: {{ .Values.compression }}
66
log_format: {{ include "sumologic.events.exporter.format" . }}
77
sending_queue:
88
enabled: true
@@ -19,7 +19,7 @@ exporters:
1919
sumologic/sumologic-mock:
2020
client: {{ include "sumologic.sumo_client" . }}
2121
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
22-
compression: {{ .Values.metadata.compression }}
22+
compression: {{ .Values.compression }}
2323
log_format: {{ include "sumologic.events.exporter.format" . }}
2424
sending_queue:
2525
enabled: true

‎deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
exporters:
22
otlphttp:
33
endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.{{ .Values.sumologic.clusterDNSDomain }}.:4318
4-
compression: {{ .Values.metadata.compression }}
4+
compression: {{ .Values.compression }}
55
sending_queue:
66
queue_size: 10
77
# this improves load balancing at the cost of more network traffic

‎deploy/helm/sumologic/conf/logs/otelcol/config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exporters:
88
{{ if .Values.sumologic.logs.container.enabled }}
99
sumologic/containers:
1010
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
11-
compression: {{ .Values.metadata.compression }}
11+
compression: {{ .Values.compression }}
1212
log_format: {{ include "logs.otelcol.container.exporter.format" . }}
1313
sending_queue:
1414
enabled: true
@@ -21,7 +21,7 @@ exporters:
2121
{{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }}
2222
sumologic/sumologic-mock-containers:
2323
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
24-
compression: {{ .Values.metadata.compression }}
24+
compression: {{ .Values.compression }}
2525
log_format: {{ include "logs.otelcol.container.exporter.format" . }}
2626
sending_queue:
2727
enabled: true
@@ -37,7 +37,7 @@ exporters:
3737
{{ if .Values.sumologic.logs.systemd.enabled }}
3838
sumologic/systemd:
3939
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
40-
compression: {{ .Values.metadata.compression }}
40+
compression: {{ .Values.compression }}
4141
log_format: json
4242
sending_queue:
4343
enabled: true
@@ -50,7 +50,7 @@ exporters:
5050
{{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }}
5151
sumologic/sumologic-mock-systemd:
5252
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
53-
compression: {{ .Values.metadata.compression }}
53+
compression: {{ .Values.compression }}
5454
log_format: json
5555
sending_queue:
5656
enabled: true
@@ -67,7 +67,7 @@ exporters:
6767
sumologic:
6868
client: {{ include "sumologic.sumo_client" . }}
6969
endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE}
70-
compression: {{ .Values.metadata.compression }}
70+
compression: {{ .Values.compression }}
7171
log_format: otlp
7272
sending_queue:
7373
enabled: true
@@ -81,7 +81,7 @@ exporters:
8181
sumologic/sumologic-mock:
8282
client: {{ include "sumologic.sumo_client" . }}
8383
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
84-
compression: {{ .Values.metadata.compression }}
84+
compression: {{ .Values.compression }}
8585
log_format: otlp
8686
sending_queue:
8787
enabled: true

‎deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exporters:
77
{{- end }}
88
otlphttp:
99
endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.{{ .Values.sumologic.clusterDNSDomain }}.:4318
10+
compression: {{ .Values.compression }}
1011
sending_queue:
1112
queue_size: 10000
1213
num_consumers: 10

‎deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sumologic/sumologic-mock-default:
88
client: {{ include "sumologic.sumo_client" . }}
99
metric_format: {{ include "metrics.otelcol.exporter.format" . }}
1010
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
11-
compression: {{ .Values.metadata.compression }}
11+
compression: {{ .Values.compression }}
1212
## Sumo doesn't yet natively support OTLP Histograms
1313
decompose_otlp_histograms: true
1414
## Configuration for sending queue
@@ -30,7 +30,7 @@ sumologic/sumologic-mock-http:
3030
client: {{ include "sumologic.sumo_client" . }}
3131
metric_format: prometheus
3232
endpoint: {{ include "sumologic-mock.receiver-endpoint" . }}
33-
compression: {{ .Values.metadata.compression }}
33+
compression: {{ .Values.compression }}
3434
sending_queue:
3535
enabled: true
3636
{{- if .Values.metadata.persistence.enabled }}
@@ -49,7 +49,7 @@ sumologic/default:
4949
client: {{ include "sumologic.sumo_client" . }}
5050
metric_format: {{ include "metrics.otelcol.exporter.format" . }}
5151
endpoint: {{ include "metrics.otelcol.exporter.endpoint" . }}
52-
compression: {{ .Values.metadata.compression }}
52+
compression: {{ .Values.compression }}
5353
## Sumo doesn't yet natively support OTLP Histograms
5454
decompose_otlp_histograms: true
5555
## Configuration for sending queue
@@ -71,7 +71,7 @@ sumologic/apiserver:
7171
client: {{ include "sumologic.sumo_client" . }}
7272
metric_format: prometheus
7373
endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE}
74-
compression: {{ .Values.metadata.compression }}
74+
compression: {{ .Values.compression }}
7575
sending_queue:
7676
enabled: true
7777
{{- if .Values.metadata.persistence.enabled }}
@@ -86,7 +86,7 @@ sumologic/control_plane:
8686
client: {{ include "sumologic.sumo_client" . }}
8787
metric_format: prometheus
8888
endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE}
89-
compression: {{ .Values.metadata.compression }}
89+
compression: {{ .Values.compression }}
9090
sending_queue:
9191
enabled: true
9292
{{- if .Values.metadata.persistence.enabled }}
@@ -101,7 +101,7 @@ sumologic/controller:
101101
client: {{ include "sumologic.sumo_client" . }}
102102
metric_format: prometheus
103103
endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE}
104-
compression: {{ .Values.metadata.compression }}
104+
compression: {{ .Values.compression }}
105105
sending_queue:
106106
enabled: true
107107
{{- if .Values.metadata.persistence.enabled }}
@@ -116,7 +116,7 @@ sumologic/kubelet:
116116
client: {{ include "sumologic.sumo_client" . }}
117117
metric_format: prometheus
118118
endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE}
119-
compression: {{ .Values.metadata.compression }}
119+
compression: {{ .Values.compression }}
120120
sending_queue:
121121
enabled: true
122122
{{- if .Values.metadata.persistence.enabled }}
@@ -131,7 +131,7 @@ sumologic/node:
131131
client: {{ include "sumologic.sumo_client" . }}
132132
metric_format: prometheus
133133
endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE}
134-
compression: {{ .Values.metadata.compression }}
134+
compression: {{ .Values.compression }}
135135
sending_queue:
136136
enabled: true
137137
{{- if .Values.metadata.persistence.enabled }}
@@ -146,7 +146,7 @@ sumologic/scheduler:
146146
client: {{ include "sumologic.sumo_client" . }}
147147
metric_format: prometheus
148148
endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE}
149-
compression: {{ .Values.metadata.compression }}
149+
compression: {{ .Values.compression }}
150150
sending_queue:
151151
enabled: true
152152
{{- if .Values.metadata.persistence.enabled }}
@@ -161,7 +161,7 @@ sumologic/state:
161161
client: {{ include "sumologic.sumo_client" . }}
162162
metric_format: prometheus
163163
endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE}
164-
compression: {{ .Values.metadata.compression }}
164+
compression: {{ .Values.compression }}
165165
sending_queue:
166166
enabled: true
167167
{{- if .Values.metadata.persistence.enabled }}

‎deploy/helm/sumologic/values.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ fullnameOverride: ""
66
## Use the same namespace as namespaceOverride in 'kube-prometheus-stack.namespaceOverride' if Prometheus setup is also enabled
77
namespaceOverride: ""
88

9+
## Compression for logs, metrics and events
10+
## Compression types can be gzip, snappy, zstd or deflate
11+
## Default is gzip
12+
compression: gzip
13+
914
sumologic:
1015
### Setup
1116

@@ -1556,9 +1561,6 @@ metadata:
15561561
## Add custom labels to all otelcol statefulset PVC (logs and metrics)
15571562
pvcLabels: {}
15581563

1559-
## Compression for logs, metrics and events:
1560-
compression: zstd
1561-
15621564
## Configure metrics pipeline.
15631565
## This section affects only otelcol provider.
15641566
metrics:

‎tests/helm/testdata/goldenfile/events_otc/basic.output.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data:
1515
exporters:
1616
sumologic:
1717
client: k8s_%CURRENT_CHART_VERSION%
18-
compression: zstd
18+
compression: gzip
1919
endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
2020
log_format: otlp
2121
sending_queue:

‎tests/helm/testdata/goldenfile/events_otc/options.output.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ data:
1515
exporters:
1616
sumologic:
1717
client: k8s_%CURRENT_CHART_VERSION%
18-
compression: zstd
18+
compression: gzip
1919
endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE}
2020
log_format: otlp
2121
sending_queue:

0 commit comments

Comments
 (0)