From 661245dce9368857ad126241cef6ee833f5e777c Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Tue, 14 May 2024 14:14:03 -0400 Subject: [PATCH 1/3] feat(compression): Make the compression type configurable, default: zstd --- .changelog/3704.added.txt | 1 + .../helm/sumologic/conf/events/otelcol/config.yaml | 2 ++ .../conf/logs/collector/otelcol/config.yaml | 1 + .../helm/sumologic/conf/logs/otelcol/config.yaml | 14 ++++++++++++++ .../sumologic/conf/metrics/otelcol/exporters.yaml | 10 ++++++++++ deploy/helm/sumologic/values.yaml | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 .changelog/3704.added.txt diff --git a/.changelog/3704.added.txt b/.changelog/3704.added.txt new file mode 100644 index 0000000000..18cec05c59 --- /dev/null +++ b/.changelog/3704.added.txt @@ -0,0 +1 @@ +feat(compression): Make the compression type configurable, default: zstd \ No newline at end of file diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml index 545be3a0bb..21cdd0f553 100644 --- a/deploy/helm/sumologic/conf/events/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/events/otelcol/config.yaml @@ -2,6 +2,7 @@ exporters: sumologic: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic.events.exporter.endpoint" . }} + compression: {{ .Values.metadata.compression }} log_format: {{ include "sumologic.events.exporter.format" . }} sending_queue: enabled: true @@ -18,6 +19,7 @@ exporters: sumologic/sumologic-mock: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} log_format: {{ include "sumologic.events.exporter.format" . }} sending_queue: enabled: true diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index e3b58917f7..95eede8376 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -1,6 +1,7 @@ exporters: otlphttp: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.{{ .Values.sumologic.clusterDNSDomain }}.:4318 + compression: {{ .Values.metadata.compression }} sending_queue: queue_size: 10 # this improves load balancing at the cost of more network traffic diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 351d910819..33fb9d7558 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -8,6 +8,9 @@ exporters: {{ if .Values.sumologic.logs.container.enabled }} sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} + compression: {{ .Values.metadata.compression }} + json_logs: + add_timestamp: false log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -20,6 +23,9 @@ exporters: {{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }} sumologic/sumologic-mock-containers: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} + json_logs: + add_timestamp: false log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -35,6 +41,9 @@ exporters: {{ if .Values.sumologic.logs.systemd.enabled }} sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} + compression: {{ .Values.metadata.compression }} + json_logs: + add_timestamp: false log_format: json sending_queue: enabled: true @@ -47,6 +56,9 @@ exporters: {{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }} sumologic/sumologic-mock-systemd: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} + json_logs: + add_timestamp: false log_format: json sending_queue: enabled: true @@ -63,6 +75,7 @@ exporters: sumologic: client: {{ include "sumologic.sumo_client" . }} endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} + compression: {{ .Values.metadata.compression }} log_format: otlp sending_queue: enabled: true @@ -76,6 +89,7 @@ exporters: sumologic/sumologic-mock: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} log_format: otlp sending_queue: enabled: true diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml index 8af4de2367..72e08ba64e 100644 --- a/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml +++ b/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml @@ -8,6 +8,7 @@ sumologic/sumologic-mock-default: client: {{ include "sumologic.sumo_client" . }} metric_format: {{ include "metrics.otelcol.exporter.format" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} ## Sumo doesn't yet natively support OTLP Histograms decompose_otlp_histograms: true ## Configuration for sending queue @@ -29,6 +30,7 @@ sumologic/sumologic-mock-http: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -47,6 +49,7 @@ sumologic/default: client: {{ include "sumologic.sumo_client" . }} metric_format: {{ include "metrics.otelcol.exporter.format" . }} endpoint: {{ include "metrics.otelcol.exporter.endpoint" . }} + compression: {{ .Values.metadata.compression }} ## Sumo doesn't yet natively support OTLP Histograms decompose_otlp_histograms: true ## Configuration for sending queue @@ -68,6 +71,7 @@ sumologic/apiserver: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -82,6 +86,7 @@ sumologic/control_plane: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -96,6 +101,7 @@ sumologic/controller: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -110,6 +116,7 @@ sumologic/kubelet: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -124,6 +131,7 @@ sumologic/node: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -138,6 +146,7 @@ sumologic/scheduler: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -152,6 +161,7 @@ sumologic/state: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} + compression: {{ .Values.metadata.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 36a707604a..fae72cc00a 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -1555,6 +1555,9 @@ metadata: size: 10Gi ## Add custom labels to all otelcol statefulset PVC (logs and metrics) pvcLabels: {} + + ## Compression for logs, metrics and events: + compression: zstd ## Configure metrics pipeline. ## This section affects only otelcol provider. From 99b58e2939f1341d20a127c1326823ddeac78356 Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Tue, 14 May 2024 15:41:18 -0400 Subject: [PATCH 2/3] Regenerating golden files --- .changelog/{3704.added.txt => 3705.added.txt} | 0 deploy/helm/sumologic/README.md | 1 + deploy/helm/sumologic/conf/logs/otelcol/config.yaml | 8 -------- deploy/helm/sumologic/values.yaml | 2 +- .../testdata/goldenfile/events_otc/basic.output.yaml | 1 + .../testdata/goldenfile/events_otc/options.output.yaml | 1 + .../goldenfile/events_otc/sumologic-mock.output.yaml | 2 ++ .../testdata/goldenfile/logs_otc/basic.output.yaml | 1 + .../testdata/goldenfile/logs_otc/debug.output.yaml | 1 + .../testdata/goldenfile/logs_otc/options.output.yaml | 1 + .../logs_otc_daemonset/multiple_multiline.output.yaml | 1 + .../goldenfile/metadata_logs_otc/debug.output.yaml | 1 + .../debug_with_sumologic_mock.output.yaml | 2 ++ .../debug_with_sumologic_mock_http.output.yaml | 4 ++++ .../goldenfile/metadata_logs_otc/otel.output.yaml | 1 + .../goldenfile/metadata_logs_otc/templates.output.yaml | 1 + .../additional_endpoints.output.yaml | 1 + .../goldenfile/metadata_metrics_otc/basic.output.yaml | 1 + .../goldenfile/metadata_metrics_otc/custom.output.yaml | 8 ++++++++ .../goldenfile/metadata_metrics_otc/debug.output.yaml | 1 + .../debug_with_sumologic_mock.output.yaml | 3 +++ .../debug_with_sumologic_mock_http.output.yaml | 10 ++++++++++ .../filtered_app_metrics.output.yaml | 1 + 23 files changed, 44 insertions(+), 9 deletions(-) rename .changelog/{3704.added.txt => 3705.added.txt} (100%) diff --git a/.changelog/3704.added.txt b/.changelog/3705.added.txt similarity index 100% rename from .changelog/3704.added.txt rename to .changelog/3705.added.txt diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index f88dcaae63..46f51c1b14 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -432,6 +432,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `otellogswindows.metrics.enabled` | Enable OpenTelemetry Logs Collector for Windows Nodes metrics | `true` | | `otellogswindows.serviceLabels` | Add custom labels to OpenTelemetry Logs Collector for Windows Nodes Service | `{}` | | `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). | `{}` | +| `metadata.compression` | Compression for logs, metrics and events | `zstd` | | `metadata.image.repository` | Image repository for otelcol docker container. | `` | | `metadata.image.tag` | Image tag for otelcol docker container. | `` | | `metadata.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` | diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 33fb9d7558..8a401d9ad8 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -9,8 +9,6 @@ exporters: sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} compression: {{ .Values.metadata.compression }} - json_logs: - add_timestamp: false log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -24,8 +22,6 @@ exporters: sumologic/sumologic-mock-containers: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} compression: {{ .Values.metadata.compression }} - json_logs: - add_timestamp: false log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -42,8 +38,6 @@ exporters: sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} compression: {{ .Values.metadata.compression }} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true @@ -57,8 +51,6 @@ exporters: sumologic/sumologic-mock-systemd: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} compression: {{ .Values.metadata.compression }} - json_logs: - add_timestamp: false log_format: json sending_queue: enabled: true diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index fae72cc00a..bc61716543 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -1555,7 +1555,7 @@ metadata: size: 10Gi ## Add custom labels to all otelcol statefulset PVC (logs and metrics) pvcLabels: {} - + ## Compression for logs, metrics and events: compression: zstd diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index f7329adaf7..e2de9666f2 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index 681660238b..0b65709aa4 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml index a38b47c950..31cfa5a50d 100644 --- a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: @@ -24,6 +25,7 @@ data: storage: file_storage sumologic/sumologic-mock: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index 1d955c4764..a3310ba87d 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + compression: zstd disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml index 9a411c84cf..eeeabfec19 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml @@ -16,6 +16,7 @@ data: debug: verbosity: detailed otlphttp: + compression: zstd disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index 1952b2adaf..e9f5f65b9e 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + compression: zstd disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 271bdef1ae..0e68d8321c 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -14,6 +14,7 @@ data: config.yaml: | exporters: otlphttp: + compression: zstd disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml index 827a0903a7..5beffd0141 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml index bf687c2c40..c9ecdd80b7 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: @@ -26,6 +27,7 @@ data: storage: file_storage sumologic/sumologic-mock: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml index d4a162115a..fd70f0d8b0 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml @@ -16,6 +16,7 @@ data: debug: verbosity: detailed sumologic/containers: + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} log_format: json sending_queue: @@ -24,6 +25,7 @@ data: queue_size: 10000 storage: file_storage sumologic/sumologic-mock-containers: + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: json sending_queue: @@ -32,6 +34,7 @@ data: queue_size: 10000 storage: file_storage sumologic/sumologic-mock-systemd: + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: json sending_queue: @@ -40,6 +43,7 @@ data: queue_size: 10000 storage: file_storage sumologic/systemd: + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} log_format: json sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index 45734c54f7..88a730bb90 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index dbaccf60ee..ff5110094d 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml index ec860318a7..152743dcdc 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml index cffd7c17d4..13b2f84c3c 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml index d21eca4765..d6e6a204b2 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic/apiserver: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -26,6 +27,7 @@ data: timeout: 30s sumologic/control_plane: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -37,6 +39,7 @@ data: timeout: 30s sumologic/controller: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -48,6 +51,7 @@ data: timeout: 30s sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE} max_request_body_size: 16777216 @@ -60,6 +64,7 @@ data: timeout: 30s sumologic/kubelet: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -71,6 +76,7 @@ data: timeout: 30s sumologic/node: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -82,6 +88,7 @@ data: timeout: 30s sumologic/scheduler: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -93,6 +100,7 @@ data: timeout: 30s sumologic/state: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml index 0982f4e5da..eea102ac8c 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml index 85bb94537c..30070b10bd 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 @@ -29,6 +30,7 @@ data: timeout: 30s sumologic/sumologic-mock-default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 @@ -41,6 +43,7 @@ data: timeout: 30s sumologic/sumologic-mock-http: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml index b8738cadd4..8ede490377 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml @@ -17,6 +17,7 @@ data: verbosity: detailed sumologic/apiserver: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -28,6 +29,7 @@ data: timeout: 30s sumologic/control_plane: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -39,6 +41,7 @@ data: timeout: 30s sumologic/controller: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -50,6 +53,7 @@ data: timeout: 30s sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE} max_request_body_size: 16777216 @@ -62,6 +66,7 @@ data: timeout: 30s sumologic/kubelet: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -73,6 +78,7 @@ data: timeout: 30s sumologic/node: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -84,6 +90,7 @@ data: timeout: 30s sumologic/scheduler: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -95,6 +102,7 @@ data: timeout: 30s sumologic/state: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -106,6 +114,7 @@ data: timeout: 30s sumologic/sumologic-mock-default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 @@ -118,6 +127,7 @@ data: timeout: 30s sumologic/sumologic-mock-http: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml index 2a540b3141..32d03aaafb 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml @@ -15,6 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% + compression: zstd decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 From 63a0454bbef999a7190349f2729dad436962f785 Mon Sep 17 00:00:00 2001 From: Raj Nishtala Date: Wed, 15 May 2024 15:46:15 -0400 Subject: [PATCH 3/3] Move the compression config to the top-level, change default to gzip --- .changelog/3705.added.txt | 2 +- deploy/helm/sumologic/README.md | 2 +- .../sumologic/conf/events/otelcol/config.yaml | 4 ++-- .../conf/logs/collector/otelcol/config.yaml | 2 +- .../sumologic/conf/logs/otelcol/config.yaml | 12 +++++------ .../metrics/collector/otelcol/config.yaml | 1 + .../conf/metrics/otelcol/exporters.yaml | 20 +++++++++---------- deploy/helm/sumologic/values.yaml | 8 +++++--- .../goldenfile/events_otc/basic.output.yaml | 2 +- .../goldenfile/events_otc/options.output.yaml | 2 +- .../events_otc/sumologic-mock.output.yaml | 4 ++-- .../goldenfile/logs_otc/basic.output.yaml | 2 +- .../goldenfile/logs_otc/debug.output.yaml | 2 +- .../goldenfile/logs_otc/options.output.yaml | 2 +- .../multiple_multiline.output.yaml | 2 +- .../metadata_logs_otc/debug.output.yaml | 2 +- .../debug_with_sumologic_mock.output.yaml | 4 ++-- ...debug_with_sumologic_mock_http.output.yaml | 8 ++++---- .../metadata_logs_otc/otel.output.yaml | 2 +- .../metadata_logs_otc/templates.output.yaml | 2 +- .../additional_endpoints.output.yaml | 2 +- .../metadata_metrics_otc/basic.output.yaml | 2 +- .../metadata_metrics_otc/custom.output.yaml | 16 +++++++-------- .../metadata_metrics_otc/debug.output.yaml | 2 +- .../debug_with_sumologic_mock.output.yaml | 6 +++--- ...debug_with_sumologic_mock_http.output.yaml | 20 +++++++++---------- .../filtered_app_metrics.output.yaml | 2 +- .../metrics_collector_otc/basic.output.yaml | 1 + .../metrics_collector_otc/custom.output.yaml | 1 + .../metrics_collector_otc/debug.output.yaml | 1 + .../metrics_collector_otc/kubelet.output.yaml | 1 + 31 files changed, 73 insertions(+), 66 deletions(-) diff --git a/.changelog/3705.added.txt b/.changelog/3705.added.txt index 18cec05c59..e345999226 100644 --- a/.changelog/3705.added.txt +++ b/.changelog/3705.added.txt @@ -1 +1 @@ -feat(compression): Make the compression type configurable, default: zstd \ No newline at end of file +feat(compression): Make the compression type configurable, default: gzip \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 46f51c1b14..99108e5cf8 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -432,7 +432,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `otellogswindows.metrics.enabled` | Enable OpenTelemetry Logs Collector for Windows Nodes metrics | `true` | | `otellogswindows.serviceLabels` | Add custom labels to OpenTelemetry Logs Collector for Windows Nodes Service | `{}` | | `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). | `{}` | -| `metadata.compression` | Compression for logs, metrics and events | `zstd` | +| `compression` | Compression can be gzip, snappy, zstd or deflate | `gzip` | | `metadata.image.repository` | Image repository for otelcol docker container. | `` | | `metadata.image.tag` | Image tag for otelcol docker container. | `` | | `metadata.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` | diff --git a/deploy/helm/sumologic/conf/events/otelcol/config.yaml b/deploy/helm/sumologic/conf/events/otelcol/config.yaml index 21cdd0f553..9425899801 100644 --- a/deploy/helm/sumologic/conf/events/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/events/otelcol/config.yaml @@ -2,7 +2,7 @@ exporters: sumologic: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic.events.exporter.endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: {{ include "sumologic.events.exporter.format" . }} sending_queue: enabled: true @@ -19,7 +19,7 @@ exporters: sumologic/sumologic-mock: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: {{ include "sumologic.events.exporter.format" . }} sending_queue: enabled: true diff --git a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml index 95eede8376..cc94e25628 100644 --- a/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml @@ -1,7 +1,7 @@ exporters: otlphttp: endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.{{ .Values.sumologic.clusterDNSDomain }}.:4318 - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: queue_size: 10 # this improves load balancing at the cost of more network traffic diff --git a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml index 8a401d9ad8..15d7589135 100644 --- a/deploy/helm/sumologic/conf/logs/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/logs/otelcol/config.yaml @@ -8,7 +8,7 @@ exporters: {{ if .Values.sumologic.logs.container.enabled }} sumologic/containers: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -21,7 +21,7 @@ exporters: {{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }} sumologic/sumologic-mock-containers: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: {{ include "logs.otelcol.container.exporter.format" . }} sending_queue: enabled: true @@ -37,7 +37,7 @@ exporters: {{ if .Values.sumologic.logs.systemd.enabled }} sumologic/systemd: endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: json sending_queue: enabled: true @@ -50,7 +50,7 @@ exporters: {{- if eq (include "sumologic-mock.forward-logs-metadata" .) "true" }} sumologic/sumologic-mock-systemd: endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: json sending_queue: enabled: true @@ -67,7 +67,7 @@ exporters: sumologic: client: {{ include "sumologic.sumo_client" . }} endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: otlp sending_queue: enabled: true @@ -81,7 +81,7 @@ exporters: sumologic/sumologic-mock: client: {{ include "sumologic.sumo_client" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} log_format: otlp sending_queue: enabled: true diff --git a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml index 3df5cd998a..1a1c75c4a6 100644 --- a/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml +++ b/deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml @@ -7,6 +7,7 @@ exporters: {{- end }} otlphttp: endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.{{ .Values.sumologic.clusterDNSDomain }}.:4318 + compression: {{ .Values.compression }} sending_queue: queue_size: 10000 num_consumers: 10 diff --git a/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml b/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml index 72e08ba64e..234967ba3f 100644 --- a/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml +++ b/deploy/helm/sumologic/conf/metrics/otelcol/exporters.yaml @@ -8,7 +8,7 @@ sumologic/sumologic-mock-default: client: {{ include "sumologic.sumo_client" . }} metric_format: {{ include "metrics.otelcol.exporter.format" . }} endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} ## Sumo doesn't yet natively support OTLP Histograms decompose_otlp_histograms: true ## Configuration for sending queue @@ -30,7 +30,7 @@ sumologic/sumologic-mock-http: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: {{ include "sumologic-mock.receiver-endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -49,7 +49,7 @@ sumologic/default: client: {{ include "sumologic.sumo_client" . }} metric_format: {{ include "metrics.otelcol.exporter.format" . }} endpoint: {{ include "metrics.otelcol.exporter.endpoint" . }} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} ## Sumo doesn't yet natively support OTLP Histograms decompose_otlp_histograms: true ## Configuration for sending queue @@ -71,7 +71,7 @@ sumologic/apiserver: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -86,7 +86,7 @@ sumologic/control_plane: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -101,7 +101,7 @@ sumologic/controller: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -116,7 +116,7 @@ sumologic/kubelet: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -131,7 +131,7 @@ sumologic/node: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -146,7 +146,7 @@ sumologic/scheduler: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} @@ -161,7 +161,7 @@ sumologic/state: client: {{ include "sumologic.sumo_client" . }} metric_format: prometheus endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} - compression: {{ .Values.metadata.compression }} + compression: {{ .Values.compression }} sending_queue: enabled: true {{- if .Values.metadata.persistence.enabled }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index bc61716543..31cfac0a9d 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -6,6 +6,11 @@ fullnameOverride: "" ## Use the same namespace as namespaceOverride in 'kube-prometheus-stack.namespaceOverride' if Prometheus setup is also enabled namespaceOverride: "" +## Compression for logs, metrics and events +## Compression types can be gzip, snappy, zstd or deflate +## Default is gzip +compression: gzip + sumologic: ### Setup @@ -1556,9 +1561,6 @@ metadata: ## Add custom labels to all otelcol statefulset PVC (logs and metrics) pvcLabels: {} - ## Compression for logs, metrics and events: - compression: zstd - ## Configure metrics pipeline. ## This section affects only otelcol provider. metrics: diff --git a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml index e2de9666f2..8b56a00c81 100644 --- a/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/basic.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml index 0b65709aa4..403b2c530c 100644 --- a/tests/helm/testdata/goldenfile/events_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/options.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml index 31cfa5a50d..69a58fbcd1 100644 --- a/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc/sumologic-mock.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_EVENTS_SOURCE} log_format: otlp sending_queue: @@ -25,7 +25,7 @@ data: storage: file_storage sumologic/sumologic-mock: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml index a3310ba87d..576d167698 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml @@ -14,7 +14,7 @@ data: config.yaml: | exporters: otlphttp: - compression: zstd + compression: gzip disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml index eeeabfec19..17bb5c7366 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml @@ -16,7 +16,7 @@ data: debug: verbosity: detailed otlphttp: - compression: zstd + compression: gzip disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml index e9f5f65b9e..1541c76195 100644 --- a/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc/options.output.yaml @@ -14,7 +14,7 @@ data: config.yaml: | exporters: otlphttp: - compression: zstd + compression: gzip disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml index 0e68d8321c..b337124d30 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml @@ -14,7 +14,7 @@ data: config.yaml: | exporters: otlphttp: - compression: zstd + compression: gzip disable_keep_alives: true endpoint: http://${LOGS_METADATA_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml index 5beffd0141..85a54a18bc 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml index c9ecdd80b7..2c495df103 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: @@ -27,7 +27,7 @@ data: storage: file_storage sumologic/sumologic-mock: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml index fd70f0d8b0..ccc9545fbe 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/debug_with_sumologic_mock_http.output.yaml @@ -16,7 +16,7 @@ data: debug: verbosity: detailed sumologic/containers: - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} log_format: json sending_queue: @@ -25,7 +25,7 @@ data: queue_size: 10000 storage: file_storage sumologic/sumologic-mock-containers: - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: json sending_queue: @@ -34,7 +34,7 @@ data: queue_size: 10000 storage: file_storage sumologic/sumologic-mock-systemd: - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver log_format: json sending_queue: @@ -43,7 +43,7 @@ data: queue_size: 10000 storage: file_storage sumologic/systemd: - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE} log_format: json sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml index 88a730bb90..3323b5de28 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml index ff5110094d..dfc41bb89b 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_LOGS_SOURCE} log_format: otlp sending_queue: diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml index 152743dcdc..f2cbfec28d 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/additional_endpoints.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml index 13b2f84c3c..4348f76723 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/basic.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml index d6e6a204b2..f612df64fe 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/custom.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic/apiserver: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -27,7 +27,7 @@ data: timeout: 30s sumologic/control_plane: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -39,7 +39,7 @@ data: timeout: 30s sumologic/controller: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -51,7 +51,7 @@ data: timeout: 30s sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE} max_request_body_size: 16777216 @@ -64,7 +64,7 @@ data: timeout: 30s sumologic/kubelet: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -76,7 +76,7 @@ data: timeout: 30s sumologic/node: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -88,7 +88,7 @@ data: timeout: 30s sumologic/scheduler: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -100,7 +100,7 @@ data: timeout: 30s sumologic/state: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml index eea102ac8c..174f208a97 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml index 30070b10bd..e1dff9d074 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 @@ -30,7 +30,7 @@ data: timeout: 30s sumologic/sumologic-mock-default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 @@ -43,7 +43,7 @@ data: timeout: 30s sumologic/sumologic-mock-http: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml index 8ede490377..45407816f4 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/debug_with_sumologic_mock_http.output.yaml @@ -17,7 +17,7 @@ data: verbosity: detailed sumologic/apiserver: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_APISERVER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -29,7 +29,7 @@ data: timeout: 30s sumologic/control_plane: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -41,7 +41,7 @@ data: timeout: 30s sumologic/controller: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -53,7 +53,7 @@ data: timeout: 30s sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE} max_request_body_size: 16777216 @@ -66,7 +66,7 @@ data: timeout: 30s sumologic/kubelet: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_KUBELET_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -78,7 +78,7 @@ data: timeout: 30s sumologic/node: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_NODE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -90,7 +90,7 @@ data: timeout: 30s sumologic/scheduler: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -102,7 +102,7 @@ data: timeout: 30s sumologic/state: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: ${SUMO_ENDPOINT_STATE_METRICS_SOURCE} max_request_body_size: 16777216 metric_format: prometheus @@ -114,7 +114,7 @@ data: timeout: 30s sumologic/sumologic-mock-default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 @@ -127,7 +127,7 @@ data: timeout: 30s sumologic/sumologic-mock-http: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip endpoint: http://RELEASE-NAME-sumologic-mock.sumologic.svc.cluster.local.:3000/receiver max_request_body_size: 16777216 metric_format: prometheus diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml index 32d03aaafb..a489ed89b4 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc/filtered_app_metrics.output.yaml @@ -15,7 +15,7 @@ data: exporters: sumologic/default: client: k8s_%CURRENT_CHART_VERSION% - compression: zstd + compression: gzip decompose_otlp_histograms: true endpoint: ${SUMO_ENDPOINT_DEFAULT_OTLP_METRICS_SOURCE} max_request_body_size: 16777216 diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml index 38583feae8..588827d50c 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -76,6 +76,7 @@ spec: config: | exporters: otlphttp: + compression: gzip disable_keep_alives: true endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml index 2cf99549b8..16d4e9811e 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -113,6 +113,7 @@ spec: config: | exporters: otlphttp: + compression: gzip disable_keep_alives: true endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml index f03bd18f3e..e21051fa6b 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml @@ -78,6 +78,7 @@ spec: debug: verbosity: detailed otlphttp: + compression: gzip disable_keep_alives: true endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: diff --git a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml index 6f974a68f7..a4dd6d3e84 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml @@ -76,6 +76,7 @@ spec: config: | exporters: otlphttp: + compression: gzip disable_keep_alives: true endpoint: http://${METADATA_METRICS_SVC}.${NAMESPACE}.svc.cluster.local.:4318 sending_queue: