From b8a0a106121fdfa6b2b5f9c35a2b06e452699a1a Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 22 Mar 2022 12:37:01 +0100 Subject: [PATCH 1/4] feat(notes): add information about tracing endpoints --- deploy/helm/sumologic/templates/NOTES.txt | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/deploy/helm/sumologic/templates/NOTES.txt b/deploy/helm/sumologic/templates/NOTES.txt index 3bb6e496df..047f1df3a8 100644 --- a/deploy/helm/sumologic/templates/NOTES.txt +++ b/deploy/helm/sumologic/templates/NOTES.txt @@ -23,6 +23,32 @@ We recommend turning this property on for production environments by setting met {{- end }} {{- end }} +{{- if eq .Values.sumologic.traces.enabled true }} + +Please see https://help.sumologic.com/Traces/01Getting_Started_with_Transaction_Tracing to find out +how to instrument your application and send traces. +The list of endpoints in your Kubernetes cluster to which traces can be sent: +{{- if eq .Values.otelagent.enabled false }} +- OTLP/http: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:4318 +- OTLP/gRPC: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:4317 +- Zipkin: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:9411/api/v2/spans +- Jaeger/gRPC: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:14250 +- Jaeger/Thrift/http: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:14268 +- Jaeger/Thrift/compact: {{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:6831 +- Jaeger/Thrift/binary: {{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:6832 +- OpenCensus: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:55678 +{{- else }} +- OTLP/http: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:4318 +- OTLP/gRPC: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:4317 +- Zipkin: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:9411/api/v2/spans +- Jaeger/gRPC: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:14250 +- Jaeger/Thrift/http: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:14268 +- Jaeger/Thrift/compact: {{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:6831 +- Jaeger/Thrift/binary: {{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:6832 +- OpenCensus: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:55678 +{{- end }} +{{- end }} + We've tried to automatically create fields. In an unlikely scenario that this fails please refer to the following to create them manually: https://github.com/SumoLogic/sumologic-kubernetes-collection/blob/2b3ca63/deploy/docs/Installation_with_Helm.md#prerequisite From 94f2c00762715445bb4efe8986883d36d6c37434 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 22 Mar 2022 12:41:22 +0100 Subject: [PATCH 2/4] chore(changelog): update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec142c5943..7af457593b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat: selectively disable cache for metadata enrichment calls [#2190][#2190] - feat(otelcol): introduce default initialDelaySeconds [#2200][#2200] - feat(otelcol): add startupProbe config option [#2201][#2201] +- feat(notes): add information about tracing receiver endpoints [#2209][#2209] ### Changed @@ -35,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2197]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2197 [#2200]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2200 [#2201]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2201 +[#2209]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2209 ## [v2.6.0][v2.6.0] From 3dab64f34d3fadfd8056d2f9392cc69df4c77ef0 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Thu, 9 Jun 2022 10:08:11 +0200 Subject: [PATCH 3/4] chore(notes): update tracing endpoints info --- deploy/helm/sumologic/templates/NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/helm/sumologic/templates/NOTES.txt b/deploy/helm/sumologic/templates/NOTES.txt index 047f1df3a8..9a1c430429 100644 --- a/deploy/helm/sumologic/templates/NOTES.txt +++ b/deploy/helm/sumologic/templates/NOTES.txt @@ -31,6 +31,7 @@ The list of endpoints in your Kubernetes cluster to which traces can be sent: {{- if eq .Values.otelagent.enabled false }} - OTLP/http: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:4318 - OTLP/gRPC: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:4317 +- OTLP/http/deprecated: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:55681 - Zipkin: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:9411/api/v2/spans - Jaeger/gRPC: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:14250 - Jaeger/Thrift/http: http://{{ template "sumologic.metadata.name.otelcol.service" . }}.{{ .Release.Namespace }}:14268 @@ -40,6 +41,7 @@ The list of endpoints in your Kubernetes cluster to which traces can be sent: {{- else }} - OTLP/http: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:4318 - OTLP/gRPC: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:4317 +- OTLP/http/deprecated: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:55681 - Zipkin: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:9411/api/v2/spans - Jaeger/gRPC: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:14250 - Jaeger/Thrift/http: http://{{ template "sumologic.metadata.name.otelagent.service" . }}.{{ .Release.Namespace }}:14268 From 02a93c5842f14b60f5fe08a51fa25472bb60cf70 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Thu, 9 Jun 2022 10:23:22 +0200 Subject: [PATCH 4/4] chore(services): add information about notes.txt --- deploy/helm/sumologic/templates/traces/otel-agent/service.yaml | 1 + deploy/helm/sumologic/templates/traces/otelcol/service.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml b/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml index 86dac0d4c4..1e3023318c 100644 --- a/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml +++ b/deploy/helm/sumologic/templates/traces/otel-agent/service.yaml @@ -11,6 +11,7 @@ spec: selector: app: {{ template "sumologic.labels.app.otelagent.pod" . }} component: {{ template "sumologic.labels.app.otelagent.component" . }} + # In case of changes related to open ports for otelagent please update NOTES.TXT ports: - name: jaeger-sampling # Default endpoint for Jaeger Sampling (if enabled) port: 5778 diff --git a/deploy/helm/sumologic/templates/traces/otelcol/service.yaml b/deploy/helm/sumologic/templates/traces/otelcol/service.yaml index 09c2a216d4..231ef6180e 100644 --- a/deploy/helm/sumologic/templates/traces/otelcol/service.yaml +++ b/deploy/helm/sumologic/templates/traces/otelcol/service.yaml @@ -10,6 +10,7 @@ metadata: spec: selector: app: {{ template "sumologic.labels.app.otelcol.pod" . }} + # In case of changes related to open ports for otelcol please update NOTES.TXT ports: - name: jaeger-sampling # Default endpoint for Jaeger Sampling (if enabled) port: 5778