Skip to content

Commit

Permalink
Pull master branch (#3842)
Browse files Browse the repository at this point in the history 
* feat: Add labels to setup Pods for easy logs collection (#3817)

* Add labels to setup Pods for easy logs collection

* Addressing comments

* remove unwanted line

* Addressing reviews and fixing bugs

* Fixing name and indent

* Fix test

* Removing the extra space

* Changed events to setup

* feat(metrics): Define allowlist for histogram metrics (#3821)

* feat(metrics): Define allowlist for histogram metrics

* Adding template and integration tests

* Removed KOPs 1.30, not supported yet (#3823)

* docs(histogram-metrics): Updates to the doc around allowing histogram metrics (#3824)

* chore: Upgrade OpenTelemetry Collector to 0.104.0-sumo-1 (#3829)

* chore: update OpenTelemetry Collector to 0.104.0-sumo-1

* Remove deprecated compress_encoding to use compression

* Change the bind address for the otel collector and the health check ext to the pod IP

* Regenerate test files after changes to bind IP address configuration across all pods

* Add otel collector labels to metrics collection

* fix(metrics): Correct the name of k8s hpa metrics (part of kube-state-metrics) (#3832)

* chore: Prepare release 4.10.0 (#3834)

* feat: Add support for the Korea region of the Sumologic deployment (#3835)

---------

Co-authored-by: Harsh Shah <[email protected]>
Co-authored-by: Raj Nishtala <[email protected]>
Co-authored-by: Tim <[email protected]>
  • Loading branch information
@jagan2221 @harshshahsumo
@rnishtala-sumo @chan-tim-sumo
4 people authored Sep 13, 2024
1 parent 961f23c commit 8b1494a
Show file tree
Hide file tree
Showing 141 changed files with 948 additions and 429 deletions.
1 change: 0 additions & 1 deletion .changelog/3795.changed.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3796.fixed.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3802.changed.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3803.changed.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3804.changed.1.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3804.changed.2.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3804.changed.3.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3804.changed.4.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3804.changed.5.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3808.changed.txt
View file

This file was deleted.

1 change: 0 additions & 1 deletion .changelog/3818.changed.txt
View file

This file was deleted.

41 changes: 41 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,47 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

<!-- towncrier release notes start -->

## [v4.10.0]

### Released 2024-08-23

### Breaking Changes

- feat: Do not send any histogram or summary metric [#3818]

### Added

- feat(metrics): Define allowlist for histogram metrics [#3821]

### Changed

- feat: Add support for custom pod label as global configuration [#3795]
- feat: Add support for custom pod annotation as global configuration [#3802]
- feat: Add support for custom service account annotation as global configuration [#3803]
- feat: add support for kubernetes 1.30 for GKE [#3804]
- feat: add support for kubernetes 1.30 for EKS [#3804]
- feat: add support for kubernetes 1.30 for AKS [#3804]
- feat: add support for kubernetes 4.16 for OpenShift [#3804]
- feat: Add support for custom image pull secrets tests as global configuration [#3808]
- chore: update OpenTelemetry Collector to 0.104.0-sumo-1 [#3829]

### Fixed

- fix(logs): do not add exporters mutliple times to the pipeline [#3796]
- fix(metrics): Correct the name of k8s hpa metrics (part of kube-state-metrics) [#3832]

[#3821]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3821
[#3795]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3795
[#3802]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3802
[#3803]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3803
[#3804]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3804
[#3808]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3808
[#3818]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3818
[#3829]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3829
[#3796]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3796
[#3832]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3832
[v4.10.0]: https://github.com/SumoLogic/sumologic-kubernetes-collection/releases/v4.10.0

## [v4.9.0]

### Released 2024-07-01
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ release.

| version | planned end of life date |
| ------------------------------------------------------------------------------------------------------- | ------------------------ |
| [v4.9](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.9/docs/README.md) | TBA |
| [v4.10](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.10/docs/README.md) | TBD |
| [v4.9](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.9/docs/README.md) | 2025-07-01 |
| [v4.8](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.8/docs/README.md) | 2025-01-01 |
| [v4.7](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.7/docs/README.md) | 2024-12-07 |
| [v4.6](https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/release-v4.6/docs/README.md) | 2024-10-10 |
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: 4.9.0
appVersion: 4.9.0
version: 4.10.0
appVersion: 4.10.0
description: A Helm chart for collecting Kubernetes logs, metrics, traces and events into Sumo Logic.
type: application
keywords:
Expand Down
5 changes: 3 additions & 2 deletions deploy/helm/sumologic/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `sumologic.metrics.collector.otelcol.config.override` | Configuration for otelcol metrics collector, replaces defaults. See also https://github.com/SumoLogic/sumologic-otel-collector/blob/main/docs/configuration.md. | {} |
| `sumologic.metrics.collector.otelcol.targetAllocator.resources` | Resource requests and limits for Metrics Collector Target Allocator. | {} |
| `sumologic.metrics.dropHistogramBuckets` | Drop buckets from histogram and summary metrics, leaving only the sum and count components. | `true` |
| `sumologic.metrics.allowHistogramRegex` | Allowlist for Histogram metrics, including the buckets | `"^$"` |
| `sumologic.metrics.sourceType` | The type of the Sumo Logic source being used for metrics ingestion. Can be `http` or `otlp`. | `otlp` |
| `sumologic.traces.enabled` | Set the enabled flag to true to enable tracing ingestion. _Tracing must be enabled for the account first. Please contact your Sumo representative for activation details_ | `true` |
| `sumologic.traces.spans_per_request` | Maximum number of spans sent in single batch | `100` |
Expand All @@ -169,7 +170,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 +323,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
View file
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
23 changes: 12 additions & 11 deletions deploy/helm/sumologic/conf/instrumentation/otelcol.instrumentation.conf.yaml
View file
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
Loading

0 comments on commit 8b1494a

Please sign in to comment.