OpenTelemetry refactoring

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

@@ -16,6 +16,10 @@ dependencies:
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
   version: 0.116.0
   alias: opentelemetry-metrics
+- name: opentelemetry-collector
+  repository: https://open-telemetry.github.io/opentelemetry-helm-charts
+  version: 0.116.0
+  alias: opentelemetry-metrics-cluster
 - name: opentelemetry-collector
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
   version: 0.116.0

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

@@ -22,7 +22,7 @@ items:
     labels:
       {{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 6 }}
       grafana-dashboard: {{ $dashboardName }}
-    name: {{ printf "dashboard-opentelemetry-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
+    name: {{ printf "dashboard-opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
     namespace: {{ $.Release.Namespace }}
   data:
     opentelemetry-collector-{{ $dashboardName }}.json: |-
@@ -51,7 +51,7 @@ spec:
     matchLabels:
       {{- toYaml $.Values.grafanaDashboard.grafanaOperator.matchLabels | nindent 6 }}
   configMapRef:
-    name: {{ printf "opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }}
+    name: {{ printf "dashboard-opentelemetry-collector-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
     key: opentelemetry-collector-{{ $dashboardName }}.json
 {{- end }}
 {{- end }}

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

@@ -22,7 +22,7 @@ spec:
     name: opentelemetry-datadog-credentials
     creationPolicy: Owner
   data:
-    - secretKey: DATADOG_API_KEY
+    - secretKey: DD_API_KEY
       remoteRef:
         key: DATADOG_API_KEY
 ---
@@ -46,7 +46,7 @@ spec:
     name: opentelemetry-lightstep-credentials
     creationPolicy: Owner
   data:
-    - secretKey: LIGHTSTEP_TOKEN
+    - secretKey: LS_TOKEN
       remoteRef:
         key: LIGHTSTEP_TOKEN
 ---
@@ -70,21 +70,99 @@ spec:
     name: opentelemetry-grafanacloud-credentials
     creationPolicy: Owner
   data:
-    - secretKey: GRAFANA_CLOUD_METRICS_ID
+    # - secretKey: GRAFANA_CLOUD_METRICS_ID
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_METRICS_ID
+    # - secretKey: GRAFANA_CLOUD_METRICS_APIKEY
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_METRICS_APIKEY
+    # - secretKey: GRAFANA_CLOUD_LOGS_ID
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_LOGS_ID
+    # - secretKey: GRAFANA_CLOUD_LOGS_APIKEY
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_LOGS_APIKEY
+    # - secretKey: GRAFANA_CLOUD_TRACES_ID
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_TRACES_ID
+    # - secretKey: GRAFANA_CLOUD_TRACES_APIKEY
+    #   remoteRef:
+    #     key: GRAFANA_CLOUD_TRACES_APIKEY
+    - secretKey: GRAFANA_CLOUD_OTEL_COLLECTOR_TOKEN
       remoteRef:
-        key: GRAFANA_CLOUD_METRICS_ID
-    - secretKey: GRAFANA_CLOUD_METRICS_APIKEY
+        key: GRAFANA_CLOUD_OTEL_COLLECTOR_TOKEN
+    - secretKey: GRAFANA_CLOUD_OTEL_COLLECTOR_ID
       remoteRef:
-        key: GRAFANA_CLOUD_METRICS_APIKEY
-    - secretKey: GRAFANA_CLOUD_LOGS_ID
-      remoteRef:
-        key: GRAFANA_CLOUD_LOGS_ID
-    - secretKey: GRAFANA_CLOUD_LOGS_APIKEY
+        key: GRAFANA_CLOUD_OTEL_COLLECTOR_ID
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  {{- if .Values.additionalAnnotations }}
+  annotations:
+  {{ toYaml .Values.additionalAnnotations | indent 4 }}
+  {{- end }}
+  labels:
+    {{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
+  name: opentelemetry-kloudmate-credentials
+  namespace: {{ .Release.Namespace }}
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: akeyless
+  target:
+    name: opentelemetry-kloudmate-credentials
+    creationPolicy: Owner
+  data:
+    - secretKey: KLOUDMATE_API_KEY
       remoteRef:
-        key: GRAFANA_CLOUD_LOGS_APIKEY
-    - secretKey: GRAFANA_CLOUD_TRACES_ID
+        key: KLOUDMATE_API_KEY
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  {{- if .Values.additionalAnnotations }}
+  annotations:
+  {{ toYaml .Values.additionalAnnotations | indent 4 }}
+  {{- end }}
+  labels:
+    {{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
+  name: opentelemetry-hyperdx-credentials
+  namespace: {{ .Release.Namespace }}
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: akeyless
+  target:
+    name: opentelemetry-hyperdx-credentials
+    creationPolicy: Owner
+  data:
+    - secretKey: HYPERDX_API_KEY
       remoteRef:
-        key: GRAFANA_CLOUD_TRACES_ID
-    - secretKey: GRAFANA_CLOUD_TRACES_APIKEY
+        key: HYPERDX_API_KEY
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  {{- if .Values.additionalAnnotations }}
+  annotations:
+  {{ toYaml .Values.additionalAnnotations | indent 4 }}
+  {{- end }}
+  labels:
+    {{- include "opentelemetry-collector.labels" (index $.Subcharts "opentelemetry-gateway") | nindent 4 }}
+  name: opentelemetry-oneuptime-credentials
+  namespace: {{ .Release.Namespace }}
+spec:
+  refreshInterval: 1h
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: akeyless
+  target:
+    name: opentelemetry-oneuptime-credentials
+    creationPolicy: Owner
+  data:
+    - secretKey: ONEUPTIME_TOKEN
       remoteRef:
-        key: GRAFANA_CLOUD_TRACES_APIKEY
+        key: ONEUPTIME_TOKEN