Skip to content

Commit

Permalink
fix: downgrade otel to 0.86.0-sumo-1
Browse files Browse the repository at this point in the history 
This is mitigates
open-telemetry/opentelemetry-collector-contrib#28567

(cherry picked from commit 5eb480b)
  • Loading branch information
@swiatekm
swiatekm committed Oct 25, 2023
1 parent dfa899b commit ada8a7b
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 30 deletions.
1 change: 1 addition & 0 deletions .changelog/3352.fixed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: downgrade otel to 0.86.0-sumo-1
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. | `{}` |
Expand Down Expand Up @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/sumologic/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions docs/best-practices.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/collecting-container-logs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 7 additions & 7 deletions docs/security-best-practices.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/v4-migration-doc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/working-with-container-registries.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/proxy.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_cloudwatch/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metadata_logs_otc_statefulset/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metadata_metrics_otc_statefulset/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/otelcol-instrumentation-statefulset/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-gateway-deployment/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-sampler-deployment/basic.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ada8a7b

Please sign in to comment.