WIP

Signed-off-by: Pete Wall <[email protected]>
grafana · Oct 31, 2024 · cfb1e64 · cfb1e64
1 parent 6782311
commit cfb1e64
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 575 deletions.
diff --git a/charts/feature-auto-instrumentation/README.md b/charts/feature-auto-instrumentation/README.md
@@ -82,3 +82,9 @@ Actual integration testing in a live environment should be done in the main [k8s
 |-----|------|---------|-------------|
 | global.maxCacheSize | int | `100000` | Sets the max_cache_size for every prometheus.relabel component. ([docs](https://grafana.com/docs/alloy/latest/reference/components/prometheus.relabel/#arguments)) This should be at least 2x-5x your largest scrape target or samples appended rate. |
 | global.scrapeInterval | string | `"60s"` | How frequently to scrape metrics. |
+
+### Other Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| beyla.traces.endpoint | string | `""` |  |
diff --git a/charts/feature-auto-instrumentation/templates/beyla-config.yaml b/charts/feature-auto-instrumentation/templates/beyla-config.yaml
@@ -1,10 +1,7 @@
 {{- define "feature.autoInstrumentation.config.beyla" }}
-{{- $clusterName := dict "attributes"  (dict "kubernetes" (dict "cluster_name" .Values.cluster.name)) }}
 {{- $endpoint := dict }}
-{{- if .Values.receivers.grpc.enabled }}
-  {{- $endpoint = dict "otel_traces_export" (dict "endpoint" (include "kubernetes_monitoring.receiver.grpc" . | trim))}}
-{{- else if .Values.receivers.http.enabled }}
-  {{- $endpoint = dict "otel_traces_export" (dict "endpoint" (include "kubernetes_monitoring.receiver.http" . | trim))}}
+{{- if .Values.beyla.traces.endpoint }}
+  {{- $endpoint = dict "otel_traces_export" (dict "endpoint" .Values.beyla.traces.endpoint)}}
 {{- end }}
 {{- $preset := dict }}
 {{- if and (eq .Values.beyla.preset "network") (not .Values.beyla.config.data.network) }}
@@ -13,7 +10,7 @@
 {{- if and (eq .Values.beyla.preset "application") (not .Values.beyla.config.data.discovery) }}
   {{- $preset = dict "discovery" (dict "services" (list (dict "k8s_namespace" ".")))}}
 {{- end }}
-{{- merge .Values.beyla.config.data $clusterName $endpoint $preset | toYaml }}
+{{- merge .Values.beyla.config.data $endpoint $preset | toYaml }}
 {{- end }}
 ---
 apiVersion: v1

diff --git a/charts/feature-auto-instrumentation/tests/beyla_config_test.yaml b/charts/feature-auto-instrumentation/tests/beyla_config_test.yaml
@@ -11,4 +11,79 @@ tests:
           of: ConfigMap
       - equal:
           path: data["beyla-config.yml"]
-          value: ""
+          value: |-
+            attributes:
+              kubernetes:
+                enable: true
+              select:
+                beyla_network_flow_bytes:
+                  include:
+                  - k8s.src.owner.type
+                  - k8s.dst.owner.type
+                  - direction
+            discovery:
+              services:
+              - k8s_namespace: .
+            filter:
+              network:
+                k8s_dst_owner_name:
+                  not_match: '{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}'
+                k8s_src_owner_name:
+                  not_match: '{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}'
+            internal_metrics:
+              prometheus:
+                path: /internal/metrics
+                port: 9090
+            prometheus_export:
+              features:
+              - application
+              - network
+              - application_service_graph
+              - application_span
+              path: /metrics
+              port: 9090
+
+  - it: sets the otel_traces_export endpoint if provided
+    set:
+      deployAsConfigMap: true
+      beyla:
+        traces:
+          endpoint: http://alloy-receiver.default.svc.cluster.local:4318
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: data["beyla-config.yml"]
+          value: |-
+            attributes:
+              kubernetes:
+                enable: true
+              select:
+                beyla_network_flow_bytes:
+                  include:
+                  - k8s.src.owner.type
+                  - k8s.dst.owner.type
+                  - direction
+            discovery:
+              services:
+              - k8s_namespace: .
+            filter:
+              network:
+                k8s_dst_owner_name:
+                  not_match: '{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}'
+                k8s_src_owner_name:
+                  not_match: '{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}'
+            internal_metrics:
+              prometheus:
+                path: /internal/metrics
+                port: 9090
+            otel_traces_export:
+              endpoint: http://alloy-receiver.default.svc.cluster.local:4318
+            prometheus_export:
+              features:
+              - application
+              - network
+              - application_service_graph
+              - application_span
+              path: /metrics
+              port: 9090
diff --git a/charts/feature-auto-instrumentation/values.schema.json b/charts/feature-auto-instrumentation/values.schema.json
@@ -105,6 +105,14 @@
                 },
                 "scrapeInterval": {
                     "type": "string"
+                },
+                "traces": {
+                    "type": "object",
+                    "properties": {
+                        "endpoint": {
+                            "type": "string"
+                        }
+                    }
                 }
             }
         },

diff --git a/charts/feature-auto-instrumentation/values.yaml b/charts/feature-auto-instrumentation/values.yaml
@@ -59,6 +59,9 @@ beyla:
   # @section -- Beyla
   maxCacheSize:
 
+  traces:
+    endpoint: ""
+
   config:
     # @ignored -- This allows this chart to create the ConfigMap while also keeping the default name
     skipConfigMapCheck: true