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

Jump to bottom

feat: add instance id to metrics #26

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat: add instance id to metrics #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
816f0dc
add instance id to resource
mottibec Apr 20, 2023
ce88949
allow receiver and exporter metrics
mottibec Apr 20, 2023
520acfb
merge master into branch
mottibec Apr 20, 2023
8fac5a2
add token to load balancer
mottibec Apr 20, 2023
26c9390
bump version
mottibec Apr 27, 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
2 changes: 1 addition & 1 deletion charts/opentelemetry-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: aspecto-io-opentelemetry-collector
version: '1.4.11'
version: '1.4.12'
home: https://aspecto.io
type: application
description: helm chart of aspecto's opentelemetry tail sampling collector
Expand Down
6 changes: 5 additions & 1 deletion charts/opentelemetry-collector/templates/collector/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ telemetry:
address: {{ $localListenerIp }}:{{ .internalPort }}
{{- end }}
{{- end }}
resource:
service.instance.id: $aspecto:settings:instance_id
{{- end }}


Expand All @@ -60,8 +62,10 @@ telemetry:
filter:
metrics:
include:
match_type: strict
match_type: regexp
metric_names:
- .*receiver.*
- .*exporter.*
- otelcol_processor_tail_sampling_policy_evaluation_decision
- otelcol_processor_tail_sampling_count_spans_sampled
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions charts/opentelemetry-collector/templates/receiver/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,6 @@ telemetry:
address: {{ $localListenerIp }}:{{ .internalPort }}
{{- end }}
{{- end }}
resource:
service.instance.id: $aspecto:settings:instance_id
{{- end }}
3 changes: 3 additions & 0 deletions charts/opentelemetry-collector/templates/receiver/configMap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ metadata:
{{- if $localObjectAnnotations }}{{ toYaml $localObjectAnnotations | nindent 4 }}{{- end }}
data:
{{ .Values.receiver.specs.volumes.serviceConfig.fileName }}: |
config_sources:
aspecto:
token: ${token}
receivers:
otlp:
protocols:
Expand Down
12 changes: 11 additions & 1 deletion charts/opentelemetry-collector/templates/receiver/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,18 @@ spec:
mountPath: {{ .mountPath }}
readOnly: {{ .readOnly }}
{{- end }}
{{- if .Values.receiver.envs }}
env:
{{- if or ( $root.Values.global.aspecto.token.secret.createNewSecret) ($root.Values.global.aspecto.token.secret.existingSecretName) }}
- name: token
valueFrom:
secretKeyRef:
name: {{ .Values.global.aspecto.token.secret.existingSecretName | default (printf "%s-token" .Values.global.name) }}
key: {{ .Values.global.aspecto.token.secret.keyName }}
{{ else }}
- name: token
value: {{ .Values.global.aspecto.token.value }}
{{- end }}
{{- if .Values.receiver.envs }}
{{ toYaml .Values.receiver.envs | indent 10 }}
{{- end}}
{{- if .Values.receiver.envFrom }}
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ global:
image:
repository: 'public.ecr.aws/x3s3n8k7'
pullPolicy: Always
version: 'v0.69.1'
version: 'v0.69.1-rc3'

receiver:
image:
Expand Down