Skip to content

Commit

Permalink
chore: Upgrade otel to v0.102.1-sumo-0 (#3814)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnishtala-sumo
rnishtala-sumo authored Jul 26, 2024
1 parent f766cf9 commit 641ff92
Show file tree
Hide file tree
Showing 21 changed files with 33 additions and 18 deletions.
1 change: 1 addition & 0 deletions .changelog/3814.changed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: Upgrade otel to v0.102.1-sumo-0
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 @@ -165,7 +165,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.100.0-sumo-0` |
| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.102.1-sumo-0` |
| `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 @@ -448,7 +448,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.100.0-sumo-0` |
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.102.1-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
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 @@ -240,7 +240,7 @@ sumologic:
### Global configuration for OpenTelemetry Collector
otelcolImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.100.0-sumo-0"
tag: "0.102.1-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 @@ -3773,7 +3773,7 @@ tracesSampler:
spike_limit_percentage: 20

## Smart cascading filtering rules with preset limits.
## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.100.0-sumo-0/pkg/processor/cascadingfilterprocessor
## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.102.1-sumo-0/pkg/processor/cascadingfilterprocessor
## for details.
cascading_filter:
## Max number of traces for which decisions are kept in memory
Expand Down Expand Up @@ -4659,7 +4659,7 @@ opentelemetry-operator:
manager:
collectorImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.100.0-sumo-0"
tag: "0.102.1-sumo-0"
env: {}
resources:
limits:
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 @@ -110,7 +110,7 @@ The following table displays the currently used software versions for our Helm c

| Name | Version |
| ----------------------------------------- | ------- |
| OpenTelemetry Collector | 0.100.0 |
| OpenTelemetry Collector | 0.102.1 |
| OpenTelemetry Operator | 0.49.0 |
| kube-prometheus-stack/Prometheus Operator | 40.5.0 |
| Falco | 3.8.7 |
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
containers:
- args:
- --config=/etc/otelcol/config.yaml
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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/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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
restartPolicy: Always
containers:
- name: otelcol
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-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
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.100.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.102.1-sumo-0"
imagePullPolicy: IfNotPresent
args:
- --config=/conf/traces.sampler.conf.yaml
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/helm_ot_default_namespaceoverride_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ func Test_Helm_Default_OT_NamespaceOverride(t *testing.T) {
expectedMetrics := internal.DefaultExpectedMetrics
// we have tracing enabled, so check tracing-specific metrics
expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...)
// File consumer metrics in v104
expectedMetrics = append(expectedMetrics, internal.FileConsumerOtelColMetrics...)

installChecks := []featureCheck{
CheckSumologicSecret(15),
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/helm_ot_default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ func Test_Helm_Default_OT(t *testing.T) {
expectedMetrics := internal.DefaultExpectedMetrics
// we have tracing enabled, so check tracing-specific metrics
expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...)
// File consumer metrics in v104
expectedMetrics = append(expectedMetrics, internal.FileConsumerOtelColMetrics...)

installChecks := []featureCheck{
CheckSumologicSecret(15),
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/helm_otc_fips_metadata_installation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ func Test_Helm_Default_OT_FIPS(t *testing.T) {
expectedMetrics := internal.DefaultExpectedMetrics
// we have tracing enabled, so check tracing-specific metrics
expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...)
// File consumer metrics in v104
expectedMetrics = append(expectedMetrics, internal.FileConsumerOtelColMetrics...)

installChecks := []featureCheck{
CheckSumologicSecret(15),
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/helm_otlp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ func Test_Helm_OTLP(t *testing.T) {
expectedMetrics := internal.DefaultExpectedMetrics
// we have tracing enabled, so check tracing-specific metrics
expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...)
// File consumer metrics in v104
expectedMetrics = append(expectedMetrics, internal.FileConsumerOtelColMetrics...)

installChecks := []featureCheck{
CheckSumologicSecret(15),
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/internal/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ var (
"otelcol_otelsvc_k8s_owner_table_size",
"otelcol_exporter_send_failed_metric_points",
}

FileConsumerOtelColMetrics = []string{
"otelcol_fileconsumer_reading_files",
"otelcol_fileconsumer_open_files",
}

LogsOtelcolMetrics = []string{
"otelcol_exporter_sent_log_records",
"otelcol_exporter_send_failed_log_records",
Expand Down

0 comments on commit 641ff92

Please sign in to comment.