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

feat: Add timeout, retry, and write queue options to AMP remote write exporter #93

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Add timeout, retry, and write queue options to AMP remote write exporter #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c554b3c
Add timeout, retry, and write queue options to AMP remote write exporter
seanmorton Mar 31, 2023
dec5e6f
Fix syntax
seanmorton Mar 31, 2023
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
19 changes: 16 additions & 3 deletions charts/adot-exporter-for-eks-on-ec2/templates/adot-collector/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ data:
global:
scrape_interval: {{ .Values.adotCollector.daemonSet.ampreceivers.scrapeInterval }}
scrape_timeout: {{ .Values.adotCollector.daemonSet.ampreceivers.scrapeTimeout }}
scrape_configs:
scrape_configs:
{{ .Values.adotCollector.daemonSet.ampreceivers.scrapeConfigs | nindent 12 }}
processors:
batch/metrics:
Expand All @@ -48,11 +48,24 @@ data:
prometheusremotewrite:
namespace: {{ .Values.adotCollector.daemonSet.ampexporters.namespace }}
endpoint: {{ .Values.adotCollector.daemonSet.ampexporters.endpoint }}
resource_to_telemetry_conversion:
resource_to_telemetry_conversion:
enabled: {{ .Values.adotCollector.daemonSet.ampexporters.resourcetootel }}
auth:
authenticator: {{ .Values.adotCollector.daemonSet.ampexporters.authenticator }}

timeout: {{ .Values.adotCollector.daemonSet.ampexporters.timeout }}
{{- if .Values.adotCollector.daemonSet.ampexporters.remote_write_queue.enabled }}
{{- with .Values.adotCollector.daemonSet.ampexporters.remote_write_queue }}
remote_write_queue:
{{- toYaml . | nindent 10 }}
{{- end }}
{{- end }}
{{- if .Values.adotCollector.daemonSet.ampexporters.retry_on_failure.enabled }}
{{- with .Values.adotCollector.daemonSet.ampexporters.retry_on_failure }}
retry_on_failure:
{{- toYaml . | nindent 10 }}
{{- end }}
{{- end }}

service:
pipelines:
metrics:
Expand Down
15 changes: 10 additions & 5 deletions charts/adot-exporter-for-eks-on-ec2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ clusterName: ""
additionalLabels: {}
# app: adot

serviceAccount:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed this value is unused. Let me know if this should be a separate PR.

create: true
annotations: {}
name: ""

adotCollector:
image:
name: "aws-otel-collector"
Expand Down Expand Up @@ -233,6 +228,16 @@ adotCollector:
endpoint: ""
resourcetootel: false
authenticator: "sigv4auth"
timeout: "5s"
retry_on_failure:
enabled: true
initial_interval: "5s"
max_interval: "30s"
max_elapsed_time: "300s"
remote_write_queue:
enabled: false
queue_size: 5000
num_consutmers: 10
service:
metrics:
receivers: ["prometheus"]
Expand Down