Skip to content

Commit

Permalink
Merge branch 'main' into update-kafka-exporter-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
wildum committed Apr 9, 2024
2 parents c0d1958 + b354efc commit 84ceaf8
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 929 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
/docs/sources/ @clayton-cornell

# Components:
/internal/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers
/internal/component/beyla/ @marctc
/component/pyroscope/ @grafana/grafana-agent-profiling-maintainers
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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/)
<p align="center"><img src="docs/sources/assets/logo_and_name.png" alt="Grafana Agent logo"></p>

Grafana Agent is an OpenTelemetry Collector distribution with configuration
Expand Down
8 changes: 0 additions & 8 deletions docs/sources/flow/reference/compatibility/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ The following components, grouped by namespace, _export_ Targets.

<!-- START GENERATED SECTION: EXPORTERS OF Targets -->

{{< collapse title="beyla" >}}
- [beyla.ebpf](../components/beyla.ebpf)
{{< /collapse >}}

{{< collapse title="discovery" >}}
- [discovery.azure](../components/discovery.azure)
- [discovery.consul](../components/discovery.consul)
Expand Down Expand Up @@ -319,10 +315,6 @@ The following components, grouped by namespace, _consume_ OpenTelemetry `otelcol

<!-- START GENERATED SECTION: CONSUMERS OF OpenTelemetry `otelcol.Consumer` -->

{{< collapse title="beyla" >}}
- [beyla.ebpf](../components/beyla.ebpf)
{{< /collapse >}}

{{< collapse title="faro" >}}
- [faro.receiver](../components/faro.receiver)
{{< /collapse >}}
Expand Down
276 changes: 0 additions & 276 deletions docs/sources/flow/reference/components/beyla.ebpf.md

This file was deleted.

Loading

0 comments on commit 84ceaf8

Please sign in to comment.