Skip to content

Commit

Permalink
Merge branch 'release-v3.19' into backport-3783-to-release-v3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnishtala-sumo
rnishtala-sumo committed Jul 25, 2024
2 parents 7e5bea3 + 7f18fb0 commit 53dc1af
Show file tree
Hide file tree
Showing 39 changed files with 85 additions and 54 deletions.
1 change: 1 addition & 0 deletions .changelog/3787.fixed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: join multiparts on file beginning
1 change: 1 addition & 0 deletions .changelog/3791.changed.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: upgrade terraform providers versions in setup
22 changes: 22 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

<!-- towncrier release notes start -->

## [v3.19.4]

### Released 2024-05-27

### Changed

- deps: update OpenTelemetry Collector to v0.100.0-sumo-0 [#3738]

[#3738]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3738
[v3.19.4]: https://github.com/SumoLogic/sumologic-kubernetes-collection/releases/v3.19.4

## [v3.19.3]

### Released 2024-05-23

### Changed

- chore(deps): update Fluent Bit to 3.0.4 [#3729]

[#3729]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3729
[v3.19.3]: https://github.com/SumoLogic/sumologic-kubernetes-collection/releases/v3.19.3

## [v3.19.2]

### Released 2024-05-22
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: sumologic
version: 3.19.2
appVersion: 3.19.2
version: 3.19.4
appVersion: 3.19.4
description: A Helm chart for collecting Kubernetes logs, metrics, traces and events into Sumo Logic.
type: application
keywords:
Expand Down
6 changes: 3 additions & 3 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.99.0-sumo-0` |
| `sumologic.otelcolImage.tag` | Default image tag for OpenTelemetry Collector. This can be overridden for specific components. | `0.100.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 @@ -348,7 +348,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `fluent-bit.extraVolumes` | Additional volumes for Fluent Bit pods. | `[{"hostPath": {"path": "/var/lib/fluent-bit", "type": "DirectoryOrCreate"}, "name": "tail-db"}]` |
| `fluent-bit.image.pullPolicy` | Image pullPolicy for Fluent Bit docker container. | `IfNotPresent` |
| `fluent-bit.image.repository` | Image repository for Fluent Bit docker container. | `public.ecr.aws/sumologic/fluent-bit` |
| `fluent-bit.image.tag` | Image tag for Fluent Bit docker container. | `2.2.0` |
| `fluent-bit.image.tag` | Image tag for Fluent Bit docker container. | `3.0.4` |
| `fluent-bit.imagePullSecrets` | Pull secrets for Fluent Bit images. For more information on using Kubernetes secrets with container registries please refer to [Creating a Secret with a Docker config at kubernetes.io](https://kubernetes.io/docs/concepts/containers/images/#creating-a-secret-with-a-docker-config). | `[{"name": "image-pull-secret"}]` |
| `fluent-bit.securityContext` | The securityContext configuration for Fluent Bit. | `{"capabilities": {"drop": ["ALL"]}, "privileged": true}` |
| `fluent-bit.service.labels` | Labels for Fluent Bit service. | `{"sumologic.com/scrape": "true"}` |
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.99.0-sumo-0` |
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.100.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 @@ -61,6 +61,7 @@ processors:
overwrite_with: newest
source_identifier: resource["cloudwatch.log.stream"]
type: recombine
max_unmatched_batch_size: 0
- id: merge-multiline-logs
combine_field: attributes.log
combine_with: "\n"
Expand Down
2 changes: 2 additions & 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 @@ -122,6 +122,7 @@ receivers:
output: strip-trailing-newline
source_identifier: attributes["log.file.path"]
type: recombine
max_unmatched_batch_size: 0

## merge-cri-lines stitches back together log lines split by CRI logging drivers.
## Input Body (JSON): { "log": "2001-02-03 04:05:06 very long li", "logtag": "P" }
Expand All @@ -135,6 +136,7 @@ receivers:
overwrite_with: newest
source_identifier: attributes["log.file.path"]
type: recombine
max_unmatched_batch_size: 0

## strip-trailing-newline removes the trailing "\n" from the `log` key. This is required for logs coming from Docker container runtime.
## Input Body (JSON): { "log": "2001-02-03 04:05:06 very long line that was split by the logging driver\n", "stream": "stdout" }
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/conf/setup/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ terraform {
required_providers {
sumologic = {
source = "sumologic/sumologic"
version = "~> 2.18"
version = ">= 2.31.0, < 3.0.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 2.4"
version = "~> 2.31.0"
}
}
}
8 changes: 4 additions & 4 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.99.0-sumo-0"
tag: "0.100.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 @@ -1373,7 +1373,7 @@ fluent-bit:
# - name: "image-pull-secret"
image:
repository: public.ecr.aws/sumologic/fluent-bit
tag: 2.2.0
tag: 3.0.4
pullPolicy: IfNotPresent

## Resource limits for Fluent Bit
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.99.0-sumo-0/pkg/processor/cascadingfilterprocessor
## Please see https://github.com/SumoLogic/sumologic-otel-collector/tree/v0.100.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.99.0-sumo-0"
tag: "0.100.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.99.0 |
| OpenTelemetry Collector | 0.100.0 |
| OpenTelemetry Operator | 0.49.0 |
| kube-prometheus-stack/Prometheus Operator | 40.5.0 |
| Falco | 3.8.7 |
Expand Down
Loading

0 comments on commit 53dc1af

Please sign in to comment.