From ae3b14e66bff2ef57884ad4ec5c32c1ec35decc2 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 2 Mar 2022 11:58:26 +0100 Subject: [PATCH 1/5] Update OTLP http endpoint port --- deploy/helm/sumologic/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index f15fc82455..9568a1549f 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -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: @@ -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: From 45ad794afdae92265c6dd44976dd6d2d7ff8609b Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 2 Mar 2022 11:58:36 +0100 Subject: [PATCH 2/5] Update tests --- .../helm/tracing/static/collection-monitoring-false.output.yaml | 2 +- tests/helm/tracing/static/simple.output.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/helm/tracing/static/collection-monitoring-false.output.yaml b/tests/helm/tracing/static/collection-monitoring-false.output.yaml index 790b4faeaa..36c36235fe 100644 --- a/tests/helm/tracing/static/collection-monitoring-false.output.yaml +++ b/tests/helm/tracing/static/collection-monitoring-false.output.yaml @@ -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: diff --git a/tests/helm/tracing/static/simple.output.yaml b/tests/helm/tracing/static/simple.output.yaml index d74e66a601..b3821b6c88 100644 --- a/tests/helm/tracing/static/simple.output.yaml +++ b/tests/helm/tracing/static/simple.output.yaml @@ -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: From d80d54bc50a6672b937140eb7ba09aa00665cbf4 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 2 Mar 2022 12:49:18 +0100 Subject: [PATCH 3/5] add 4318 port to ds, dep and svcs --- .../sumologic/templates/traces/otel-agent/daemonset.yaml | 5 +++-- .../helm/sumologic/templates/traces/otel-agent/service.yaml | 4 +++- .../helm/sumologic/templates/traces/otelcol/deployment.yaml | 3 ++- deploy/helm/sumologic/templates/traces/otelcol/service.yaml | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/deploy/helm/sumologic/templates/traces/otel-agent/daemonset.yaml b/deploy/helm/sumologic/templates/traces/otel-agent/daemonset.yaml index 11b9598a51..029d966244 100644 --- a/deploy/helm/sumologic/templates/traces/otel-agent/daemonset.yaml +++ b/deploy/helm/sumologic/templates/traces/otel-agent/daemonset.yaml @@ -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 diff --git a/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml b/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml index cba298e4c7..86dac0d4c4 100644 --- a/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml +++ b/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml @@ -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 }} diff --git a/deploy/helm/sumologic/templates/traces/otelcol/deployment.yaml b/deploy/helm/sumologic/templates/traces/otelcol/deployment.yaml index 8dd1fc8a4e..0a87a4fda7 100644 --- a/deploy/helm/sumologic/templates/traces/otelcol/deployment.yaml +++ b/deploy/helm/sumologic/templates/traces/otelcol/deployment.yaml @@ -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 diff --git a/deploy/helm/sumologic/templates/traces/otelcol/service.yaml b/deploy/helm/sumologic/templates/traces/otelcol/service.yaml index 5757b84032..09c2a216d4 100644 --- a/deploy/helm/sumologic/templates/traces/otelcol/service.yaml +++ b/deploy/helm/sumologic/templates/traces/otelcol/service.yaml @@ -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 }} From e0b3bddbf3d1ae7a70cd48e8fd97d08a75e0727d Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Thu, 3 Mar 2022 15:32:04 +0100 Subject: [PATCH 4/5] Update Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1647dda35e..6a03991dfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat(otellogs): add multipart merge configuration for docker and cri [#2162][#2162] - chore(otellogs): increase send_batch_size to 10240 [#2161][#2161] - chore(fluent-bit): update to 0.14.1 [#2155][#2155] +- feat(tracing): change otlp http receiver default port to 4318 [#2170][#2170] ### Fixed @@ -45,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2161]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2161 [#2162]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2162 [#2165]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2165 +[#2170]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2170 ## [v2.5.2] From ccdb6e62e590893e4a4dba4fc3064a5914521316 Mon Sep 17 00:00:00 2001 From: "Mateusz \"mat\" Rumian" <58699800+mat-rumian@users.noreply.github.com> Date: Thu, 3 Mar 2022 16:45:07 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md Co-authored-by: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e1255871a..f5d591778e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed + - feat(tracing): change otlp http receiver default port to 4318 [#2170][#2170] ### Fixed