From 70f5f040c535a7b8e0059df99a4a50a6a712711a Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 9 Apr 2024 09:57:51 -0400 Subject: [PATCH 1/3] Revert "Add Grafana Beyla Flow component (#6789)" (#6837) After discussing offline, the Beyla team wants `beyla.ebpf` to be an exclusive component to Alloy to avoid needing to backport fixes. This commit reverts the addition of Beyla to Flow, but it still remains as a component available in the Alloy 1.0 launch. This reverts commit 196ea058806a42c8b24723fde82e8dcfc5f3e919. --- CHANGELOG.md | 2 - CODEOWNERS | 3 +- .../flow/reference/compatibility/_index.md | 8 - .../flow/reference/components/beyla.ebpf.md | 276 ----------------- go.mod | 26 +- go.sum | 51 +--- internal/component/all/all.go | 1 - internal/component/beyla/ebpf/args.go | 48 --- internal/component/beyla/ebpf/beyla_linux.go | 287 ------------------ .../component/beyla/ebpf/beyla_linux_test.go | 200 ------------ .../component/beyla/ebpf/beyla_placeholder.go | 43 --- 11 files changed, 20 insertions(+), 925 deletions(-) delete mode 100644 docs/sources/flow/reference/components/beyla.ebpf.md delete mode 100644 internal/component/beyla/ebpf/args.go delete mode 100644 internal/component/beyla/ebpf/beyla_linux.go delete mode 100644 internal/component/beyla/ebpf/beyla_linux_test.go delete mode 100644 internal/component/beyla/ebpf/beyla_placeholder.go diff --git a/CHANGELOG.md b/CHANGELOG.md index ded6410f6b67..9822e24ee3f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,8 +60,6 @@ Main (unreleased) - A new `loki.rules.kubernetes` component that discovers `PrometheusRule` Kubernetes resources and loads them into a Loki Ruler instance. (@EStork09) -- Add `beyla.ebpf` component to automatically instrument services with eBPF. (@marctc) - ### Bugfixes - Fix an issue where JSON string array elements were not parsed correctly in `loki.source.cloudflare`. (@thampiotr) diff --git a/CODEOWNERS b/CODEOWNERS index b48a1816109b..4f1541f12dbd 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -18,5 +18,4 @@ /docs/sources/ @clayton-cornell # Components: -/internal/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers -/internal/component/beyla/ @marctc \ No newline at end of file +/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers diff --git a/docs/sources/flow/reference/compatibility/_index.md b/docs/sources/flow/reference/compatibility/_index.md index 30825a901f4b..61775bcf26b5 100644 --- a/docs/sources/flow/reference/compatibility/_index.md +++ b/docs/sources/flow/reference/compatibility/_index.md @@ -44,10 +44,6 @@ The following components, grouped by namespace, _export_ Targets. -{{< collapse title="beyla" >}} -- [beyla.ebpf](../components/beyla.ebpf) -{{< /collapse >}} - {{< collapse title="discovery" >}} - [discovery.azure](../components/discovery.azure) - [discovery.consul](../components/discovery.consul) @@ -319,10 +315,6 @@ The following components, grouped by namespace, _consume_ OpenTelemetry `otelcol -{{< collapse title="beyla" >}} -- [beyla.ebpf](../components/beyla.ebpf) -{{< /collapse >}} - {{< collapse title="faro" >}} - [faro.receiver](../components/faro.receiver) {{< /collapse >}} diff --git a/docs/sources/flow/reference/components/beyla.ebpf.md b/docs/sources/flow/reference/components/beyla.ebpf.md deleted file mode 100644 index ad35b9ccba45..000000000000 --- a/docs/sources/flow/reference/components/beyla.ebpf.md +++ /dev/null @@ -1,276 +0,0 @@ ---- -canonical: https://grafana.com/docs/agent/latest/flow/reference/components/beyla.ebpf/ -description: Learn about beyla.ebpf -title: beyla.ebpf -labels: - stage: beta ---- - -# beyla.ebpf - -{{< docs/shared lookup="flow/stability/beta.md" source="agent" version="" >}} - -The `beyla.ebpf` component is used as a wrapper for [Grafana Beyla][] which uses [eBPF][] to automatically inspect application executables and the OS networking layer, and capture trace spans related to web transactions and Rate Errors Duration (RED) metrics for Linux HTTP/S and gRPC services. -You can configure the component to collect telemetry data from a specific port or executable path, and other criteria from Kubernetes metadata. -The component exposes metrics that can be collected by a Prometheus scrape component, and traces that can be forwarded to an OTEL exporter component. - -{{< admonition type="note" >}} -To run this component, {{< param "PRODUCT_NAME" >}} requires administrative (`sudo`) privileges, or at least it needs to be granted the `CAP_SYS_ADMIN` and `CAP_SYS_PTRACE` capability. In Kubernetes environments, app armour must be disabled for the Deployment or DaemonSet running {{< param "PRODUCT_NAME" >}}. -{{< /admonition >}} - -[Grafana Beyla]: https://github.com/grafana/beyla -[eBPF]: https://ebpf.io/ - -## Usage - -```river -beyla.ebpf "