Skip to content

Commit

Permalink
chore: upgrade otelcol to 0.71.0-sumo-0
Browse files Browse the repository at this point in the history
  • Loading branch information
swiatekm-sumo committed Feb 14, 2023
1 parent 7ad390d commit 73241d7
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 37 deletions.
1 change: 1 addition & 0 deletions .changelog/2872.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: upgrade otelcol to 0.71.0-sumo-0
12 changes: 6 additions & 6 deletions deploy/helm/sumologic/README.md

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions deploy/helm/sumologic/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions docs/security-best-practices.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/events_otc_statefulset/static/basic.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/helm/logs_otc_daemonset/static/additional.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/logs_otc_daemonset/static/basic.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/logs_otc_daemonset/static/complex.output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
metadata:
image:
tag: 0.69.0-sumo-0-fips
tag: 0.71.0-sumo-0-fips

0 comments on commit 73241d7

Please sign in to comment.