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

Route all metrics and traces through the gateway deployment, if enabled #96

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Route all metrics and traces through the gateway deployment, if enabled #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: splunk-otel-collector
version: 0.24.4
version: 0.24.5
description: Splunk OpenTelemetry Connector for Kubernetes
icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
type: application
Expand Down
11 changes: 7 additions & 4 deletions helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,13 @@ exporters:
{{- end }}
signalfx:
correlation:
{{- if .Values.otelCollector.enabled }}
ingest_url: http://{{ include "splunk-otel-collector.fullname" . }}:9943
api_url: http://{{ include "splunk-otel-collector.fullname" . }}:6060
{{- else }}
ingest_url: {{ include "splunk-otel-collector.ingestUrl" . }}
api_url: {{ include "splunk-otel-collector.apiUrl" . }}
{{- end }}
access_token: ${SPLUNK_ACCESS_TOKEN}
sync_host_metadata: true

Expand Down Expand Up @@ -226,9 +231,7 @@ service:
- resource/add_agent_k8s
- resourcedetection
exporters:
{{- if .Values.otelCollector.enabled }}
- otlp
{{- else }}
# Use signalfx instead of otlp even if collector is enabled
# in order to sync host metadata.
- signalfx
{{- end }}
{{- end }}
3 changes: 2 additions & 1 deletion helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ receivers:

signalfx:
endpoint: 0.0.0.0:9943
access_token_passthrough: true

# By default k8s_tagger, memory_limiter and batch processors enabled.
processors:
Expand Down Expand Up @@ -97,7 +98,7 @@ service:

# default metrics pipeline
metrics:
receivers: [otlp, prometheus]
receivers: [otlp, prometheus, signalfx]
processors: [memory_limiter, batch, resource/add_cluster_name]
exporters: [signalfx]

Expand Down
5 changes: 5 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,13 @@ processors:

exporters:
signalfx:
{{- if .Values.otelCollector.enabled }}
ingest_url: http://{{ include "splunk-otel-collector.fullname" . }}:9943
api_url: http://{{ include "splunk-otel-collector.fullname" . }}:6060
{{- else }}
ingest_url: {{ include "splunk-otel-collector.ingestUrl" . }}
api_url: {{ include "splunk-otel-collector.apiUrl" . }}
{{- end }}
access_token: ${SPLUNK_ACCESS_TOKEN}
timeout: 10s

Expand Down