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

Do not send clusterReceiver metrics through gateway #491

Merged
merged 4 commits into from
Aug 5, 2022
Merged

Do not send clusterReceiver metrics through gateway #491

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4981d0c
Do not send clusterReceiver metrics through gateway
dmitryax Jul 16, 2022
faf0bc3
Merge branch 'main' into disable-gateway-on-k8s-cluster-receiver
dmitryax Jul 18, 2022
2a1d163
Merge branch 'main' into disable-gateway-on-k8s-cluster-receiver
dmitryax Aug 5, 2022
8f7a939
Update CHANGELOG.md
dmitryax Aug 5, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- The receiver.k8sclusterreceiver.reportCpuMetricsAsDouble feature gate has been removed (#487)
- If you are using this feature gate, then see the [upgrade guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0540-to-0550)
- Do not send clusterReceiver metrics through gateway (#491)

### Fixed

Expand Down
10 changes: 0 additions & 10 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 @@ -3,7 +3,6 @@ Config for the otel-collector k8s cluster receiver deployment.
The values can be overridden in .Values.clusterReceiver.config
*/}}
{{- define "splunk-otel-collector.clusterReceiverConfig" -}}
{{ $gateway := fromYaml (include "splunk-otel-collector.gateway" .) -}}
{{ $clusterReceiver := fromYaml (include "splunk-otel-collector.clusterReceiver" .) -}}
extensions:
health_check:
Expand Down Expand Up @@ -141,13 +140,8 @@ processors:
exporters:
{{- if or (eq (include "splunk-otel-collector.o11yMetricsEnabled" $) "true") (eq (include "splunk-otel-collector.o11yInfraMonEventsEnabled" .) "true") }}
signalfx:
{{- if $gateway.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.o11yIngestUrl" . }}
api_url: {{ include "splunk-otel-collector.o11yApiUrl" . }}
{{- end }}
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
timeout: 10s
{{- end }}
Expand Down Expand Up @@ -235,16 +229,12 @@ service:
- resource/add_environment
{{- end }}
exporters:
{{- if $gateway.enabled }}
- otlp
{{- else }}
{{- if (eq (include "splunk-otel-collector.o11yLogsEnabled" .) "true") }}
- splunk_hec/o11y
{{- end }}
{{- if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }}
- splunk_hec/platform_logs
{{- end }}
{{- end }}
{{- end }}

{{- if eq (include "splunk-otel-collector.o11yInfraMonEventsEnabled" .) "true" }}
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/eks-fargate/configmap-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ data:
exporters:
signalfx:
access_token: ${SPLUNK_OBSERVABILITY_ACCESS_TOKEN}
api_url: http://default-splunk-otel-collector:6060
ingest_url: http://default-splunk-otel-collector:9943
api_url: https://api.CHANGEME.signalfx.com
ingest_url: https://ingest.CHANGEME.signalfx.com
timeout: 10s
extensions:
health_check: null
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/eks-fargate/deployment-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 8b2c2f272b1f13ca542bded19b56625dc405edf5bb953be32192c94aa0ed1739
checksum/config: 9f24ad8e484567552199c9c3bd310f43385df26b9ccdd8bea4e1e9a4549fbafa
spec:
serviceAccountName: default-splunk-otel-collector
nodeSelector:
Expand Down