From 37f62760528aa95656cb80cfaca9cb97358a3edc Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Thu, 19 Oct 2023 13:29:31 +0200 Subject: [PATCH] chore: upgrade otel to 0.87.0-sumo-0 --- .changelog/3334.changed.txt | 1 + deploy/helm/sumologic/README.md | 4 +-- deploy/helm/sumologic/values.yaml | 6 ++-- docs/README.md | 2 +- docs/best-practices.md | 6 ++-- docs/collecting-container-logs.md | 34 +++++++++---------- docs/security-best-practices.md | 14 ++++---- docs/working-with-container-registries.md | 2 +- .../events_otc_statefulset/basic.output.yaml | 2 +- .../events_otc_statefulset/proxy.output.yaml | 2 +- .../logs_otc_cloudwatch/basic.output.yaml | 2 +- .../logs_otc_daemonset/additional.output.yaml | 4 +-- .../logs_otc_daemonset/basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../metrics_collector_otc/basic.output.yaml | 2 +- .../metrics_collector_otc/custom.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- .../basic.output.yaml | 2 +- 20 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 .changelog/3334.changed.txt diff --git a/.changelog/3334.changed.txt b/.changelog/3334.changed.txt new file mode 100644 index 0000000000..90cc245418 --- /dev/null +++ b/.changelog/3334.changed.txt @@ -0,0 +1 @@ +chore: upgrade otel to 0.87.0-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index f3695e7aaa..716639222b 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -164,7 +164,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.85.0-sumo-0` | +| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.87.0-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. | `{}` | @@ -447,7 +447,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.85.0-sumo-0` | +| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.87.0-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 2511265ae4..437de6df0c 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.85.0-sumo-0" + tag: "0.87.0-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. @@ -3766,7 +3766,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.85.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.87.0-sumo-0/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -4652,7 +4652,7 @@ opentelemetry-operator: manager: collectorImage: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.85.0-sumo-0" + tag: "0.87.0-sumo-0" env: {} resources: limits: diff --git a/docs/README.md b/docs/README.md index 476caeb0bb..092d574c5a 100644 --- a/docs/README.md +++ b/docs/README.md @@ -109,7 +109,7 @@ The following table displays the currently used software versions for our Helm c | Name | Version | | ----------------------------------------- | ------- | -| OpenTelemetry Collector | 0.82.0 | +| OpenTelemetry Collector | 0.87.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 33fa882940..56776e2731 100644 --- a/docs/best-practices.md +++ b/docs/best-practices.md @@ -12,7 +12,7 @@ - [Fluentd](#fluentd-1) - [OpenTelemetry Collector](#opentelemetry-collector-1) - [Collect logs from additional files on the Node](#collect-logs-from-additional-files-on-the-node) -- [Remove attributes from systemd logs](#removing-attributes-from-systemd-logs) +- [Removing attributes from systemd logs](#removing-attributes-from-systemd-logs) - [Filtering Prometheus Metrics by Namespace](#filtering-prometheus-metrics-by-namespace) - [Modify the Log Level for Falco](#modify-the-log-level-for-falco) - [Overriding metadata using annotations](#overriding-metadata-using-annotations) @@ -353,8 +353,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.82.0/processor/batchprocessor) and -[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.82.0/processor/memorylimiterprocessor). If you need to +[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 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 b82a2dbb4c..736c4f53a7 100644 --- a/docs/collecting-container-logs.md +++ b/docs/collecting-container-logs.md @@ -2,22 +2,22 @@ -- [Collecting Container Logs](#collecting-container-logs) - - [Configuration](#configuration) - - [Multiline log parsing](#multiline-log-parsing) - - [Conditional multiline log parsing](#conditional-multiline-log-parsing) - - [Log format](#log-format) - - [fields log format](#fields-log-format) - - [json_merge log format](#json_merge-log-format) - - [text log format](#text-log-format) - - [Setting source name and other built-in metadata](#setting-source-name-and-other-built-in-metadata) - - [Filtering](#filtering) - - [Modifying log records](#modifying-log-records) - - [Adding custom fields](#adding-custom-fields) - - [Persistence](#persistence) - - [Advanced Configuration](#advanced-configuration) - - [Direct configuration](#direct-configuration) - - [Disabling container logs](#disabling-container-logs) +- [Configuration](#configuration) + - [Multiline log parsing](#multiline-log-parsing) + - [Conditional multiline log parsing](#conditional-multiline-log-parsing) + - [Log format](#log-format) + - [`fields` log format](#fields-log-format) + - [`json_merge` log format](#json_merge-log-format) + - [`text` log format](#text-log-format) + - [Setting source name and other built-in metadata](#setting-source-name-and-other-built-in-metadata) + - [Filtering](#filtering) + - [Modifying log records](#modifying-log-records) + - [Adding custom fields](#adding-custom-fields) + - [Persistence](#persistence) +- [Advanced Configuration](#advanced-configuration) + - [Direct configuration](#direct-configuration) + - [Disabling container logs](#disabling-container-logs) + - [Using OTLP Source](#using-otlp-source) @@ -126,7 +126,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.82.0/pkg/stanza/docs/types/expression.md +[expr]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.87.0/pkg/stanza/docs/types/expression.md ### Log format diff --git a/docs/security-best-practices.md b/docs/security-best-practices.md index 58a4c5a124..0636cd01ad 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.85.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: +For example, to use `0.87.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: ```yaml metadata: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips otellogs: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips otelevents: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips otelcol: deployment: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips otelagent: daemonset: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips otelgateway: deployment: image: - tag: 0.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-fips ``` ### FIPS compliant images for Fluent Bit and Fluentd diff --git a/docs/working-with-container-registries.md b/docs/working-with-container-registries.md index c58672cb18..3c72c76786 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.85.0-sumo-0-fips + tag: 0.87.0-sumo-0-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 0853117a9a..16bdbc0962 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 136d5815fc..28eb50261a 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 5caa634511..e966513e35 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.85.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 29f31a5001..458ba1842b 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.85.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -176,7 +176,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.85.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 1a7bb9a9f2..29f304d85e 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.85.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 cfeb4335f6..d2683dac1c 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 b2a15b2c46..4458069e8c 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 abf75eb86b..6fe9041df2 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 edb19f402a..8ce908113a 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 4c20d65ad8..e35915dca7 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.85.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 2aebc3f28a..a6dca34a6b 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-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 d0cbdf8440..45152709e9 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.85.0-sumo-0" + image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.87.0-sumo-0" imagePullPolicy: IfNotPresent args: - --config=/conf/traces.sampler.conf.yaml