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.

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 OpenTelemetry Collector to 0.104.0-sumo-1 #3829

Merged
merged 5 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/3829.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: update OpenTelemetry Collector to 0.104.0-sumo-1
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/README.md
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.102.1-sumo-0` |
| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.104.0-sumo-1` |
| `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.102.1-sumo-0` |
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.104.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
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/conf/events/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ extensions:
directory: {{ .Values.sumologic.events.persistence.persistentVolume.path }}
timeout: 10s
{{- end }}
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exporters:
endpoint: ${SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE}
## Compression encoding format, either empty string (""), gzip or deflate (default gzip).
## Empty string means no compression
compress_encoding: gzip
compression: gzip
## Max HTTP request body size in bytes before compression (if applied). By default 1_048_576 (1MB) is used.
max_request_body_size: 1_048_576 # 1MB
## Format to use when sending logs to Sumo. (default json) (possible values: json, text)
Expand Down Expand Up @@ -62,27 +62,27 @@ receivers:
jaeger:
protocols:
thrift_compact:
endpoint: "0.0.0.0:6831"
endpoint: "${env:MY_POD_IP}:6831"
thrift_binary:
endpoint: "0.0.0.0:6832"
endpoint: "${env:MY_POD_IP}:6832"
grpc:
endpoint: "0.0.0.0:14250"
endpoint: "${env:MY_POD_IP}:14250"
thrift_http:
endpoint: "0.0.0.0:14268"
endpoint: "${env:MY_POD_IP}:14268"
opencensus:
endpoint: "0.0.0.0:55678"
endpoint: "${env:MY_POD_IP}:55678"
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
endpoint: "${env:MY_POD_IP}:4317"
http:
endpoint: "0.0.0.0:4318"
endpoint: "${env:MY_POD_IP}:4318"
otlp/deprecated:
protocols:
http:
endpoint: "0.0.0.0:55681"
endpoint: "${env:MY_POD_IP}:55681"
zipkin:
endpoint: "0.0.0.0:9411"
endpoint: "${env:MY_POD_IP}:9411"

processors:
## Source processor adds Sumo Logic related metadata
Expand Down Expand Up @@ -173,7 +173,8 @@ processors:
## Time duration after which a batch will be sent regardless of size
timeout: 5s
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
memory_ballast:
## Memory Ballast size should be max 1/3 to 1/2 of memory.
size_mib: 512
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
endpoint: "${env:MY_POD_IP}:4317"
http:
endpoint: "0.0.0.0:4318"
endpoint: "${env:MY_POD_IP}:4318"
processors:
## The memory_limiter processor is used to prevent out of memory situations on the collector.
memory_limiter:
Expand Down Expand Up @@ -55,7 +55,8 @@ processors:
## Never more than this many spans are being sent in a batch
# send_batch_max_size: 512
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
memory_ballast:
## Memory Ballast size should be max 1/3 to 1/2 of memory.
size_mib: 512
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ receivers:
otlp:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
endpoint: "${env:MY_POD_IP}:4317"
http:
endpoint: "0.0.0.0:4318"
endpoint: "${env:MY_POD_IP}:4318"
processors:
## The memory_limiter processor is used to prevent out of memory situations on the collector.
memory_limiter:
Expand Down Expand Up @@ -70,7 +70,8 @@ processors:
timeout: 5s

extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
{{- if .Values.tracesSampler.persistence.enabled }}
## Configuration for File Storage extension
file_storage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ extensions:
directory: /var/lib/storage/otc
timeout: 10s
{{ end }}
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ extensions:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}

processors:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ extensions:
on_rebound: true
directory: /var/lib/storage/otc
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}

processors:
Expand Down
5 changes: 3 additions & 2 deletions deploy/helm/sumologic/conf/logs/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ exporters:
{{- end }}

extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
{{ if .Values.metadata.persistence.enabled }}
## Configuration for File Storage extension
file_storage:
Expand Down Expand Up @@ -509,7 +510,7 @@ receivers:
otlp:
protocols:
http:
endpoint: 0.0.0.0:4318
endpoint: ${env:MY_POD_IP}:4318
{{ end }}

service:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ exporters:
disable_keep_alives: true

extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
file_storage:
directory: /var/lib/storage/otc
Expand Down
5 changes: 3 additions & 2 deletions deploy/helm/sumologic/conf/metrics/otelcol/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ extensions:
directory: /var/lib/storage/otc
timeout: 10s
{{ end }}
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}

processors:
Expand Down Expand Up @@ -40,7 +41,7 @@ receivers:
otlp:
protocols:
http:
endpoint: 0.0.0.0:4318
endpoint: ${env:MY_POD_IP}:4318

service:
extensions:
Expand Down
8 changes: 8 additions & 0 deletions deploy/helm/sumologic/templates/_helpers/_common.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,14 @@ Example Usage:
{{- end -}}
{{- end -}}

{{- define "pod-ip" -}}
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
{{- end -}}

{{/*
Pod anti affinity "hard"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ spec:
{{- $ctx := .Values -}}
{{- include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "events") | nindent 8 -}}
{{- include "proxy-env-variables" . | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if .Values.otelevents.statefulset.extraEnvVars }}
{{ toYaml .Values.otelevents.statefulset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ spec:
env:
{{- $ctx := .Values -}}
{{- include "kubernetes.sources.env" (dict "Context" $ctx "Type" "metrics" "Name" "default" ) | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if $otelcolInstrumentation.statefulset.extraEnvVars }}
{{- toYaml $otelcolInstrumentation.statefulset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ spec:
{{- include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "traces") | nindent 8 -}}
{{- include "kubernetes.sources.env" (dict "Context" $ctx "Type" "metrics" "Name" "default" ) | nindent 8 }}
{{- include "proxy-env-variables" . | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if $tracesGateway.deployment.extraEnvVars }}
{{- toYaml $tracesGateway.deployment.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ spec:
{{- $ctx := .Values -}}
{{- include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "traces") | nindent 8 -}}
{{- include "proxy-env-variables" . | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if $tracesSampler.deployment.extraEnvVars }}
{{- toYaml $tracesSampler.deployment.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,5 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- include "pod-ip" . | nindent 8 -}}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- include "pod-ip" . | nindent 8 -}}
{{- if $daemonset.extraEnvVars }}
{{ toYaml $daemonset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
{{- include "pod-ip" . | nindent 8 -}}
{{- if $daemonset.extraEnvVars }}
{{ toYaml $daemonset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ spec:
{{- $ctx := .Values -}}
{{- include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "logs") | nindent 8 -}}
{{- include "proxy-env-variables" . | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if .Values.metadata.logs.statefulset.extraEnvVars }}
{{- toYaml .Values.metadata.logs.statefulset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: MY_POD_IP
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: status.podIP
podAnnotations:
## The operator adds this annotation by default, but we use our own ServiceMonitor
prometheus.io/scrape: "false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ spec:
{{- $ctx := .Values -}}
{{- include "kubernetes.sources.envs" (dict "Context" $ctx "Type" "metrics") | nindent 8 -}}
{{- include "proxy-env-variables" . | nindent 8 -}}
{{- include "pod-ip" . | nindent 8 -}}
{{- if .Values.metadata.metrics.statefulset.extraEnvVars }}
{{ toYaml .Values.metadata.metrics.statefulset.extraEnvVars | nindent 8 }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
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.102.1-sumo-0"
tag: "0.104.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 @@ -2487,7 +2487,7 @@ opentelemetry-operator:
repository: public.ecr.aws/sumologic/opentelemetry-operator
collectorImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.102.1-sumo-0"
tag: "0.104.0-sumo-1"
autoInstrumentationImage:
java:
repository: public.ecr.aws/sumologic/autoinstrumentation-java
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ The following table displays the currently used software versions for our Helm c

| Name | Version |
| ----------------------------------------- | ------- |
| OpenTelemetry Collector | 0.102.1 |
| OpenTelemetry Collector | 0.104.0 |
| OpenTelemetry Operator | 0.56.1 |
| kube-prometheus-stack/Prometheus Operator | 40.5.0 |
| Falco | 3.8.7 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ data:
file_storage:
directory: /var/lib/storage/events
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ data:
sending_queue:
enabled: true
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ data:
file_storage:
directory: /var/lib/storage/events
timeout: 10s
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
pprof: {}
processors:
batch:
Expand Down
Loading
Loading