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..e53f3ed860 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 | `{}` | | `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