From 73241d7ea45305cfe8cef78ea2357640a2f4d84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Tue, 14 Feb 2023 12:10:47 +0100 Subject: [PATCH] chore: upgrade otelcol to 0.71.0-sumo-0 --- .changelog/2872.changed.txt | 1 + deploy/helm/sumologic/README.md | 12 ++++---- deploy/helm/sumologic/values.yaml | 14 +++++----- docs/security-best-practices.md | 28 +++++++++---------- .../static/annotations_labels.output.yaml | 2 +- .../static/basic.output.yaml | 2 +- .../static/additional.output.yaml | 4 +-- .../static/basic.output.yaml | 2 +- .../static/complex.output.yaml | 2 +- .../static/basic.output.yaml | 2 +- .../static/basic.output.yaml | 2 +- ...ol-instrumentation-statefulset.output.yaml | 2 +- .../values_helm_default_ot_fips_metadata.yaml | 2 +- 13 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 .changelog/2872.changed.txt diff --git a/.changelog/2872.changed.txt b/.changelog/2872.changed.txt new file mode 100644 index 0000000000..11d56a4d99 --- /dev/null +++ b/.changelog/2872.changed.txt @@ -0,0 +1 @@ +chore: upgrade otelcol to 0.71.0-sumo-0 \ No newline at end of file diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 4b4bf081f0..a7f6e22cd4 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -405,7 +405,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `otelcolInstrumentation.statefulset.extraVolumes` | Additional volumes for otelcol-instrumentation pods. | `{}` | | `otelcolInstrumentation.statefulset.image.pullPolicy` | Image pullPolicy for otelcol-instrumentation docker container. | `IfNotPresent` | | `otelcolInstrumentation.statefulset.image.repository` | Image repository for otelcol-instrumentation docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `otelcolInstrumentation.statefulset.image.tag` | Image tag for otelcol-instrumentation docker container. | `0.69.0-sumo-0` | +| `otelcolInstrumentation.statefulset.image.tag` | Image tag for otelcol-instrumentation docker container. | `0.71.0-sumo-0` | | `otelcolInstrumentation.statefulset.podAnnotations` | Additional annotations for otelcol-instrumentation pods. | `{}` | | `otelcolInstrumentation.statefulset.podAntiAffinity` | PodAntiAffinity for otelcol-instrumentation statefulset. | `soft` | | `otelcolInstrumentation.statefulset.podLabels` | Additional labels for otelcol-instrumentation pods. | `{}` | @@ -445,7 +445,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `tracesGateway.deployment.extraVolumes` | Additional volumes for traces-gateway pods. | `{}` | | `tracesGateway.deployment.image.pullPolicy` | Image pullPolicy for traces-gateway docker container. | `IfNotPresent` | | `tracesGateway.deployment.image.repository` | Image repository for traces-gateway docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `tracesGateway.deployment.image.tag` | Image tag for traces-gateway docker container. | `0.69.0-sumo-0` | +| `tracesGateway.deployment.image.tag` | Image tag for traces-gateway docker container. | `0.71.0-sumo-0` | | `tracesGateway.deployment.livenessProbe` | Liveness probe settings for the traces-gateway container. | `{"periodSeconds": 15, "timeoutSeconds": 10, "failureThreshold": 3}` | | `tracesGateway.deployment.podAnnotations` | Additional annotations for traces-gateway pods. | `{}` | | `tracesGateway.deployment.podLabels` | Additional labels for traces-gateway pods. | `{}` | @@ -467,13 +467,13 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `tracesSampler.deployment.extraVolumes` | Additional volumes for traces-sampler pods. | `{}` | | `tracesSampler.deployment.image.pullPolicy` | Image pullPolicy for traces-sampler docker container. | `IfNotPresent` | | `tracesSampler.deployment.image.repository` | Image repository for traces-sampler docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `tracesSampler.deployment.image.tag` | Image tag for traces-sampler docker container. | `0.69.0-sumo-0` | +| `tracesSampler.deployment.image.tag` | Image tag for traces-sampler docker container. | `0.71.0-sumo-0` | | `tracesSampler.deployment.podAnnotations` | Additional annotations for traces-sampler pods. | `{}` | | `tracesSampler.deployment.podLabels` | Additional labels for traces-sampler pods. | `{}` | | `tracesSampler.deployment.resources` | Resources for traces-sampler statefulset. | `{"limits": {"memory": "4Gi", "cpu": "2000m"}, "requests": {"memory": "384Mi", "cpu": "200m"}}` | | `tracesSampler.deployment.tolerations` | Tolerations for traces-sampler statefulset. | `[]` | | `otellogs.image.repository` | Image repository for otelcol docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `otellogs.image.tag` | Image tag for otelcol docker container. | `0.69.0-sumo-0` | +| `otellogs.image.tag` | Image tag for otelcol docker container. | `0.71.0-sumo-0` | | `otellogs.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` | | `otellogs.logLevel` | Log level for the OpenTelemtry Collector. Can be `debug`, `info`, `warn`, `error`, `dpanic`, `panic`, `fatal`. | `info` | | `otellogs.config.merge` | Configuration for log collector otelcol, merged with defaults. See also https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/configuration.md. | {} | @@ -483,7 +483,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `otellogs.metrics.enabled` | Enable OpenTelemetry Collector metrics | `true` | | `otellogs.serviceLabels` | Add custom labels to OpenTelemetry Collector Service | `{}` | | `metadata.image.repository` | Image repository for otelcol docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `metadata.image.tag` | Image tag for otelcol docker container. | `0.69.0-sumo-0` | +| `metadata.image.tag` | Image tag for otelcol docker container. | `0.71.0-sumo-0` | | `metadata.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` | | `metadata.securityContext` | The securityContext configuration for otelcol. | `{"fsGroup": 999}` | | `metadata.podLabels` | Additional labels for all otelcol pods. | `{}` | @@ -550,7 +550,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `metadata.logs.autoscaling.targetMemoryUtilizationPercentage` | The desired target memory utilization for autoscaling. | `Nil` | | `metadata.logs.podDisruptionBudget` | Pod Disruption Budget for logs metadata enrichment (otelcol) statefulset. | `{"minAvailable": 2}` | | `otelevents.image.repository` | Image repository for otelcol docker container. | `public.ecr.aws/sumologic/sumologic-otel-collector` | -| `otelevents.image.tag` | Image tag for otelcol docker container. | `0.69.0-sumo-0` | +| `otelevents.image.tag` | Image tag for otelcol docker container. | `0.71.0-sumo-0` | | `otelevents.image.pullPolicy` | Image pullPolicy for otelcol docker container. | `IfNotPresent` | | `otelevents.logLevel` | Log level for the OpenTelemtry Collector. Can be `debug`, `info`, `warn`, `error`, `dpanic`, `panic`, `fatal`. | `info` | | `otelevents.config.merge` | Configuration for events otelcol, merged with defaults. See also https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/configuration.md. | `{}` | diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 7083888ff1..a9689e73a2 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -3460,7 +3460,7 @@ otelcolInstrumentation: image: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.69.0-sumo-0" + tag: "0.71.0-sumo-0" pullPolicy: IfNotPresent ## Set securityContext for containers running in pods in otelcol-instrumentation statefulset. @@ -3690,7 +3690,7 @@ tracesSampler: podAnnotations: {} image: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.69.0-sumo-0" + tag: "0.71.0-sumo-0" pullPolicy: IfNotPresent ## Extra Environment Values - allows yaml definitions @@ -3741,7 +3741,7 @@ tracesSampler: spike_limit_percentage: 20 ## Smart cascading filtering rules with preset limits. - ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.69.0-sumo-0/pkg/processor/cascadingfilterprocessor + ## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.71.0-sumo-0/pkg/processor/cascadingfilterprocessor ## for details. cascading_filter: ## Max number of traces for which decisions are kept in memory @@ -3784,7 +3784,7 @@ metadata: ## Configure image for Opentelemetry Collector (for logs and metrics) image: repository: public.ecr.aws/sumologic/sumologic-otel-collector - tag: 0.69.0-sumo-0 + tag: 0.71.0-sumo-0 pullPolicy: IfNotPresent securityContext: @@ -4035,7 +4035,7 @@ tracesGateway: podAnnotations: {} image: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.69.0-sumo-0" + tag: "0.71.0-sumo-0" pullPolicy: IfNotPresent livenessProbe: periodSeconds: 15 @@ -4141,7 +4141,7 @@ otelevents: ## Configure image for Opentelemetry Collector image: repository: public.ecr.aws/sumologic/sumologic-otel-collector - tag: 0.69.0-sumo-0 + tag: 0.71.0-sumo-0 pullPolicy: IfNotPresent logLevel: info @@ -4243,7 +4243,7 @@ otellogs: ## Configure image for Opentelemetry Collector image: repository: "public.ecr.aws/sumologic/sumologic-otel-collector" - tag: "0.69.0-sumo-0" + tag: "0.71.0-sumo-0" pullPolicy: IfNotPresent logLevel: info diff --git a/docs/security-best-practices.md b/docs/security-best-practices.md index dfc57dc4c8..6eed58573b 100644 --- a/docs/security-best-practices.md +++ b/docs/security-best-practices.md @@ -372,30 +372,30 @@ with `-fips`. Starting with Helm Chart v3 **OpenTelemetry Collector** is a default method of collecting data (except for Prometheus) but still you need set the FIPS compliant images. -For example, to use `0.69.0-sumo-0-fips` image with Helm Chart v3 use the following configuration: +For example, to use `0.71.0-sumo-0-fips` image with Helm Chart v3 use the following configuration: ```yaml metadata: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otellogs: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelevents: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelcolInstrumentation: statefulSet: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips traceSampler: deployment: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips tracesGateway: deployment: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips ``` ### Helm Chart v2 @@ -405,30 +405,30 @@ For Helm Chart v2 please When you use **OpenTelemetry Collector** you need set the fips compliant images. -For example, to use `0.69.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: +For example, to use `0.71.0-sumo-0-fips` image with Helm Chart v2 use the following configuration: ```yaml metadata: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otellogs: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelevents: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelcol: deployment: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelagent: daemonset: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips otelgateway: deployment: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips ``` ### FIPS compliant images for Fluent Bit and Fluentd diff --git a/tests/helm/events_otc_statefulset/static/annotations_labels.output.yaml b/tests/helm/events_otc_statefulset/static/annotations_labels.output.yaml index f783202b57..de596d789d 100644 --- a/tests/helm/events_otc_statefulset/static/annotations_labels.output.yaml +++ b/tests/helm/events_otc_statefulset/static/annotations_labels.output.yaml @@ -59,7 +59,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/events_otc_statefulset/static/basic.output.yaml b/tests/helm/events_otc_statefulset/static/basic.output.yaml index 89a2ea16d7..b43fa25b84 100644 --- a/tests/helm/events_otc_statefulset/static/basic.output.yaml +++ b/tests/helm/events_otc_statefulset/static/basic.output.yaml @@ -68,7 +68,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/logs_otc_daemonset/static/additional.output.yaml b/tests/helm/logs_otc_daemonset/static/additional.output.yaml index f681921482..e5bcddefa5 100644 --- a/tests/helm/logs_otc_daemonset/static/additional.output.yaml +++ b/tests/helm/logs_otc_daemonset/static/additional.output.yaml @@ -40,7 +40,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: @@ -173,7 +173,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/logs_otc_daemonset/static/basic.output.yaml b/tests/helm/logs_otc_daemonset/static/basic.output.yaml index 8db76edbb4..d7a1e091f5 100644 --- a/tests/helm/logs_otc_daemonset/static/basic.output.yaml +++ b/tests/helm/logs_otc_daemonset/static/basic.output.yaml @@ -32,7 +32,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/logs_otc_daemonset/static/complex.output.yaml b/tests/helm/logs_otc_daemonset/static/complex.output.yaml index 25162cc426..be6576ed90 100644 --- a/tests/helm/logs_otc_daemonset/static/complex.output.yaml +++ b/tests/helm/logs_otc_daemonset/static/complex.output.yaml @@ -44,7 +44,7 @@ spec: containers: - args: - --config=/etc/otelcol/config.yaml - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent name: otelcol livenessProbe: diff --git a/tests/helm/metadata_logs_otc_statefulset/static/basic.output.yaml b/tests/helm/metadata_logs_otc_statefulset/static/basic.output.yaml index 460afb1f19..7a5a823abb 100644 --- a/tests/helm/metadata_logs_otc_statefulset/static/basic.output.yaml +++ b/tests/helm/metadata_logs_otc_statefulset/static/basic.output.yaml @@ -65,7 +65,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/metadata_metrics_otc_statefulset/static/basic.output.yaml b/tests/helm/metadata_metrics_otc_statefulset/static/basic.output.yaml index 7054300748..ec66aabcb8 100644 --- a/tests/helm/metadata_metrics_otc_statefulset/static/basic.output.yaml +++ b/tests/helm/metadata_metrics_otc_statefulset/static/basic.output.yaml @@ -65,7 +65,7 @@ spec: priorityClassName: "prio" containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent args: - --config=/etc/otel/config.yaml diff --git a/tests/helm/otelcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.output.yaml b/tests/helm/otelcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.output.yaml index 6b8435fd43..6537cda4c2 100644 --- a/tests/helm/otelcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.output.yaml +++ b/tests/helm/otelcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.output.yaml @@ -52,7 +52,7 @@ spec: fsGroup: 999 containers: - name: otelcol - image: public.ecr.aws/sumologic/sumologic-otel-collector:0.69.0-sumo-0 + image: public.ecr.aws/sumologic/sumologic-otel-collector:0.71.0-sumo-0 imagePullPolicy: IfNotPresent args: - "--config=/conf/otelcol.instrumentation.conf.yaml" diff --git a/tests/integration/values/values_helm_default_ot_fips_metadata.yaml b/tests/integration/values/values_helm_default_ot_fips_metadata.yaml index 642f30265a..c60f12e623 100644 --- a/tests/integration/values/values_helm_default_ot_fips_metadata.yaml +++ b/tests/integration/values/values_helm_default_ot_fips_metadata.yaml @@ -1,3 +1,3 @@ metadata: image: - tag: 0.69.0-sumo-0-fips + tag: 0.71.0-sumo-0-fips