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.

Sign up for GitHub

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

Jump to bottom

feat: change otlp http receiver port - tracing #2170

Merged
merged 6 commits into from
Mar 3, 2022
Merged

feat: change otlp http receiver port - tracing #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae3b14e
Update OTLP http endpoint port
mat-rumian Mar 2, 2022
45ad794
Update tests
mat-rumian Mar 2, 2022
d80d54b
add 4318 port to ds, dep and svcs
mat-rumian Mar 2, 2022
e0b3bdd
Update Changelog
mat-rumian Mar 3, 2022
ebadd53
Merge branch 'main' into feat-otc-http-port-update
mat-rumian Mar 3, 2022
ccdb6e6
Update CHANGELOG.md
mat-rumian Mar 3, 2022
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
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Added

### Changed

- feat(tracing): change otlp http receiver default port to 4318 [#2170][#2170]

### Fixed

[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.6.0...main
[#2170]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2170

## [v2.6.0][v2.6.0]

### Released 2022-03-03
Expand Down
5 changes: 3 additions & 2 deletions deploy/helm/sumologic/templates/traces/otel-agent/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ spec:
- containerPort: 14268 # Default endpoint for Jaeger HTTP receiver.
- containerPort: 55678 # Default endpoint for Opencensus receiver.
- containerPort: 4317 # Default endpoint for OTLP receiver.
- containerPort: 55680 # Old endpoint for OTLP receiver.
- containerPort: 55681 # Default endpoint for OTLP HTTP receiver.
- containerPort: 4318 # Default endpoint for OTLP HTTP receiver.
- containerPort: 55680 # Old endpoint for OTLP gRPC receiver.
- containerPort: 55681 # Default endpoint for OTLP HTTP receiver. (deprecated)
volumeMounts:
- name: otelagent-config-vol
mountPath: /conf
Expand Down
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/templates/traces/otel-agent/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ spec:
port: 55678
- name: otlp-grpc # Default endpoint for OTLP gRPC receiver.
port: 4317
- name: otlp-http # Default endpoint for OTLP HTTP receiver.
port: 4318
- name: otlp-grpc-old # Old endpoint for OTLP gRPC receiver.
port: 55680
- name: otlp-http # Default endpoint for OTLP HTTP receiver.
- name: otlp-http-old # Default endpoint for OTLP HTTP receiver.
port: 55681
{{- end }}
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/templates/traces/otelcol/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ spec:
- containerPort: 14268 # Default endpoint for Jaeger HTTP receiver.
- containerPort: 55678 # Default endpoint for Opencensus receiver.
- containerPort: 4317 # Default endpoint for OTLP gRPC receiver.
- containerPort: 4318 # Default endpoint for OTLP HTTP receiver.
- containerPort: 55680 # Old endpoint for OTLP gRPC receiver.
- containerPort: 55681 # Default endpoint for OTLP HTTP receiver.
- containerPort: 55681 # Default endpoint for OTLP HTTP receiver. (deprecated)
volumeMounts:
- name: otel-collector-config-vol
mountPath: /conf
Expand Down
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/templates/traces/otelcol/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ spec:
port: 55678
- name: otlp-grpc # Default endpoint for OTLP gRPC receiver.
port: 4317
- name: otlp-http # Default endpoint for OTLP HTTP receiver.
port: 4318
- name: otlp-grpc-old # Old endpoint for OTLP gRPC receiver.
port: 55680
- name: otlp-http # Default endpoint for OTLP HTTP receiver.
- name: otlp-http-old # Default endpoint for OTLP HTTP receiver.
port: 55681
{{- end }}
4 changes: 2 additions & 2 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3261,7 +3261,7 @@ otelagent:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:55681"
endpoint: "0.0.0.0:4318"
zipkin:
endpoint: "0.0.0.0:9411"
processors:
Expand Down Expand Up @@ -3380,7 +3380,7 @@ otelcol:
grpc:
endpoint: "0.0.0.0:4317"
http:
endpoint: "0.0.0.0:55681"
endpoint: "0.0.0.0:4318"
zipkin:
endpoint: "0.0.0.0:9411"
processors:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/tracing/static/collection-monitoring-false.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ data:
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:55681
endpoint: 0.0.0.0:4318
zipkin:
endpoint: 0.0.0.0:9411
service:
Expand Down
2 changes: 1 addition & 1 deletion tests/helm/tracing/static/simple.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ data:
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:55681
endpoint: 0.0.0.0:4318
zipkin:
endpoint: 0.0.0.0:9411
service:
Expand Down