Skip to content

Commit 8299c10

Browse files
authored
OpenTelemetry refactoring (#6381)
* fix(opentelemetry): naming Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): naming resources Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): naming resources Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): naming resources Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): logs setup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): logs configuration Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): telemetry Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): cleanup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean OTel tracing Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean OTel logs Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean configuration Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean logs Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean logs Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): enable service Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean gateway Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): datadog exporters Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): remove logging Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): default configuration Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): remove Datadog exporters Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): Datadog exporter setup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): cleanup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add k8sattributes Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add k8sattributes Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): yaml anchor Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): yaml anchor for resources Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): cleanup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): security context for logs Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean labels Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add Kloudmate Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): enable some vendors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): enable some vendors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): enable OpAMP for Lightstep Signed-off-by: Nicolas Lamirault <[email protected]> * fix(opentelemetry): add healthcheck Signed-off-by: Nicolas Lamirault <[email protected]> * fix(opentelemetry): cleanup Signed-off-by: Nicolas Lamirault <[email protected]> * fix(opentelemetry): cleanup again Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): change port Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): host metrics Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean metrics Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean again Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add resource Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): remove resource Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): metrics setup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add Grafana Cloud vendor Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): typo Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): typo extensions Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add transform processors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add transform processors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean metrics Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): use otlphttp Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): use otlphttp for all Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add cluster metrics and events Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean logs Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean traces Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean resources and attributes Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): transform processor Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): typo Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): environment variable Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): disable some pipelines Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): typo Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): disable pipelines Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): clean Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): default values to null Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): k8s attributes enabled Signed-off-by: Nicolas Lamirault <[email protected]> * fix(alloy): typo Signed-off-by: Nicolas Lamirault <[email protected]> * fix(alloy): clean volume Signed-off-by: Nicolas Lamirault <[email protected]> * fix(alloy): use OpenTelemetry Collector metrics Signed-off-by: Nicolas Lamirault <[email protected]> * fix(alloy): cleanup Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): clean configuration Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): add HyperDX vendor Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): add environment variable Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): add Oneuptime vendor Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): typo Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): remove some vendors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): add some vendors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): rename exporters Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): naming Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): add some vendors Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry-collector): typo Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): add Loki and Tempo endpoint Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): fix Loki otlp endpoint Signed-off-by: Nicolas Lamirault <[email protected]> * feat(opentelemetry): fix Tempo tls insecure Signed-off-by: Nicolas Lamirault <[email protected]> --------- Signed-off-by: Nicolas Lamirault <[email protected]>
1 parent de7f5b1 commit 8299c10

File tree

6 files changed

+1711
-878
lines changed

6 files changed

+1711
-878
lines changed

gitops/argocd/charts/opentelemetry/opentelemetry-collector/Chart.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ dependencies:
1616
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
1717
version: 0.116.0
1818
alias: opentelemetry-metrics
19+
- name: opentelemetry-collector
20+
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
21+
version: 0.116.0
22+
alias: opentelemetry-metrics-cluster
1923
- name: opentelemetry-collector
2024
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
2125
version: 0.116.0

gitops/argocd/charts/opentelemetry/opentelemetry-collector/templates/configmap-dashboards.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ items:
2222
labels:
2323
{{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 6 }}
2424
grafana-dashboard: {{ $dashboardName }}
25-
name: {{ printf "dashboard-opentelemetry-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
25+
name: {{ printf "dashboard-opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
2626
namespace: {{ $.Release.Namespace }}
2727
data:
2828
opentelemetry-collector-{{ $dashboardName }}.json: |-
@@ -51,7 +51,7 @@ spec:
5151
matchLabels:
5252
{{- toYaml $.Values.grafanaDashboard.grafanaOperator.matchLabels | nindent 6 }}
5353
configMapRef:
54-
name: {{ printf "opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }}
54+
name: {{ printf "dashboard-opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
5555
key: opentelemetry-collector-{{ $dashboardName }}.json
5656
{{- end }}
5757
{{- end }}

gitops/argocd/charts/opentelemetry/opentelemetry-collector/templates/credentials.yaml

Lines changed: 93 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
name: opentelemetry-datadog-credentials
2323
creationPolicy: Owner
2424
data:
25-
- secretKey: DATADOG_API_KEY
25+
- secretKey: DD_API_KEY
2626
remoteRef:
2727
key: DATADOG_API_KEY
2828
---
@@ -46,7 +46,7 @@ spec:
4646
name: opentelemetry-lightstep-credentials
4747
creationPolicy: Owner
4848
data:
49-
- secretKey: LIGHTSTEP_TOKEN
49+
- secretKey: LS_TOKEN
5050
remoteRef:
5151
key: LIGHTSTEP_TOKEN
5252
---
@@ -70,21 +70,99 @@ spec:
7070
name: opentelemetry-grafanacloud-credentials
7171
creationPolicy: Owner
7272
data:
73-
- secretKey: GRAFANA_CLOUD_METRICS_ID
73+
# - secretKey: GRAFANA_CLOUD_METRICS_ID
74+
# remoteRef:
75+
# key: GRAFANA_CLOUD_METRICS_ID
76+
# - secretKey: GRAFANA_CLOUD_METRICS_APIKEY
77+
# remoteRef:
78+
# key: GRAFANA_CLOUD_METRICS_APIKEY
79+
# - secretKey: GRAFANA_CLOUD_LOGS_ID
80+
# remoteRef:
81+
# key: GRAFANA_CLOUD_LOGS_ID
82+
# - secretKey: GRAFANA_CLOUD_LOGS_APIKEY
83+
# remoteRef:
84+
# key: GRAFANA_CLOUD_LOGS_APIKEY
85+
# - secretKey: GRAFANA_CLOUD_TRACES_ID
86+
# remoteRef:
87+
# key: GRAFANA_CLOUD_TRACES_ID
88+
# - secretKey: GRAFANA_CLOUD_TRACES_APIKEY
89+
# remoteRef:
90+
# key: GRAFANA_CLOUD_TRACES_APIKEY
91+
- secretKey: GRAFANA_CLOUD_OTEL_COLLECTOR_TOKEN
7492
remoteRef:
75-
key: GRAFANA_CLOUD_METRICS_ID
76-
- secretKey: GRAFANA_CLOUD_METRICS_APIKEY
93+
key: GRAFANA_CLOUD_OTEL_COLLECTOR_TOKEN
94+
- secretKey: GRAFANA_CLOUD_OTEL_COLLECTOR_ID
7795
remoteRef:
78-
key: GRAFANA_CLOUD_METRICS_APIKEY
79-
- secretKey: GRAFANA_CLOUD_LOGS_ID
80-
remoteRef:
81-
key: GRAFANA_CLOUD_LOGS_ID
82-
- secretKey: GRAFANA_CLOUD_LOGS_APIKEY
96+
key: GRAFANA_CLOUD_OTEL_COLLECTOR_ID
97+
---
98+
apiVersion: external-secrets.io/v1beta1
99+
kind: ExternalSecret
100+
metadata:
101+
{{- if .Values.additionalAnnotations }}
102+
annotations:
103+
{{ toYaml .Values.additionalAnnotations | indent 4 }}
104+
{{- end }}
105+
labels:
106+
{{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
107+
name: opentelemetry-kloudmate-credentials
108+
namespace: {{ .Release.Namespace }}
109+
spec:
110+
refreshInterval: 1h
111+
secretStoreRef:
112+
kind: ClusterSecretStore
113+
name: akeyless
114+
target:
115+
name: opentelemetry-kloudmate-credentials
116+
creationPolicy: Owner
117+
data:
118+
- secretKey: KLOUDMATE_API_KEY
83119
remoteRef:
84-
key: GRAFANA_CLOUD_LOGS_APIKEY
85-
- secretKey: GRAFANA_CLOUD_TRACES_ID
120+
key: KLOUDMATE_API_KEY
121+
---
122+
apiVersion: external-secrets.io/v1beta1
123+
kind: ExternalSecret
124+
metadata:
125+
{{- if .Values.additionalAnnotations }}
126+
annotations:
127+
{{ toYaml .Values.additionalAnnotations | indent 4 }}
128+
{{- end }}
129+
labels:
130+
{{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
131+
name: opentelemetry-hyperdx-credentials
132+
namespace: {{ .Release.Namespace }}
133+
spec:
134+
refreshInterval: 1h
135+
secretStoreRef:
136+
kind: ClusterSecretStore
137+
name: akeyless
138+
target:
139+
name: opentelemetry-hyperdx-credentials
140+
creationPolicy: Owner
141+
data:
142+
- secretKey: HYPERDX_API_KEY
86143
remoteRef:
87-
key: GRAFANA_CLOUD_TRACES_ID
88-
- secretKey: GRAFANA_CLOUD_TRACES_APIKEY
144+
key: HYPERDX_API_KEY
145+
---
146+
apiVersion: external-secrets.io/v1beta1
147+
kind: ExternalSecret
148+
metadata:
149+
{{- if .Values.additionalAnnotations }}
150+
annotations:
151+
{{ toYaml .Values.additionalAnnotations | indent 4 }}
152+
{{- end }}
153+
labels:
154+
{{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
155+
name: opentelemetry-oneuptime-credentials
156+
namespace: {{ .Release.Namespace }}
157+
spec:
158+
refreshInterval: 1h
159+
secretStoreRef:
160+
kind: ClusterSecretStore
161+
name: akeyless
162+
target:
163+
name: opentelemetry-oneuptime-credentials
164+
creationPolicy: Owner
165+
data:
166+
- secretKey: ONEUPTIME_TOKEN
89167
remoteRef:
90-
key: GRAFANA_CLOUD_TRACES_APIKEY
168+
key: ONEUPTIME_TOKEN

0 commit comments

Comments
 (0)