Skip to content

Commit

Permalink
chore: update OpenTelemetry Collector to v0.99.0-sumo-0
Browse files Browse the repository at this point in the history
  • Loading branch information
@swiatekm-sumo
swiatekm-sumo committed May 13, 2024
1 parent b099d19 commit c1f9b11
Show file tree
Hide file tree
Showing 24 changed files with 28 additions and 42 deletions.
1 change: 1 addition & 0 deletions .changelog/3696.changed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: update OpenTelemetry Collector to v0.99.0-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.92.0-sumo-0` |
| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.99.0-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.92.0-sumo-0` |
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.99.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
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/logs/collector/otelcloudwatch/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ processors:
is_first_entry: attributes.log matches {{ .Values.sumologic.logs.multiline.first_line_regex | quote }}
source_identifier: resource["cloudwatch.log.stream"]
type: recombine
max_unmatched_batch_size: 1
receivers:
awscloudwatch:
region: {{ .Values.sumologic.logs.collector.otelcloudwatch.region }}
Expand Down
1 change: 1 addition & 0 deletions deploy/helm/sumologic/conf/logs/collector/otelcol/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ receivers:
source_identifier: attributes["log.file.path"]
output: clean-up-log-file-path
type: recombine
max_unmatched_batch_size: 1
{{- end }}

## merge-multiline-logs merges incoming log records into multiline logs.
Expand Down
4 changes: 0 additions & 4 deletions deploy/helm/sumologic/conf/logs/otelcol/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ exporters:
{{ if .Values.sumologic.logs.container.enabled }}
sumologic/containers:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: {{ include "logs.otelcol.container.exporter.format" . }}
sending_queue:
enabled: true
Expand All @@ -18,8 +16,6 @@ exporters:
{{ if .Values.sumologic.logs.systemd.enabled }}
sumologic/systemd:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: json
sending_queue:
enabled: true
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.92.0-sumo-0"
tag: "0.99.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 @@ -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.92.0-sumo-0/pkg/processor/cascadingfilterprocessor
## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.99.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 @@ -4659,7 +4659,7 @@ opentelemetry-operator:
manager:
collectorImage:
repository: "public.ecr.aws/sumologic/sumologic-otel-collector"
tag: "0.92.0-sumo-0"
tag: "0.99.0-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.92.0 |
| OpenTelemetry Collector | 0.99.0 |
| OpenTelemetry Operator | 0.49.0 |
| kube-prometheus-stack/Prometheus Operator | 40.5.0 |
| Falco | 3.8.7 |
Expand Down
4 changes: 2 additions & 2 deletions docs/best-practices.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ metadata:
```

In the example above, two internally defined processors were used in metadata pipeline:
[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.92.0/processor/batchprocessor) and
[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.92.0/processor/memorylimiterprocessor). If you need to
[batch](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.99.0/processor/batchprocessor) and
[memory limiter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.99.0/processor/memorylimiterprocessor). If you need to
change the parameters of these processors in any way, you can define your own and use them in this pipeline.

## Removing attributes from systemd logs
Expand Down
12 changes: 2 additions & 10 deletions tests/helm/logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,13 @@ func TestMetadataLogFormat(t *testing.T) {
Exporters struct {
Containers struct {
LogFormat string `yaml:"log_format"`
JsonLogs struct {
FlattenBody bool `yaml:"flatten_body"`
} `yaml:"json_logs"`
} `yaml:"sumologic/containers"`
}
}

testCases := []struct {
logFormat string
expectedExporterLogFormat string
expectedExporterFlattenBody bool
logFormat string
expectedExporterLogFormat string
}{
{
logFormat: "json",
Expand Down Expand Up @@ -256,7 +252,6 @@ sumologic:
err := yaml.Unmarshal([]byte(otelConfigYaml), &otelConfig)
require.NoError(t, err)
require.Equal(t, testCase.expectedExporterLogFormat, otelConfig.Exporters.Containers.LogFormat)
require.False(t, otelConfig.Exporters.Containers.JsonLogs.FlattenBody)
})
}
}
Expand All @@ -269,9 +264,6 @@ func TestMetadataLogFormatOTLP(t *testing.T) {
Exporters struct {
SumoLogic struct {
LogFormat string `yaml:"log_format"`
JsonLogs struct {
FlattenBody bool `yaml:"flatten_body"`
} `yaml:"json_logs"`
} `yaml:"sumologic"`
}
Processors map[string]interface{}
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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
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.92.0-sumo-0
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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.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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0"
imagePullPolicy: IfNotPresent
name: otelcol
livenessProbe:
Expand Down
3 changes: 3 additions & 0 deletions tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ data:
id: merge-multiline-logs-0
is_first_entry: body matches "@@@Log beginning"
max_unmatched_batch_size: 1
output: clean-up-log-file-path
source_identifier: attributes["log.file.path"]
type: recombine
Expand All @@ -163,6 +164,7 @@ data:
id: merge-multiline-logs-1
is_first_entry: body matches "---Log beginning"
max_unmatched_batch_size: 1
output: clean-up-log-file-path
source_identifier: attributes["log.file.path"]
type: recombine
Expand All @@ -171,6 +173,7 @@ data:
id: merge-multiline-logs-2
is_first_entry: 'body matches ": : : Log beginning"'
max_unmatched_batch_size: 1
output: clean-up-log-file-path
source_identifier: attributes["log.file.path"]
type: recombine
Expand Down
4 changes: 0 additions & 4 deletions tests/helm/testdata/goldenfile/metadata_logs_otc/otel.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ data:
exporters:
sumologic/containers:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: json
sending_queue:
enabled: true
Expand All @@ -25,8 +23,6 @@ data:
storage: file_storage
sumologic/systemd:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: json
sending_queue:
enabled: true
Expand Down
4 changes: 0 additions & 4 deletions tests/helm/testdata/goldenfile/metadata_logs_otc/templates.output.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ data:
exporters:
sumologic/containers:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: json
sending_queue:
enabled: true
Expand All @@ -25,8 +23,6 @@ data:
storage: file_storage
sumologic/systemd:
endpoint: ${SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE}
json_logs:
add_timestamp: false
log_format: json
sending_queue:
enabled: true
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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
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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.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/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.92.0-sumo-0"
image: "public.ecr.aws/sumologic/sumologic-otel-collector:0.99.0-sumo-0"
mode: statefulset
replicas: 1
serviceAccount: RELEASE-NAME-sumologic-metrics
Expand Down

0 comments on commit c1f9b11

Please sign in to comment.