diff --git a/CHANGELOG.md b/CHANGELOG.md index cdb515335bd2..512265ab8771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,8 +73,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/README.md b/README.md index 6e4ae7364568..e2d6aebf04df 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ +> **Deprecation notice**: Grafana Agent has been deprecated and is now in +> Long-Term Support mode. We recommend migrating to the new Grafana Alloy +> collector, which is built on the foundation of Grafana Agent Flow. +> +> For more information, read our blog posts about Alloy and how to easily +> migrate from Agent to Alloy: +> +> * [Alloy announcement blog post](https://grafana.com/blog/2024/04/09/grafana-alloy-opentelemetry-collector-with-prometheus-pipelines/) +> * [Alloy FAQ](https://grafana.com/blog/2024/04/09/grafana-agent-to-grafana-alloy-opentelemetry-collector-faq/) +> * [Migrate to Alloy](https://grafana.com/docs/alloy/latest/tasks/migrate/) +

Grafana Agent logo

Grafana Agent is an OpenTelemetry Collector distribution with configuration 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 "