Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade otelcol to 0.71.0-sumo-0 #2872

Merged
merged 1 commit into from
Feb 14, 2023
Merged

chore: upgrade otelcol to 0.71.0-sumo-0 #2872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/2872.changed.txt
View file
Open in desktop
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
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/helm/events_otc_statefulset/static/annotations_labels.output.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/helm/metadata_logs_otc_statefulset/static/basic.output.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/helm/metadata_metrics_otc_statefulset/static/basic.output.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...telcol-instrumentation-statefulset/static/otelcol-instrumentation-statefulset.output.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/integration/values/values_helm_default_ot_fips_metadata.yaml
View file
Open in desktop
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