diff --git a/.changelog/3352.fixed.txt b/.changelog/3352.fixed.txt new file mode 100644 index 0000000000..a0a6a5a64f --- /dev/null +++ b/.changelog/3352.fixed.txt @@ -0,0 +1 @@ +fix: downgrade otel to 0.86.0-sumo-1 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 9bb02859c3..051148bb0c 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -150,7 +150,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.87.0-sumo-0` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.86.0-sumo-1` | | `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. | `{}` | @@ -269,7 +269,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.87.0-sumo-0` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.86.0-sumo-1` | | `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 0bf4156ea0..2b62a19a7c 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -244,7 +244,7 @@ sumologic: ### Global configuration for OpenTelemetry Collector otelcolImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.87.0-sumo-0" + tag: "0.86.0-sumo-1" ## 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. @@ -1577,7 +1577,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.87.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.86.0-sumo-1/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -2458,7 +2458,7 @@ opentelemetry-operator: manager: collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.87.0-sumo-0" + tag: "0.86.0-sumo-1" env: {} # ENABLE_WEBHOOKS: "true" diff --git a/docs/README.md b/docs/README.md index e8b2a62d54..c3216523ff 100644 --- a/docs/README.md +++ b/docs/README.md @@ -105,7 +105,7 @@ The following table displays the currently used software versions for our Helm c | Name | Version | | ----------------------------------------- | ------- | -| OpenTelemetry Collector | 0.87.0 | +| OpenTelemetry Collector | 0.86.0 | | OpenTelemetry Operator | 0.33.0 | | kube-prometheus-stack/Prometheus Operator | 40.5.0 | | Falco | 3.3.0 | diff --git a/docs/best-practices.md b/docs/best-practices.md index 101e429b26..7af9085632 100644 --- a/docs/best-practices.md +++ b/docs/best-practices.md @@ -374,8 +374,8 @@ metadata: ``` In the example above, two internally defined processors were used in metadata pipeline: -[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/processor/batchprocessor) and -[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.87.0/processor/memorylimiterprocessor). If you need to +[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.86.0/processor/batchprocessor) and +[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.86.0/processor/memorylimiterprocessor). If you need to change the parameters of these processors in any way, you can define your own and use them in this pipeline. ## Removing attributes from systemd logs diff --git a/docs/collecting-container-logs.md b/docs/collecting-container-logs.md index 1dadc2fab9..8aac4f8b96 100644 --- a/docs/collecting-container-logs.md +++ b/docs/collecting-container-logs.md @@ -130,7 +130,7 @@ It is going to: **Note: Log which matches multiple conditions is processed only by the first one.** -[expr]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/stanza/docs/types/expression.md +[expr]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.86.0/pkg/stanza/docs/types/expression.md ### Log format diff --git a/docs/security-best-practices.md b/docs/security-best-practices.md index 0636cd01ad..77b139e2cf 100644 --- a/docs/security-best-practices.md +++ b/docs/security-best-practices.md @@ -390,30 +390,30 @@ For Helm Chart v2 please When you use **OpenTelemetry Collector** you need set the fips compliant images. -For example, to use `0.87.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: +For example, to use `0.86.0-sumo-1-fips` image with Helm Chart v2 use the following configuration: ```yaml metadata: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips otellogs: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips otelevents: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips otelcol: deployment: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips otelagent: daemonset: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips otelgateway: deployment: image: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips ``` ### FIPS compliant images for Fluent Bit and Fluentd diff --git a/docs/v4-migration-doc.md b/docs/v4-migration-doc.md index c9b2b44677..324dc12346 100644 --- a/docs/v4-migration-doc.md +++ b/docs/v4-migration-doc.md @@ -308,5 +308,5 @@ require additional action. [otel_metrics_filter]: ./collecting-application-metrics.md#filtering-metrics [v3_migration_guide]: ./v3-migration-doc.md [attribute_translation]: - https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.87.0-sumo-0/pkg/processor/sumologicschemaprocessor#attribute-translation + https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.86.0-sumo-1/pkg/processor/sumologicschemaprocessor#attribute-translation [scraped_metrics_aggregations]: ./scraped-metrics.md#aggregations-removed diff --git a/docs/working-with-container-registries.md b/docs/working-with-container-registries.md index 3c72c76786..b7734e0b0d 100644 --- a/docs/working-with-container-registries.md +++ b/docs/working-with-container-registries.md @@ -69,7 +69,7 @@ One can then use `${REGISTRY_REPO_URL}:${TAG}` in `user-values.yaml` as such: sumologic: otelcol: defaultImage: - tag: 0.87.0-sumo-0-fips + tag: 0.86.0-sumo-1-fips ``` ## Upgrading while rehosting images 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 ae8526dd8c..1f803e7aaa 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.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 710d2ddd6f..adcfc2154e 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.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 e966513e35..2c4fe9cfea 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.87.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1 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 458ba1842b..3a30f57465 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml @@ -41,7 +41,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0 + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 29f304d85e..55d642eae7 100644 --- a/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml @@ -33,7 +33,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0 + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 3725fedd52..d7f087361f 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 @@ -37,7 +37,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 70ef45e9dc..d7e98bd941 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 @@ -56,7 +56,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 7391928b9d..fae0609f27 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.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 1b95b2c2fa..c9dd2460c8 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.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 a3ae799787..ee373c4bfd 100644 --- a/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml @@ -55,7 +55,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1 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 330f93dc97..ec31128383 100644 --- a/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml @@ -35,7 +35,7 @@ spec: restartPolicy: Always containers: - name: otelcol - image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" 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 6e7e244f8c..6d49104467 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.87.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.86.0-sumo-1" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml