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 otel collector to v108 #3855

Merged
merged 4 commits into from
Oct 10, 2024
+45 −51
Merged

chore: Upgrade otel collector to v108 #3855

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcd5793
chore: Upgrading otel to v0.108.0-sumo-0
rnishtala-sumo Oct 9, 2024
2241269
chore: Update documentation
rnishtala-sumo Oct 9, 2024
c90d850
fix: the otel collector is now strict about type checking
rnishtala-sumo Oct 9, 2024
0de3762
Remove the otelsvc metrics from the default list
rnishtala-sumo Oct 10, 2024
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/3855.changed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: Upgrading otel to v0.108.0-sumo-0
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,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.104.0-sumo-1` |
| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.108.0-sumo-0` |
| `sumologic.otelcolImage.addFipsSuffix` | Add a `-fips` suffix to all image tags. See [help.sumologic.com/docs/send-data/kubernetes/security-best-practices](https://help.sumologic.com/docs/send-data/kubernetes/security-best-practices/) for more information. | `false` |
| `sumologic.podLabels` | Additional labels for the pods. | `{}` |
| `sumologic.podAnnotations` | Additional annotations for the pods. | `{}` |
Expand Down Expand Up @@ -322,7 +322,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `opentelemetry-operator.manager.autoInstrumentationImage.nodejs.tag` | OpenTelemetry Operator NodeJS Instrumentation image tag. | `0.40.0` |
| `opentelemetry-operator.manager.image.repository` | The default operator image repository for OpenTelemetry. | `public.ecr.aws/sumologic/opentelemetry-operator` |
| `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.104.0-sumo-1` |
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.108.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` |
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ sumologic:
### Global configuration for OpenTelemetry Collector
otelcolImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.104.0-sumo-1"
tag: "0.108.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.
Expand Down Expand Up @@ -2487,7 +2487,7 @@ opentelemetry-operator:
repository: public.ecr.aws/sumologic/opentelemetry-operator
collectorImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.104.0-sumo-1"
tag: "0.108.0-sumo-0"
autoInstrumentationImage:
java:
repository: public.ecr.aws/sumologic/autoinstrumentation-java
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
priorityClassName: "prio"
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otel/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/events_otc_statefulset/common.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
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.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
args:
- --config=/etc/otelcol/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/additional-complex.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_daemonset/additional.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional-complex.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/additional.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
- "otelcol-sumo.exe"
args:
- --config=etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
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.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
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.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/debug.output.yaml
View file
Open in desktop
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.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/kubelet.output.yaml
View file
Open in desktop
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.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
fsGroup: 999
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
restartPolicy: Always
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
args:
- --config=/conf/traces.sampler.conf.yaml
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/testdata/goldenfile/traces-sampler-deployment/persistence-enabled.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.104.0-sumo-1"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.108.0-sumo-0"
imagePullPolicy: IfNotPresent
args:
- --config=/conf/traces.sampler.conf.yaml
Expand Down
Loading