wip

Signed-off-by: Pete Wall <[email protected]>

Author: petewall

charts/feature-auto-instrumentation/templates/_module.alloy.tpl

@@ -41,7 +41,11 @@ declare "auto_instrumentation" {
     clustering {
       enabled = true
     }
+{{- if or $metricAllowList $metricDenyList .Values.beyla.extraMetricProcessingRules }}
     forward_to = [prometheus.relabel.beyla.receiver]
+{{- else }}
+    forward_to = argument.metrics_destinations.value
+{{- end }}
   }
 
   prometheus.scrape "beyla_internal" {

charts/feature-auto-instrumentation/templates/beyla-config.yaml

@@ -24,7 +24,7 @@ beyla:
   # @section -- Beyla
   scrapeInterval: ""
 
-  # -- Label matchers used to select the Beyla pods
+  # -- Label matchers used to select the Beyla pods for scraping metrics.
   # @section -- Beyla
   labelMatchers:
     app.kubernetes.io/name: beyla
@@ -67,24 +67,11 @@ beyla:
     skipConfigMapCheck: true
     # @ignored -- This allows this chart to create the Beyla ConfigMap with required modifications
     create: false
-    # -- The Configuration for Beyla
-    # @section -- Deployment: Beyla
-    data:
-      attributes:
-        kubernetes:
-          enable: true
-      prometheus_export:
-        port: 9090
-        path: /metrics
-        features:
-          - application
-          - network
-          - application_service_graph
-          - application_span
-      internal_metrics:
-        prometheus:
-          port: 9090
-          path: /internal/metrics
+
+  # -- The port number for the Beyla service.
+  # @section -- Beyla
+  service:
+    targetPort: 9090
 
   # @ignored
   podAnnotations:

charts/feature-auto-instrumentation/values.yaml

@@ -42,4 +42,4 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   version: 0.9.2
 digest: sha256:38b7f53f9f9c9238b59fd442534e911368ed199125db7d48a90fc9bdbbd30c2a
-generated: "2024-11-06T15:00:52.430476-06:00"
+generated: "2024-11-06T19:37:39.155421-06:00"

charts/k8s-monitoring/Chart.lock

@@ -0,0 +1,48 @@
+<!--
+(NOTE: Do not edit README.md directly. It is a generated file!)
+(      To make changes, please modify values.yaml or description.txt and run `make examples`)
+-->
+# Example: features/auto-instrumentation/beyla-metrics-and-traces/values.yaml
+
+## Values
+
+```yaml
+---
+cluster:
+  name: annotation-autodiscovery-with-traces-cluster
+
+destinations:
+  - name: otlp-gateway
+    type: otlp
+    url: http://otlp-gateway.example.com
+    metrics: {enabled: true}
+    logs: {enabled: true}
+    traces: {enabled: true}
+
+applicationObservability:
+  enabled: true
+  receivers:
+    grpc:
+      enabled: true
+    http:
+      enabled: true
+
+autoInstrumentation:
+  enabled: true
+
+alloy-metrics:
+  enabled: true
+
+alloy-receiver:
+  enabled: true
+  alloy:
+    extraPorts:
+      - name: otlp-grpc
+        port: 4317
+        targetPort: 4317
+        protocol: TCP
+      - name: otlp-http
+        port: 4318
+        targetPort: 4318
+        protocol: TCP
+```