diff --git a/.changelog/3814.changed.txt b/.changelog/3814.changed.txt new file mode 100644 index 0000000000..94015d01dd --- /dev/null +++ b/.changelog/3814.changed.txt @@ -0,0 +1 @@ +chore: Upgrade otel to v0.102.1-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index fd4d464d65..fd26b8e2e3 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -165,7 +165,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `sumologic.noProxy` | List of comma separated hostnames which should be excluded from the proxy | `kubernetes.default.svc` | | `sumologic.pullSecrets` | Optional list of secrets that will be used for pulling images for Sumo Logic's deployments and statefulsets. | `Nil` | | `sumologic.otelcolImage.repository` | Default image repository for OpenTelemetry Collector. This can be overridden for specific components. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.100.0-sumo-0` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.102.1-sumo-0` | | `sumologic.otelcolImage.addFipsSuffix` | Add a `-fips` suffix to all image tags. See [docs/security-best-practices.md](/docs/security-best-practices.md) for more information. | `false` | | `sumologic.podLabels` | Additional labels for the pods. | `{}` | | `sumologic.podAnnotations` | Additional annotations for the pods. | `{}` | @@ -448,7 +448,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `opentelemetry-operator.instrumentation.python.metrics.enabled` | Flag to control metrics export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.instrumentation.python.traces.enabled` | Flag to control traces export from Python instrumentation in `Instrumentation` resource. | `true` | | `opentelemetry-operator.manager.collectorImage.repository` | The default collector image repository for OpenTelemetryCollector CRDs. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.100.0-sumo-0` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.102.1-sumo-0` | | `opentelemetry-operator.manager.resources.limits.cpu` | Used to set limit CPU for OpenTelemetry-Operator Manager. | `250m` | | `opentelemetry-operator.manager.resources.limits.memory` | Used to set limit Memory for OpenTelemetry-Operator Manager. | `512Mi` | | `opentelemetry-operator.manager.resources.requests.cpu` | Used to set requested CPU for OpenTelemetry-Operator Manager. | `150m` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 284f72d4b7..1b4b4f7691 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -240,7 +240,7 @@ sumologic: ### Global configuration for OpenTelemetry Collector otelcolImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.100.0-sumo-0" + tag: "0.102.1-sumo-0" ## Add a -fips suffix to all image tags. With default tags, this results in FIPS-compliant otel images. ## See https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/fips.md for more information. @@ -3773,7 +3773,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.100.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.102.1-sumo-0/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -4659,7 +4659,7 @@ opentelemetry-operator: manager: collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.100.0-sumo-0" + tag: "0.102.1-sumo-0" env: {} resources: limits: diff --git a/docs/README.md b/docs/README.md index 560c14d13a..37f7f6b7a1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -110,7 +110,7 @@ The following table displays the currently used software versions for our Helm c | Name | Version | | ----------------------------------------- | ------- | -| OpenTelemetry Collector | 0.100.0 | +| OpenTelemetry Collector | 0.102.1 | | OpenTelemetry Operator | 0.49.0 | | kube-prometheus-stack/Prometheus Operator | 40.5.0 | | Falco | 3.8.7 | diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml index 179aea3a87..faf1b2ea7a 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml @@ -71,7 +71,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml index 7fd9fbf982..4695ddc63f 100644 --- a/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml +++ b/tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml @@ -58,7 +58,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml index 67442df91b..140a1196a2 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml @@ -41,7 +41,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otelcol/config.yaml diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml index 680a38126d..090f3a1f32 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -45,7 +45,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml index e8b43eddff..e687502974 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -36,7 +36,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml index 1c20bf263a..de84f35e92 100644 --- a/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml index 07c013e199..ff4d614756 100644 --- a/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml @@ -57,7 +57,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml 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 efdf8d2a81..3c3acc5404 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml @@ -13,7 +13,7 @@ metadata: heritage: "Helm" sumologic.com/scrape: "true" spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics 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 72776e8deb..625ee75914 100644 --- a/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml +++ b/tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml @@ -17,7 +17,7 @@ metadata: podKey: podValue spec: - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" mode: statefulset replicas: 1 serviceAccount: RELEASE-NAME-sumologic-metrics diff --git a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml index 86fe05a62a..b79710fc0c 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -56,7 +56,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - "--config=/conf/otelcol.instrumentation.conf.yaml" diff --git a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml index 22d56795e9..f218d59e34 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -36,7 +36,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - "--config=/conf/traces.gateway.conf.yaml" diff --git a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml index e401e7ac52..f67d7218d0 100644 --- a/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml @@ -30,7 +30,7 @@ spec: serviceAccountName: RELEASE-NAME-sumologic containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml diff --git a/tests/integration/helm_ot_default_test.go b/tests/integration/helm_ot_default_test.go index 79b83b5f60..39232cbb64 100644 --- a/tests/integration/helm_ot_default_test.go +++ b/tests/integration/helm_ot_default_test.go @@ -13,7 +13,7 @@ func Test_Helm_Default_OT(t *testing.T) { expectedMetrics := internal.DefaultExpectedMetrics // we have tracing enabled, so check tracing-specific metrics - expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...) + expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics..., internal.FileConsumerOtelColMetrics...) installChecks := []featureCheck{ CheckSumologicSecret(15), diff --git a/tests/integration/helm_otlp_test.go b/tests/integration/helm_otlp_test.go index efcba74906..3fe3c8289b 100644 --- a/tests/integration/helm_otlp_test.go +++ b/tests/integration/helm_otlp_test.go @@ -13,7 +13,7 @@ func Test_Helm_OTLP(t *testing.T) { expectedMetrics := internal.DefaultExpectedMetrics // we have tracing enabled, so check tracing-specific metrics - expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...) + expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics..., internal.FileConsumerOtelColMetrics...) installChecks := []featureCheck{ CheckSumologicSecret(15), diff --git a/tests/integration/internal/constants.go b/tests/integration/internal/constants.go index ffdf30e986..053ac3d599 100644 --- a/tests/integration/internal/constants.go +++ b/tests/integration/internal/constants.go @@ -231,6 +231,12 @@ var ( "otelcol_otelsvc_k8s_owner_table_size", "otelcol_exporter_send_failed_metric_points", } + + FileConsumerOtelColMetrics = []string{ + "otelcol_fileconsumer_reading_files", + "otelcol_fileconsumer_open_files", + } + LogsOtelcolMetrics = []string{ "otelcol_exporter_sent_log_records", "otelcol_exporter_send_failed_log_records",