diff --git a/.github/ISSUE_TEMPLATE/docs.yaml b/.github/ISSUE_TEMPLATE/docs.yaml
new file mode 100644
index 0000000000..fbd229840c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/docs.yaml
@@ -0,0 +1,20 @@
+name: Documentation feedback
+description: Give feedback on the Grafana Alloy documentation.
+title: "Docs feedback: "
+labels: ["type/docs"]
+body:
+  - type: input
+    id: url
+    attributes:
+      label: URL
+      description: The URL of the page you're providing feedback on.
+      placeholder: https://grafana.com/docs/alloy/latest/
+    validations:
+      required: true
+  - type: textarea
+    id: feedback
+    attributes:
+      label: Feedback
+      description: What feedback do you have?
+    validations:
+      required: true
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
index f973d28b3a..d694267f96 100644
--- a/.github/workflows/helm-release.yml
+++ b/.github/workflows/helm-release.yml
@@ -133,7 +133,7 @@ jobs:
       # The tag name in grafana/helm-charts is <package>-<version>, while the
       # tag name for grafana/alloy is helm-chart/<version>.
       - name: Make github release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           name: ${{ steps.parse-chart.outputs.packagename }}
           repository: grafana/helm-charts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1982e7728..1b7c5de0b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,32 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
-Unreleased
-----------
+Main (unreleased)
+-----------------
+
+### Enhancements
+
+- Update `prometheus.exporter.kafka` with the following functionalities (@wildum):
+  * GSSAPI config
+  * enable/disable PA_FX_FAST
+  * set a TLS server name
+  * show the offset/lag for all consumer group or only the connected ones
+  * set the minimum number of topics to monitor
+  * enable/disable auto-creation of requested topics if they don't already exist
+  * regex to exclude topics / groups 
+  * added metric kafka_broker_info
+
+- In `prometheus.exporter.kafka`, the interpolation table used to compute estimated lag metrics is now pruned
+  on `metadata_refresh_interval` instead of `prune_interval_seconds`. (@wildum)
 
 ### Bugfixes
 
+- Fixed issue with defaults for Beyla component not being applied correctly. (marctc)
+
 - Fix an issue on Windows where uninstalling Alloy did not remove it from the
   Add/Remove programs list. (@rfratto)
 
+
 v1.0.0 (2024-04-09)
 -------------------
 
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index b5f20c184b..56e9ed5c04 100644
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -31,6 +31,12 @@ cards:
     - title: Migrate to Alloy
       href: ./tasks/migrate/
       description: Learn how to migrate to Alloy from Grafana Agent Operator, Prometheus, Promtail, Grafana Agent Static, or Grafana Agent Flow.
+    - title: Collect OpenTelemetry data
+      href: ./tasks/collect-opentelemetry-data/
+      description: You can configure Alloy to collect OpenTelemetry-compatible data and forward it to any OpenTelemetry-compatible endpoint. Learn how to configure OpenTelemetry data delivery, configure batching, and receive OpenTelemetry data over OTLP.
+    - title: Collect and forward Prometheus metrics
+      href: ./tasks/collect-prometheus-metrics/
+      description: You can configure Alloy to collect Prometheus metrics and forward them to any Prometheus-compatible database. Learn how to configure metrics delivery and collect metrics from Kubernetes Pods.
     - title: Concepts
       href: ./concepts/
       description: Learn about components, modules, clustering, and the Alloy configuration syntax.
@@ -45,37 +51,30 @@ cards:
 
 # Overview
 
-{{< param "PRODUCT_NAME" >}} offers native pipelines for OTel, [Prometheus][], [Pyroscope][], [Loki][], and many other metrics, logs, traces, and profile tools.
-In addition, you can use {{< param "PRODUCT_NAME" >}} pipelines to do different tasks, such as configure alert rules in Loki and Mimir.
-{{< param "PRODUCT_NAME" >}} is fully compatible with the OTel Collector, Prometheus Agent, and Promtail.
+{{< param "PRODUCT_NAME" >}} offers native pipelines for [OTel][], [Prometheus][], [Pyroscope][], [Loki][], and many other metrics, logs, traces, and profile tools.
+In addition, you can use {{< param "PRODUCT_NAME" >}} pipelines to do different tasks, such as configure alert rules in Loki and [Mimir][].
+{{< param "PRODUCT_NAME" >}} is fully compatible with the OTel Collector, Prometheus Agent, and [Promtail][].
 You can use {{< param "PRODUCT_NAME" >}} as an alternative to either of these solutions or combine it into a hybrid system of multiple collectors and agents.
 You can deploy {{< param "PRODUCT_NAME" >}} anywhere within your IT infrastructure and pair it with your Grafana LGTM stack, a telemetry backend from Grafana Cloud, or any other compatible backend from any other vendor.
 {{< param "PRODUCT_NAME" >}} is flexible, and you can easily configure it to fit your needs in on-prem, cloud-only, or a mix of both.
 
+{{< admonition type="tip" >}}
+{{< param "PRODUCT_NAME" >}} uses the same components, code, and concepts that were first introduced in Grafana Agent Flow.
+{{< /admonition >}}
+
 ## What can {{% param "PRODUCT_NAME" %}} do?
 
 {{< param "PRODUCT_NAME" >}} is more than just observability signals like metrics, logs, and traces. It provides many features that help you quickly find and process your data in complex environments.
-Some of these features include:
-
-* **Custom components:** You can use {{< param "PRODUCT_NAME" >}} to create and share custom components.
-  Custom components combine a pipeline of existing components into a single, easy-to-understand component that's just a few lines long.
-  You can use pre-built custom components from the community, ones packaged by Grafana, or create your own.
-* **GitOps compatibility:** {{< param "PRODUCT_NAME" >}} uses frameworks to pull configurations from Git, S3, HTTP endpoints, and just about any other source.
-* **Clustering support:** {{< param "PRODUCT_NAME" >}} has native clustering support.
-  Clustering helps distribute the workload and ensures you have high availability.
-  You can quickly create horizontally scalable deployments with minimal resource and operational overhead.
-* **Security:** {{< param "PRODUCT_NAME" >}} helps you manage authentication credentials and connect to HashiCorp Vault servers or Kubernetes clusters to retrieve Kubernetes secrets.
-* **Debugging utilities:** {{< param "PRODUCT_NAME" >}} provides debugging tools such as an embedded [user interface][UI] to help you identify and resolve configuration problems.
+Some of these features include custom components, GitOps compatibility, clustering support, security, and debugging utilities. Refer to the {{< param "PRODUCT_NAME" >}} [Introduction] for more information on these and other key features.
 
 ## Explore
 
 {{< card-grid key="cards" type="simple" >}}
 
-[OpenTelemetry]: https://opentelemetry.io/ecosystem/distributions/
+[OTel]: https://opentelemetry.io/ecosystem/distributions/
 [Prometheus]: https://prometheus.io/
+[Pyroscope]: https://grafana.com/docs/pyroscope/
 [Loki]: https://grafana.com/docs/loki/
-[Grafana]: https://grafana.com/docs/grafana/
-[Tempo]: https://grafana.com/docs/tempo/
 [Mimir]: https://grafana.com/docs/mimir/
-[Pyroscope]: https://grafana.com/docs/pyroscope/
-[UI]: ./tasks/debug/#alloy-ui
+[Promtail]: https://grafana.com/docs/loki/latest/send-data/promtail/
+[Introduction]: ./introduction/
diff --git a/docs/sources/_index.md.t b/docs/sources/_index.md.t
index 1dd7bd6117..53832e8f41 100644
--- a/docs/sources/_index.md.t
+++ b/docs/sources/_index.md.t
@@ -31,6 +31,12 @@ cards:
     - title: Migrate to Alloy
       href: ./tasks/migrate/
       description: Learn how to migrate to Alloy from Grafana Agent Operator, Prometheus, Promtail, Grafana Agent Static, or Grafana Agent Flow.
+    - title: Collect OpenTelemetry data
+      href: ./tasks/collect-opentelemetry-data/
+      description: You can configure Alloy to collect OpenTelemetry-compatible data and forward it to any OpenTelemetry-compatible endpoint. Learn how to configure OpenTelemetry data delivery, configure batching, and receive OpenTelemetry data over OTLP.
+    - title: Collect and forward Prometheus metrics
+      href: ./tasks/collect-prometheus-metrics/
+      description: You can configure Alloy to collect Prometheus metrics and forward them to any Prometheus-compatible database. Learn how to configure metrics delivery and collect metrics from Kubernetes Pods.
     - title: Concepts
       href: ./concepts/
       description: Learn about components, modules, clustering, and the Alloy configuration syntax.
@@ -45,37 +51,30 @@ cards:
 
 # Overview
 
-{{< param "PRODUCT_NAME" >}} offers native pipelines for OTel, [Prometheus][], [Pyroscope][], [Loki][], and many other metrics, logs, traces, and profile tools.
-In addition, you can use {{< param "PRODUCT_NAME" >}} pipelines to do different tasks, such as configure alert rules in Loki and Mimir.
-{{< param "PRODUCT_NAME" >}} is fully compatible with the OTel Collector, Prometheus Agent, and Promtail.
+{{< param "PRODUCT_NAME" >}} offers native pipelines for [OTel][], [Prometheus][], [Pyroscope][], [Loki][], and many other metrics, logs, traces, and profile tools.
+In addition, you can use {{< param "PRODUCT_NAME" >}} pipelines to do different tasks, such as configure alert rules in Loki and [Mimir][].
+{{< param "PRODUCT_NAME" >}} is fully compatible with the OTel Collector, Prometheus Agent, and [Promtail][].
 You can use {{< param "PRODUCT_NAME" >}} as an alternative to either of these solutions or combine it into a hybrid system of multiple collectors and agents.
 You can deploy {{< param "PRODUCT_NAME" >}} anywhere within your IT infrastructure and pair it with your Grafana LGTM stack, a telemetry backend from Grafana Cloud, or any other compatible backend from any other vendor.
 {{< param "PRODUCT_NAME" >}} is flexible, and you can easily configure it to fit your needs in on-prem, cloud-only, or a mix of both.
 
+{{< admonition type="tip" >}}
+{{< param "PRODUCT_NAME" >}} uses the same components, code, and concepts that were first introduced in Grafana Agent Flow.
+{{< /admonition >}}
+
 ## What can {{% param "PRODUCT_NAME" %}} do?
 
 {{< param "PRODUCT_NAME" >}} is more than just observability signals like metrics, logs, and traces. It provides many features that help you quickly find and process your data in complex environments.
-Some of these features include:
-
-* **Custom components:** You can use {{< param "PRODUCT_NAME" >}} to create and share custom components.
-  Custom components combine a pipeline of existing components into a single, easy-to-understand component that's just a few lines long.
-  You can use pre-built custom components from the community, ones packaged by Grafana, or create your own.
-* **GitOps compatibility:** {{< param "PRODUCT_NAME" >}} uses frameworks to pull configurations from Git, S3, HTTP endpoints, and just about any other source.
-* **Clustering support:** {{< param "PRODUCT_NAME" >}} has native clustering support.
-  Clustering helps distribute the workload and ensures you have high availability.
-  You can quickly create horizontally scalable deployments with minimal resource and operational overhead.
-* **Security:** {{< param "PRODUCT_NAME" >}} helps you manage authentication credentials and connect to HashiCorp Vault servers or Kubernetes clusters to retrieve Kubernetes secrets.
-* **Debugging utilities:** {{< param "PRODUCT_NAME" >}} provides debugging tools such as an embedded [user interface][UI] to help you identify and resolve configuration problems.
+Some of these features include custom components, GitOps compatibility, clustering support, security, and debugging utilities. Refer to the {{< param "PRODUCT_NAME" >}} [Introduction] for more information on these and other key features.
 
 ## Explore
 
 {{< card-grid key="cards" type="simple" >}}
 
-[OpenTelemetry]: https://opentelemetry.io/ecosystem/distributions/
+[OTel]: https://opentelemetry.io/ecosystem/distributions/
 [Prometheus]: https://prometheus.io/
+[Pyroscope]: https://grafana.com/docs/pyroscope/
 [Loki]: https://grafana.com/docs/loki/
-[Grafana]: https://grafana.com/docs/grafana/
-[Tempo]: https://grafana.com/docs/tempo/
 [Mimir]: https://grafana.com/docs/mimir/
-[Pyroscope]: https://grafana.com/docs/pyroscope/
-[UI]: ./tasks/debug/#alloy-ui
+[Promtail]: https://grafana.com/docs/loki/latest/send-data/promtail/
+[Introduction]: ./introduction/
diff --git a/docs/sources/assets/alloy_icon_orange.svg b/docs/sources/assets/alloy_icon_orange.svg
new file mode 100644
index 0000000000..bea56291ce
--- /dev/null
+++ b/docs/sources/assets/alloy_icon_orange.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 373.46 377.76"><defs><style>.cls-1{fill:#fd6f00;}</style></defs><g id="Layer_1-2"><path class="cls-1" d="M341.1,122.44c-16.59-28.61-37.84-53.88-62.09-74.04l-.46-.38h0c-4.83-4-9.77-7.81-14.82-11.38C229.81,12.67,192.7,0,156.4,0,110.29,0,68.52,24.6,38.78,69.28-3.05,132.1-11.97,220.16,16.56,288.4c21.41,51.21,77,84.43,148.69,88.87,5.22,.32,10.48,.48,15.73,.48,33.19,0,66.7-6.39,95.83-18.41,37.05-15.29,65.41-38.69,82-67.68,24.64-43.05,17.85-107.89-17.72-169.23Zm-167.56,9.61c16.31,0,32.55,6.68,44.23,19.78,10.53,11.81,15.83,27.01,14.93,42.8-.88,15.48-7.64,29.71-19.03,40.19l-1.37,1.22c-20.12,17.41-48.83,18.87-70.36,5.28-4.91-3.46-9.62-7.66-14.06-12.65-1.15-1.29-2.22-2.64-3.22-4.04-3.53-5.16-6.14-10.73-7.85-16.51-.1-.36-.21-.71-.3-1.07-.01-.05-.02-.09-.04-.14-5.24-20.41,.74-44.18,17.09-59.28l1.25-1.15c11.16-9.67,24.96-14.43,38.73-14.43Zm-17.14-110.3c31.78,0,64.55,11.29,94.77,32.66,4.64,3.28,9.17,6.78,13.61,10.45l7.28,6.58c55.73,51.82,73.16,102.36,68.8,154.66-2.86,34.34-24.74,61.76-56.1,83-29.86,20.22-75.54,26.01-108.18,22.51-32.05-3.43-65.27-16.35-86.72-45.41-17.74-24.04-23.01-49.86-20.61-77.56,2.39-27.56,13.45-53.33,31.39-71.26,10.06-10.06,27.24-22.69,54.67-25-12.84,2.95-25.13,9.07-35.64,18.44-21.29,18.99-30.15,46.78-26.04,73.07,1.76,12.01,6.22,23.58,13.47,33.59,1.84,2.64,3.84,5.22,6.04,7.68,5.26,5.9,11.21,10.83,17.61,14.81,31.35,21.18,70.41,19.51,108.55-5.78,20.78-13.78,34.83-37.67,38.53-65.56,4.49-33.78-6.35-68.43-29.75-95.06-25.45-28.96-60.67-46.1-96.64-47.02-33.44-.88-64.37,12.31-89.46,38.08-7.68,7.89-14.67,16.43-20.91,25.48,4.51-10.06,9.79-19.7,15.82-28.77,25.58-38.42,60.92-59.58,99.51-59.58Z"/></g></svg>
\ No newline at end of file
diff --git a/docs/sources/concepts/custom_components.md b/docs/sources/concepts/custom_components.md
index f97925fbd0..fed3d76693 100644
--- a/docs/sources/concepts/custom_components.md
+++ b/docs/sources/concepts/custom_components.md
@@ -1,5 +1,5 @@
 ---
-canonical: https://grafana.com/docs/alloy/latest/concepts/custom-components/
+canonical: https://grafana.com/docs/alloy/latest/concepts/custom_components/
 description: Learn about custom components
 title: Custom components
 weight: 300
diff --git a/docs/sources/get-started/install/_index.md b/docs/sources/get-started/install/_index.md
index 0f605d4b95..a1794fe682 100644
--- a/docs/sources/get-started/install/_index.md
+++ b/docs/sources/get-started/install/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+- /docs/alloy/latest/tasks/get-started/install/
 canonical: https://grafana.com/docs/alloy/latest/get-started/install/
 description: Learn how to install Grafana Alloy
 menuTitle: Install
diff --git a/docs/sources/get-started/install/ansible.md b/docs/sources/get-started/install/ansible.md
index 4da079679c..3f6f50ccf9 100644
--- a/docs/sources/get-started/install/ansible.md
+++ b/docs/sources/get-started/install/ansible.md
@@ -11,7 +11,7 @@ noindex: true
 
 # Install or uninstall {{% param "FULL_PRODUCT_NAME" %}} using Ansible
 
-You can use Ansible to install and manage {{< param "PRODUCT_NAME" >}} on Linux hosts.
+You can use [Grafana Ansible Collection](https://github.com/grafana/grafana-ansible-collection) to install and manage {{< param "PRODUCT_NAME" >}} on Linux hosts.
 
 ## Before you begin
 
@@ -25,24 +25,31 @@ To add {{% param "PRODUCT_NAME" %}} to a host:
 1. Create a file named `alloy.yml` and add the following:
 
     ```yaml
-    - name: Install Grafana Alloy
+    - name: Install Alloy
       hosts: all
       become: true
+
       tasks:
-        - name: Install Grafana Alloy
+        - name: Install Alloy
           ansible.builtin.include_role:
             name: grafana.grafana.alloy
           vars:
-            # Destination file name
-            grafana_alloy_config_filename: config.alloy
-            # Local file to copy
-            grafana_alloy_provisioned_config_file:  "<path-to-config-file-on-localhost>"
-            grafana_alloy_flags_extra:
-              server.http.listen-addr: '0.0.0.0:12345'
+            config: |
+              prometheus.scrape "default" {
+                targets = [{"__address__" = "localhost:12345"}]
+                forward_to = [prometheus.remote_write.prom.receiver]
+              }
+              prometheus.remote_write "prom" {
+                endpoint {
+                    url = "YOUR_PROMETHEUS_PUSH_ENDPOINT"
+                }
+              }
     ```
 
-   Replace the following:
-   - _`<path-to-config-file-on-localhost>`_: The path to the {{< param "PRODUCT_NAME" >}} configuration file on the Ansible Controller (Localhost).
+    The above snippet has a sample configuration to collect and send Alloy metrics to Prometheus
+
+    Replace the following:
+    - _`YOUR_PROMETHEUS_PUSH_ENDPOINT`_:  With the Remote write endpoint of your Prometheus Instance.
 
 1. Run the Ansible playbook. Open a terminal window and run the following command from the Ansible playbook directory.
 
@@ -76,5 +83,5 @@ Main PID: 3176 (alloy-linux-amd)
 
 - [Configure {{< param "PRODUCT_NAME" >}}][Configure]
 
-[Ansible]: https://www.ansible.com/
+[Grafana Ansible Collection]: https://github.com/grafana/grafana-ansible-collection
 [Configure]: ../../../tasks/configure/configure-linux/
diff --git a/docs/sources/get-started/install/linux.md b/docs/sources/get-started/install/linux.md
index afb96d5e0e..1cf00de945 100644
--- a/docs/sources/get-started/install/linux.md
+++ b/docs/sources/get-started/install/linux.md
@@ -10,6 +10,15 @@ weight: 300
 
 You can install {{< param "PRODUCT_NAME" >}} as a systemd service on Linux.
 
+## Before you begin
+
+Some Debian-based cloud Virtual Machines don't have GPG installed by default.
+To install GPG in your Linux Virtual Machine, run the following command in a terminal window.
+
+```shell
+sudo apt install gpg
+```
+
 ## Install
 
 To install {{< param "PRODUCT_NAME" >}} on Linux, run the following commands in a terminal window.
diff --git a/docs/sources/reference/cli/run.md b/docs/sources/reference/cli/run.md
index 0fc7cf1dcf..3c09772c6d 100644
--- a/docs/sources/reference/cli/run.md
+++ b/docs/sources/reference/cli/run.md
@@ -171,4 +171,4 @@ Refer to [alloy convert][] for more details on how `extra-args` work.
 [data collection]: ../../../data-collection/
 [components]: ../../concepts/components/
 [component controller]: ../../../concepts/component_controller/
-[UI]: ../../tasks/debug/#clustering-page
+[UI]: ../../../tasks/debug/#clustering-page
diff --git a/docs/sources/reference/cli/tools.md b/docs/sources/reference/cli/tools.md
index 46638810cc..1fd402af18 100644
--- a/docs/sources/reference/cli/tools.md
+++ b/docs/sources/reference/cli/tools.md
@@ -1,5 +1,5 @@
 ---
-canonical: https://grafana.com/docs/aalloyent/latest/reference/cli/tools/
+canonical: https://grafana.com/docs/alloy/latest/reference/cli/tools/
 description: Learn about the tools command
 menuTitle: tools
 title: The tools command
diff --git a/docs/sources/reference/components/beyla.ebpf.md b/docs/sources/reference/components/beyla.ebpf.md
index 958d66f7d2..6b38b17495 100644
--- a/docs/sources/reference/components/beyla.ebpf.md
+++ b/docs/sources/reference/components/beyla.ebpf.md
@@ -31,15 +31,15 @@ beyla.ebpf "<LABEL>" {
 
 `beyla.ebpf` supports the following arguments:
 
-Name             | Type     | Description                                                                         | Default | Required
------------------|----------|-------------------------------------------------------------------------------------|---------|---------
-`open_port`      | `string` | The port of the running service for Beyla automatically instrumented with eBPF.     |         | no
-`excutable_name` | `string` | The name of the executable to match for Beyla automatically instrumented with eBPF. |         | no
+Name              | Type     | Description                                                                         | Default | Required
+------------------|----------|-------------------------------------------------------------------------------------|---------|---------
+`open_port`       | `string` | The port of the running service for Beyla automatically instrumented with eBPF.     |         | no
+`executable_name` | `string` | The name of the executable to match for Beyla automatically instrumented with eBPF. |         | no
 
 `open_port` accepts a comma-separated list of ports (for example, `80,443`), and port ranges (for example, `8000-8999`).
 If the executable matches only one of the ports in the list, it is considered to match the selection criteria.
 
-`excutable_name` accepts a regular expression to be matched against the full executable command line, including the directory where the executable resides on the file system.
+`executable_name` accepts a regular expression to be matched against the full executable command line, including the directory where the executable resides on the file system.
 
 ## Blocks
 
diff --git a/docs/sources/reference/components/loki.process.md b/docs/sources/reference/components/loki.process.md
index 15ac5609bb..5b8846137b 100644
--- a/docs/sources/reference/components/loki.process.md
+++ b/docs/sources/reference/components/loki.process.md
@@ -523,7 +523,7 @@ The following arguments are supported:
 | ------------- | ------------- | ---------------------------------------------- | ---------------- | -------- |
 | `replacement` | `string`      | String to substitute the matched patterns with | `"**REDACTED**"` | no      |
 | `source`      | `string`      | Source of the data to parse.                   | `""`             | no       |
-| `minLength`   | `int`         | Minimum length of digits to consider           | `13`             | no       |
+| `min_length`   | `int`         | Minimum length of digits to consider           | `13`             | no       |
 
 
 The `source` field defines the source of data to search. When `source` is
diff --git a/docs/sources/reference/components/loki.source.api.md b/docs/sources/reference/components/loki.source.api.md
index 663bfa311c..c794147519 100644
--- a/docs/sources/reference/components/loki.source.api.md
+++ b/docs/sources/reference/components/loki.source.api.md
@@ -30,7 +30,7 @@ The component will start HTTP server on the configured port and address with the
 
 - `/loki/api/v1/push` - accepting `POST` requests compatible with [Loki push API][loki-push-api], for example, from another {{< param "PRODUCT_NAME" >}}'s [`loki.write`][loki.write] component.
 - `/loki/api/v1/raw` - accepting `POST` requests with newline-delimited log lines in body. This can be used to send NDJSON or plaintext logs. This is compatible with promtail's push API endpoint - see [promtail's documentation][promtail-push-api] for more information. NOTE: when this endpoint is used, the incoming timestamps cannot be used and the `use_incoming_timestamp = true` setting will be ignored.
-- `/loki/ready` - accepting `GET` requests - can be used to confirm the server is reachable and healthy.
+- `/ready` - accepting `GET` requests - can be used to confirm the server is reachable and healthy.
 - `/api/v1/push` - internally reroutes to `/loki/api/v1/push`
 - `/api/v1/raw` - internally reroutes to `/loki/api/v1/raw`
 
diff --git a/docs/sources/reference/components/otelcol.auth.bearer.md b/docs/sources/reference/components/otelcol.auth.bearer.md
index febcc99ea7..cbc5f82e0a 100644
--- a/docs/sources/reference/components/otelcol.auth.bearer.md
+++ b/docs/sources/reference/components/otelcol.auth.bearer.md
@@ -97,5 +97,5 @@ otelcol.auth.bearer "creds" {
 }
 ```
 
-[otelcol.exporter.otlp]: {../otelcol.exporter.otlp/
+[otelcol.exporter.otlp]: ../otelcol.exporter.otlp/
 [otelcol.exporter.otlphttp]: ../otelcol.exporter.otlphttp/
diff --git a/docs/sources/reference/components/otelcol.exporter.loadbalancing.md b/docs/sources/reference/components/otelcol.exporter.loadbalancing.md
index 5350e1cc32..396a64410f 100644
--- a/docs/sources/reference/components/otelcol.exporter.loadbalancing.md
+++ b/docs/sources/reference/components/otelcol.exporter.loadbalancing.md
@@ -264,7 +264,7 @@ Name    | Type               | Description
 Different {{< param "PRODUCT_NAME" >}} components require different load-balancing strategies.
 The use of `otelcol.exporter.loadbalancing` is only necessary for [stateful components][stateful-and-stateless-components].
 
-[stateful-and-stateless-components]: ../../../get-started/deploy-alloy/#stateful-and-stateless-components
+[stateful-and-stateless-components]: ../../../get-started/deploy/#stateful-and-stateless-components
 
 ### otelcol.processor.tail_sampling
 <!-- TODO: Add a picture of the architecture?  -->
diff --git a/docs/sources/reference/components/prometheus.exporter.kafka.md b/docs/sources/reference/components/prometheus.exporter.kafka.md
index 5357c1d18b..0391be169e 100644
--- a/docs/sources/reference/components/prometheus.exporter.kafka.md
+++ b/docs/sources/reference/components/prometheus.exporter.kafka.md
@@ -7,7 +7,7 @@ title: prometheus.exporter.kafka
 # prometheus.exporter.kafka
 
 The `prometheus.exporter.kafka` component embeds
-[kafka_exporter](https://github.com/davidmparrott/kafka_exporter) for collecting metrics from a kafka server.
+[kafka_exporter](https://github.com/grafana/kafka_exporter) for collecting metrics from a kafka server.
 
 ## Usage
 
@@ -22,30 +22,42 @@ prometheus.exporter.kafka "LABEL" {
 You can use the following arguments to configure the exporter's behavior.
 Omitted fields take their default values.
 
-| Name                        | Type            | Description                                                                                                                                                                        | Default | Required |
-| --------------------------- | --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | -------- |
-| `kafka_uris`                | `array(string)` | Address array (host:port) of Kafka server.                                                                                                                                         |         | yes      |
-| `instance`                  | `string`        | The`instance`label for metrics, default is the hostname:port of the first kafka_uris. You must manually provide the instance value if there is more than one string in kafka_uris. |         | no       |
-| `use_sasl`                  | `bool`          | Connect using SASL/PLAIN.                                                                                                                                                          |         | no       |
-| `use_sasl_handshake`        | `bool`          | Only set this to false if using a non-Kafka SASL proxy.                                                                                                                            | `false` | no       |
-| `sasl_username`             | `string`        | SASL user name.                                                                                                                                                                    |         | no       |
-| `sasl_password`             | `string`        | SASL user password.                                                                                                                                                                |         | no       |
-| `sasl_mechanism`            | `string`        | The SASL SCRAM SHA algorithm sha256 or sha512 as mechanism.                                                                                                                        |         | no       |
-| `use_tls`                   | `bool`          | Connect using TLS.                                                                                                                                                                 |         | no       |
-| `ca_file`                   | `string`        | The optional certificate authority file for TLS client authentication.                                                                                                             |         | no       |
-| `cert_file`                 | `string`        | The optional certificate file for TLS client authentication.                                                                                                                       |         | no       |
-| `key_file`                  | `string`        | The optional key file for TLS client authentication.                                                                                                                               |         | no       |
-| `insecure_skip_verify`      | `bool`          | If set to true, the server's certificate will not be checked for validity. This makes your HTTPS connections insecure.                                                             |         | no       |
-| `kafka_version`             | `string`        | Kafka broker version.                                                                                                                                                              | `2.0.0` | no       |
-| `use_zookeeper_lag`         | `bool`          | If set to true, use a group from zookeeper.                                                                                                                                        |         | no       |
-| `zookeeper_uris`            | `array(string)` | Address array (hosts) of zookeeper server.                                                                                                                                         |         | no       |
-| `kafka_cluster_name`        | `string`        | Kafka cluster name.                                                                                                                                                                |         | no       |
-| `metadata_refresh_interval` | `duration`      | Metadata refresh interval.                                                                                                                                                         | `1m`    | no       |
-| `allow_concurrency`         | `bool`          | If set to true, all scrapes trigger Kafka operations. Otherwise, they will share results. WARNING: Disable this on large clusters.                                                 | `true`  | no       |
-| `max_offsets`               | `int`           | The maximum number of offsets to store in the interpolation table for a partition.                                                                                                 | `1000`  | no       |
-| `prune_interval_seconds`    | `int`           | How frequently should the interpolation table be pruned, in seconds.                                                                                                               | `30`    | no       |
-| `topics_filter_regex`       | `string`        | Regex filter for topics to be monitored.                                                                                                                                           | `.*`    | no       |
-| `groups_filter_regex`       | `string`        | Regex filter for consumer groups to be monitored.                                                                                                                                  | `.*`    | no       |
+| Name                          | Type            | Description                                                                                                                                                                            | Default | Required |
+| ----------------------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | -------- |
+| `kafka_uris`                  | `array(string)` | Address array (host:port) of Kafka server.                                                                                                                                             |         | yes      |
+| `instance`                    | `string`        | The`instance`label for metrics, default is the hostname:port of the first kafka_uris. You must manually provide the instance value if there is more than one string in kafka_uris.     |         | no       |
+| `use_sasl`                    | `bool`          | Connect using SASL/PLAIN.                                                                                                                                                              |         | no       |
+| `use_sasl_handshake`          | `bool`          | Only set this to false if using a non-Kafka SASL proxy.                                                                                                                                | `true`  | no       |
+| `sasl_username`               | `string`        | SASL user name.                                                                                                                                                                        |         | no       |
+| `sasl_password`               | `string`        | SASL user password.                                                                                                                                                                    |         | no       |
+| `sasl_mechanism`              | `string`        | The SASL SCRAM SHA algorithm sha256 or sha512 as mechanism.                                                                                                                            |         | no       |
+| `sasl_disable_pafx_fast`      | `bool`          | Configure the Kerberos client to not use PA_FX_FAST.                                                                                                                                   |         | no       |
+| `use_tls`                     | `bool`          | Connect using TLS.                                                                                                                                                                     |         | no       |
+| `tls_server_name`             | `string`        | Used to verify the hostname on the returned certificates unless tls.insecure-skip-tls-verify is given. If you don't provide the Kafka server name, the hostname is taken from the URL. |         | no       |
+| `ca_file`                     | `string`        | The optional certificate authority file for TLS client authentication.                                                                                                                 |         | no       |
+| `cert_file`                   | `string`        | The optional certificate file for TLS client authentication.                                                                                                                           |         | no       |
+| `key_file`                    | `string`        | The optional key file for TLS client authentication.                                                                                                                                   |         | no       |
+| `insecure_skip_verify`        | `bool`          | If set to true, the server's certificate will not be checked for validity. This makes your HTTPS connections insecure.                                                                 |         | no       |
+| `kafka_version`               | `string`        | Kafka broker version.                                                                                                                                                                  | `2.0.0` | no       |
+| `use_zookeeper_lag`           | `bool`          | If set to true, use a group from zookeeper.                                                                                                                                            |         | no       |
+| `zookeeper_uris`              | `array(string)` | Address array (hosts) of zookeeper server.                                                                                                                                             |         | no       |
+| `kafka_cluster_name`          | `string`        | Kafka cluster name.                                                                                                                                                                    |         | no       |
+| `metadata_refresh_interval`   | `duration`      | Metadata refresh interval.                                                                                                                                                             | `1m`    | no       |
+| `gssapi_service_name`         | `string`        | Service name when using Kerberos Authorization                                                                                                                                         |         | no       |
+| `gssapi_kerberos_config_path` | `string`        | Kerberos config path.                                                                                                                                                                  |         | no       |
+| `gssapi_realm`                | `string`        | Kerberos realm.                                                                                                                                                                        |         | no       |
+| `gssapi_key_tab_path`         | `string`        | Kerberos keytab file path.                                                                                                                                                             |         | no       |
+| `gssapi_kerberos_auth_type`   | `string`        | Kerberos auth type. Either 'keytabAuth' or 'userAuth'.                                                                                                                                 |         | no       |
+| `offset_show_all`             | `bool`          | If true, the broker may auto-create topics that we requested which do not already exist.                                                                                               | `true`  | no       |
+| `topic_workers`               | `int`           | Minimum number of topics to monitor.                                                                                                                                                   | `100`   | no       |
+| `allow_concurrency`           | `bool`          | If set to true, all scrapes trigger Kafka operations. Otherwise, they will share results. WARNING: Disable this on large clusters.                                                     | `true`  | no       |
+| `allow_auto_topic_creation`   | `bool`          | If true, the broker may auto-create topics that we requested which do not already exist.                                                                                               |         | no       |
+| `max_offsets`                 | `int`           | The maximum number of offsets to store in the interpolation table for a partition.                                                                                                     | `1000`  | no       |
+| `prune_interval_seconds`      | `int`           | Deprecated (no-op), use `metadata_refresh_interval` instead.                                                                                                                           | `30`    | no       |
+| `topics_filter_regex`         | `string`        | Regex filter for topics to be monitored.                                                                                                                                               | `.*`    | no       |
+| `topics_exclude_regex`        | `string`        | Regex that determines which topics to exclude.                                                                                                                                         | `^$`    | no       |
+| `groups_filter_regex`         | `string`        | Regex filter for consumer groups to be monitored.                                                                                                                                      | `.*`    | no       |
+| `groups_exclude_regex`        | `string`        | Regex that determines which consumer groups to exclude.                                                                                                                                | `^$`    | no       |
 
 ## Exported fields
 
diff --git a/docs/sources/reference/config-blocks/argument.md b/docs/sources/reference/config-blocks/argument.md
index fb6a4250ac..4c4d424a73 100644
--- a/docs/sources/reference/config-blocks/argument.md
+++ b/docs/sources/reference/config-blocks/argument.md
@@ -70,4 +70,4 @@ declare "self_collect" {
 ```
 
 [custom component]: ../../../concepts/custom_components/
-[declare]: ../..//config-blocks/declare/
+[declare]: ../../config-blocks/declare/
diff --git a/docs/sources/shared/agent-deprecation.md b/docs/sources/shared/agent-deprecation.md
new file mode 100644
index 0000000000..7cae5ca61b
--- /dev/null
+++ b/docs/sources/shared/agent-deprecation.md
@@ -0,0 +1,21 @@
+---
+headless: true
+labels:
+  products:
+    - enterprise
+    - oss
+---
+
+[//]: # 'This file provides an admonition caution to change to Grafana Agent to Grafana Alloy.'
+[//]: # 'This shared file is included in many repositories.'
+[//]: #
+[//]: # 'If you make changes to this file, verify that the meaning and content are not changed in any place where the file is included.'
+[//]: # 'Any links should be fully qualified and not relative: /docs/grafana/ instead of ../grafana/.'
+
+{{< admonition type="caution" >}}
+Grafana Alloy is the new name for our distribution of the OTel collector.
+Grafana Agent has been deprecated and is in Long-Term Support (LTS) through October 31, 2025. Grafana Agent will reach an End-of-Life (EOL) on November 1, 2025.
+Read more about why we recommend migrating to [Grafana Alloy][alloy].
+
+[alloy]: https://grafana.com/blog/2024/04/09/grafana-alloy-opentelemetry-collector-with-prometheus-pipelines/
+{{< /admonition >}}
diff --git a/docs/sources/tasks/configure/configure-linux.md b/docs/sources/tasks/configure/configure-linux.md
index 2b26d9934d..49a407e61d 100644
--- a/docs/sources/tasks/configure/configure-linux.md
+++ b/docs/sources/tasks/configure/configure-linux.md
@@ -10,7 +10,7 @@ weight: 300
 
 To configure {{< param "PRODUCT_NAME" >}} on Linux, perform the following steps:
 
-1. Edit the default configuration file at `/etc/alloy.config.alloy`.
+1. Edit the default configuration file at `/etc/alloy/config.alloy`.
 
 1. Run the following command in a terminal to reload the configuration file:
 
diff --git a/docs/sources/tasks/migrate/from-flow.md b/docs/sources/tasks/migrate/from-flow.md
index 3953c75377..d9e941ada8 100644
--- a/docs/sources/tasks/migrate/from-flow.md
+++ b/docs/sources/tasks/migrate/from-flow.md
@@ -60,11 +60,11 @@ Before migrating, modify your Grafana Agent Flow configuration to remove or repl
 
 ### Deploy {{% param "PRODUCT_NAME" %}} with a default configuration
 
-Follow the [installation instructions][install] for {{< param "PRODUCT_NAME" >}}, using the default configuration file. The configuration file will be customized in the following steps.
+Follow the [installation instructions][install] for {{< param "PRODUCT_NAME" >}}, using the default configuration file. The configuration file is customized in the following steps.
 
 When deploying {{< param "PRODUCT_NAME" >}}, be aware of the following settings:
 
-- {{< param "PRODUCT_NAME" >}} should be deployed with identical topology as Grafana Agent Flow: CPU, and storage limits should match.
+- {{< param "PRODUCT_NAME" >}} should be deployed with identical topology as Grafana Agent Flow. The CPU, and storage limits should match.
 - Custom command-line flags configured in Grafana Agent Flow should be reflected in your {{< param "PRODUCT_NAME" >}} installation.
 - {{< param "PRODUCT_NAME" >}} may need to be deployed with the `--stability.level` flag in [run] to enable non-stable components:
     - Set `--stability.level` to `public-preview` if you are using any of these components:
diff --git a/docs/sources/tasks/migrate/from-static.md b/docs/sources/tasks/migrate/from-static.md
index fa19d9d545..ddf08c3198 100644
--- a/docs/sources/tasks/migrate/from-static.md
+++ b/docs/sources/tasks/migrate/from-static.md
@@ -40,7 +40,7 @@ This conversion will enable you to take full advantage of the many additional fe
 1. Open a terminal window and run the following command.
 
    ```shell
-   graalloy convert --source-format=static --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
+   alloy convert --source-format=static --output=<OUTPUT_CONFIG_PATH> <INPUT_CONFIG_PATH>
    ```
 
    Replace the following:
@@ -250,6 +250,7 @@ loki.source.file "logs_varlogs_varlogs" {
         min_poll_frequency = "1s"
         max_poll_frequency = "5s"
     }
+    legacy_positions_file = "/var/lib/agent/data-agent/varlogs.yml"
 }
 
 loki.write "logs_varlogs" {
diff --git a/docs/sources/tasks/monitor/component_metrics.md b/docs/sources/tasks/monitor/component_metrics.md
index 951fd8abd7..192bc92346 100644
--- a/docs/sources/tasks/monitor/component_metrics.md
+++ b/docs/sources/tasks/monitor/component_metrics.md
@@ -1,5 +1,5 @@
 ---
-canonical: https://grafana.com/docs/alloy/latest/monitor/component_metrics/
+canonical: https://grafana.com/docs/alloy/latest/tasks/monitor/component_metrics/
 description: Learn how to monitor component metrics
 title: Monitor components
 weight: 200
diff --git a/docs/sources/tasks/monitor/controller_metrics.md b/docs/sources/tasks/monitor/controller_metrics.md
index 001f2ae9ee..3906100d69 100644
--- a/docs/sources/tasks/monitor/controller_metrics.md
+++ b/docs/sources/tasks/monitor/controller_metrics.md
@@ -1,5 +1,5 @@
 ---
-canonical: https://grafana.com/docs/alloy/latest/monitor/controller_metrics/
+canonical: https://grafana.com/docs/alloy/latest/tasks/monitor/controller_metrics/
 description: Learn how to monitor controller metrics
 title: Monitor the Grafana Alloy component controller
 menuTitle: Monitor the controller
diff --git a/example/README.md b/example/README.md
new file mode 100644
index 0000000000..ac78113de7
--- /dev/null
+++ b/example/README.md
@@ -0,0 +1,55 @@
+# Docker Compose example
+
+This directory contains a Docker Compose environment that can be used to test
+Grafana Alloy.
+
+> **NOTE**: This environment is not intended for production use, and is
+> maintained on a best-effort basis.
+
+By default, only Grafana and databases are exposed:
+
+* Grafana, for visualizing telemetry (`localhost:3000`)
+* Grafana Mimir, for storing metrics (`localhost:9009`)
+* Grafana Loki, for storing logs (`localhost:3100`)
+* Grafana Tempo, for storing traces (`localhost:3200`)
+* Grafana Pyroscope, for storing profiles (`localhost:4040`)
+
+Grafana is automatically provisioned with the appropriate datasources and
+dashboards for monitoring Grafana Alloy.
+
+To start the environment, run:
+
+```bash
+docker compose up -d
+```
+
+To stop the environment, run:
+
+```bash
+docker compose down
+```
+
+## Running Alloy
+
+Alloy can either be run locally or within Docker Compose. The [example
+configuration](./config/alloy/config.alloy) can be used to send self-monitoring
+data from a local Alloy to the various databases running in Docker Compose.
+
+To run Alloy within Docker Compose, pass `--profile=alloy` to `docker compose`
+when starting and stopping the environment:
+
+```bash
+docker compose --profile=alloy up -d
+```
+
+```bash
+docker compose --profile=alloy down
+```
+
+## Visualizing
+
+To visualize Alloy data in Grafana, open <http://localhost:3000> in a web
+browser and look at the dashboards in the `Alloy` folder.
+
+> **NOTE**: It can take up to a minute for Alloy metrics and profiles to start
+> appearing.
diff --git a/example/compose.yaml b/example/compose.yaml
new file mode 100644
index 0000000000..720a1d8726
--- /dev/null
+++ b/example/compose.yaml
@@ -0,0 +1,32 @@
+name: alloy-example
+
+include:
+  - ./grafana.yaml
+  - ./databases.yaml
+
+services:
+  alloy:
+    image: grafana/alloy:v1.0.0
+    pull_policy: always
+    profiles: ["alloy"]
+    restart: on-failure
+    volumes:
+      - ./config/alloy:/etc/alloy
+    environment:
+      REMOTE_WRITE_HOST: mimir:9009
+      LOKI_HOST: loki:3100
+      TEMPO_HOST: tempo:4317
+      PYROSCOPE_HOST: pyroscope:4040
+    depends_on:
+      - mimir
+      - loki
+      - tempo
+      - pyroscope
+    command:
+      - run
+      - /etc/alloy/config.alloy
+      - --storage.path=/var/lib/alloy/data
+      - --server.http.listen-addr=0.0.0.0:12345
+      - --stability.level=experimental # Enable all functionality
+    ports:
+      - "12345:12345"
diff --git a/example/config/alloy/config.alloy b/example/config/alloy/config.alloy
new file mode 100644
index 0000000000..74ef592c42
--- /dev/null
+++ b/example/config/alloy/config.alloy
@@ -0,0 +1,74 @@
+// This file serves as an example Alloy configuration to interact with the
+// Docker Compose environment.
+//
+// This configuration works whether you are running Alloy locally or within the
+// Docker Compose environment when the `alloy` profile is enabled.
+
+logging {
+	level = "debug"
+
+	// Forward internal logs to the local Loki instance.
+	write_to = [loki.write.loki.receiver]
+}
+
+tracing {
+	// Write all spans. Don't do this in production!
+	sampling_fraction = 1.0
+
+	// Forward internal spans to the local Tempo instance.
+	write_to = [otelcol.exporter.otlp.tempo.input]
+}
+
+// Collect metrics from the local running Alloy instance and forward to
+// Prometheus.
+prometheus.exporter.self "alloy" {}
+prometheus.scrape "alloy" {
+	targets    = prometheus.exporter.self.alloy.targets
+	forward_to = [prometheus.remote_write.mimir.receiver]
+}
+
+// Collect profiles from the local running Alloy instance and forward to
+// Pyroscope.
+pyroscope.scrape "default" {
+  targets = [
+    {"__address__" = "localhost:12345", "service_name" = "alloy"},
+  ]
+  forward_to = [pyroscope.write.pyroscope.receiver]
+}
+
+prometheus.remote_write "mimir" {
+	endpoint {
+		url = format(
+			"http://%s/api/v1/push",
+			coalesce(env("REMOTE_WRITE_HOST"), "localhost:9009"),
+		)
+	}
+}
+
+loki.write "loki" {
+	endpoint {
+		url = format(
+			"http://%s/loki/api/v1/push",
+			coalesce(env("LOKI_HOST"), "localhost:3100"),
+		)
+	}
+}
+
+otelcol.exporter.otlp "tempo" {
+	client {
+		endpoint = coalesce(env("TEMPO_HOST"), "localhost:4317")
+
+		tls {
+			insecure = true
+		}
+	}
+}
+
+pyroscope.write "pyroscope" {
+	endpoint {
+		url = format(
+			"http://%s",
+			coalesce(env("PYROSCOPE_HOST"), "localhost:4040"),
+		)
+	}
+}
diff --git a/example/config/grafana/datasources/datasource.yml b/example/config/grafana/datasources/datasource.yml
new file mode 100644
index 0000000000..2bf975bbfe
--- /dev/null
+++ b/example/config/grafana/datasources/datasource.yml
@@ -0,0 +1,53 @@
+apiVersion: 1
+
+deleteDatasources:
+  - name: Mimir
+
+datasources:
+- name: Mimir
+  type: prometheus
+  access: proxy
+  orgId: 1
+  url: http://mimir:9009/prometheus
+  basicAuth: false
+  isDefault: false
+  version: 1
+  editable: true
+  jsonData:
+    # The recommended scrape interval is 60s.
+    timeInterval: '60s'
+- name: Loki
+  type: loki
+  access: proxy
+  orgId: 1
+  url: http://loki:3100
+  basicAuth: false
+  isDefault: false
+  version: 1
+  editable: true
+  jsonData:
+    derivedFields:
+      - datasourceUid: tempo
+        matcherRegex: tid=(\w+)
+        name: TraceID
+        url: $${__value.raw}
+- name: Tempo
+  type: tempo
+  access: proxy
+  orgId: 1
+  url: http://tempo:3200
+  basicAuth: false
+  isDefault: false
+  version: 1
+  editable: true
+  apiVersion: 1
+  uid: tempo
+- name: Pyroscope
+  type: grafana-pyroscope-datasource
+  access: proxy
+  orgId: 1
+  url: http://pyroscope:4040/
+  basicAuth: false
+  isDefault: false
+  version: 1
+  editable: true
diff --git a/example/config/grafana/grafana.ini b/example/config/grafana/grafana.ini
new file mode 100644
index 0000000000..ba1078c518
--- /dev/null
+++ b/example/config/grafana/grafana.ini
@@ -0,0 +1,9 @@
+[analytics]
+reporting_enabled = false
+[auth.anonymous]
+enabled = true
+org_role = Admin
+[explore]
+enabled = true
+[users]
+default_theme = dark
diff --git a/example/config/mimir/mimir.yaml b/example/config/mimir/mimir.yaml
new file mode 100644
index 0000000000..e48447f24c
--- /dev/null
+++ b/example/config/mimir/mimir.yaml
@@ -0,0 +1,63 @@
+# Do not use this configuration in production.
+# It is for demonstration purposes only.
+multitenancy_enabled: false
+
+activity_tracker: {}
+
+alertmanager: {}
+
+alertmanager_storage:
+  backend: local
+
+server:
+  http_listen_port: 9009
+
+  # Configure the server to allow messages up to 100MB.
+  grpc_server_max_recv_msg_size: 104857600
+  grpc_server_max_send_msg_size: 104857600
+  grpc_server_max_concurrent_streams: 1000
+
+distributor:
+  pool:
+    health_check_ingesters: true
+
+ingester_client:
+  grpc_client_config:
+    grpc_compression: gzip
+    max_recv_msg_size: 104857600
+    max_send_msg_size: 104857600
+
+ingester:
+  ring:
+    final_sleep: 0s
+    kvstore:
+      store: inmemory
+    min_ready_duration: 0s
+    num_tokens: 512
+    replication_factor: 1
+
+blocks_storage:
+  backend: filesystem
+  bucket_store:
+    sync_dir: /tmp/mimir/tsdb-sync
+  filesystem:
+    dir: /tmp/mimir/blocks
+  tsdb:
+    dir: /tmp/mimir/tsdb
+
+compactor:
+  sharding_ring:
+    kvstore:
+      store: inmemory
+
+ruler:
+  enable_api: true
+
+ruler_storage:
+  backend: filesystem
+  local:
+    directory: /tmp/mimir/rules
+
+limits:
+  ingestion_burst_size: 500000
+  ingestion_rate: 250000
diff --git a/example/databases.yaml b/example/databases.yaml
new file mode 100644
index 0000000000..4ea8f972be
--- /dev/null
+++ b/example/databases.yaml
@@ -0,0 +1,35 @@
+services:
+  mimir:
+    image: grafana/mimir:2.12.0
+    restart: on-failure
+    command:
+      - -config.file=/etc/mimir-config/mimir.yaml
+    volumes:
+      - ./config/mimir:/etc/mimir-config
+    ports:
+      - "9009:9009"
+
+  loki:
+    image: grafana/loki:3.0.0
+    restart: on-failure
+    ports:
+      - "3100:3100"
+
+  tempo:
+    image: grafana/tempo:2.4.1
+    restart: on-failure
+    command:
+      - "-storage.trace.backend=local"                  # tell tempo where to permanently put traces
+      - "-storage.trace.local.path=/tmp/tempo/traces"
+      - "-storage.trace.wal.path=/tmp/tempo/wal"        # tell tempo where to store the wal
+      - "-auth.enabled=false"                           # disables the requirement for the X-Scope-OrgID header
+      - "-server.http-listen-port=3200"
+    ports:
+      - "3200:3200"
+      - "4317:4317"
+
+  pyroscope:
+    image: grafana/pyroscope:1.5.0
+    restart: on-failure
+    ports:
+      - "4040:4040"
diff --git a/example/grafana.yaml b/example/grafana.yaml
new file mode 100644
index 0000000000..e93c7d6e5b
--- /dev/null
+++ b/example/grafana.yaml
@@ -0,0 +1,47 @@
+services:
+  grafana:
+    image: grafana/grafana:10.1.9
+    restart: on-failure
+    command:
+      - --config=/etc/grafana-config/grafana.ini
+    volumes:
+      - ./config/grafana:/etc/grafana-config
+      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
+    ports:
+      - "3000:3000"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/healthz"]
+      interval: 1s
+      start_interval: 0s
+      timeout: 10s
+      retries: 5
+
+  # Provision alloy-mixin after Grafana is healthy and running.
+  provision-dashboards:
+    build: images/grizzly
+    restart: on-failure
+    depends_on:
+      grafana:
+        condition: service_healthy
+    environment:
+      - GRAFANA_URL=http://grafana:3000
+    volumes:
+      - ../operations/alloy-mixin:/etc/alloy-mixin
+    working_dir: /etc/alloy-mixin
+    command: grr apply grizzly/dashboards.jsonnet
+
+  # Watch dashboards for changes and apply them to Grafana.
+  watch-dashboards:
+    build: images/grizzly
+    restart: on-failure
+    depends_on:
+      grafana:
+        condition: service_healthy
+    environment:
+      - GRAFANA_URL=http://grafana:3000
+    volumes:
+      - ../operations/alloy-mixin:/etc/alloy-mixin
+    working_dir: /etc/alloy-mixin
+    command: grr watch dashboards/ grizzly/dashboards.jsonnet
+
+
diff --git a/example/images/grizzly/Dockerfile b/example/images/grizzly/Dockerfile
new file mode 100644
index 0000000000..b98841fb67
--- /dev/null
+++ b/example/images/grizzly/Dockerfile
@@ -0,0 +1,6 @@
+FROM golang:1.22-alpine
+
+# NOTE(rfratto): Versions of grr newer than v0.2.1 don't work with our Grizzly
+# jsonnet files, reporting that the the Alloy dashboard folder "cannot be
+# found" after creating it.
+RUN go install github.com/grafana/grizzly/cmd/grr@v0.2.1
diff --git a/go.mod b/go.mod
index 7dafbff17b..aae5bf5ba9 100644
--- a/go.mod
+++ b/go.mod
@@ -27,7 +27,6 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/davidmparrott/kafka_exporter/v2 v2.0.1
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/docker/docker v24.0.9+incompatible
 	github.com/docker/go-connections v0.5.0
@@ -77,14 +76,14 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/hashicorp/vault/api v1.10.0
+	github.com/hashicorp/vault/api v1.12.0
 	github.com/hashicorp/vault/api/auth/approle v0.2.0
 	github.com/hashicorp/vault/api/auth/aws v0.2.0
 	github.com/hashicorp/vault/api/auth/azure v0.2.0
 	github.com/hashicorp/vault/api/auth/gcp v0.5.0
 	github.com/hashicorp/vault/api/auth/kubernetes v0.2.0
 	github.com/hashicorp/vault/api/auth/ldap v0.2.0
-	github.com/hashicorp/vault/api/auth/userpass v0.2.0
+	github.com/hashicorp/vault/api/auth/userpass v0.6.0
 	github.com/heroku/x v0.0.61
 	github.com/iamseth/oracledb_exporter v0.0.0-20230918193147-95e16f21ceee
 	github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4
@@ -258,6 +257,11 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
+require (
+	github.com/Shopify/sarama v1.38.1
+	github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a
+)
+
 require (
 	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/compute v1.23.3 // indirect
@@ -300,7 +304,6 @@ require (
 	github.com/Microsoft/hcsshim v0.11.4 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
-	github.com/Shopify/sarama v1.38.1 // indirect
 	github.com/Showmax/go-fqdn v1.0.0 // indirect
 	github.com/Workiva/go-datastructures v1.1.0 // indirect
 	github.com/alecthomas/participle/v2 v2.1.1 // indirect
@@ -638,8 +641,8 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
-	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
-	github.com/xdg/stringprep v1.0.0 // indirect
+	github.com/xdg/scram v1.0.3 // indirect
+	github.com/xdg/stringprep v1.0.3 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
diff --git a/go.sum b/go.sum
index b8cd0947e6..8fb92c5268 100644
--- a/go.sum
+++ b/go.sum
@@ -233,7 +233,6 @@ github.com/SAP/go-hdb v0.12.0/go.mod h1:etBT+FAi1t5k3K3tf5vQTnosgYmhDkRi8jEnQqCn
 github.com/SermoDigital/jose v0.0.0-20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/sarama v1.27.1/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II=
-github.com/Shopify/sarama v1.27.2/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II=
 github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
 github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
@@ -529,8 +528,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidmparrott/kafka_exporter/v2 v2.0.1 h1:nGn+MKV8z08NK4xqcYSa3fBCs/VPVesT/5kboFWJaiE=
-github.com/davidmparrott/kafka_exporter/v2 v2.0.1/go.mod h1:n3ho8mZ5tZcmr8NAu/SjQHY61CDTqXtrACcEYwLXv4Y=
 github.com/denisenkom/go-mssqldb v0.0.0-20180620032804-94c9c97e8c9f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
 github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 github.com/dennwc/btrfs v0.0.0-20230312211831-a1f570bd01a1 h1:ue4Es4Xzz255hWQ7NAWzZxuXG+YOV7URzzusLLSe0zU=
@@ -710,6 +707,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
 github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
 github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -1048,6 +1046,8 @@ github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361 h1:TtNaja
 github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361/go.mod h1:P5406BrWxjahTzVF6aCSumNI1KPlZJc0zO0v+zKZ4gc=
 github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d h1:YwbJJ/PrVWVdnR+j/EAVuazdeP+Za5qbiH1Vlr+wFXs=
 github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d/go.mod h1:796sq+UcONnSlzA3RtlBZ+b/hrerkZXiEmO8oMjyRwY=
+github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a h1:jqM4NNdx8LSquKo8bPx+XWn91S2b+sgNvEcFfSJQtHY=
+github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a/go.mod h1:ZXGGyeTUMenf/H1CDBK9lv3azjswfa0nVzLoQAYmnDc=
 github.com/grafana/loki v1.6.2-0.20240221085104-f9d188620153 h1:C191g5Ls8lIf9lkJEoScTQgoVDwUdK4HXKP5XtL+zAM=
 github.com/grafana/loki v1.6.2-0.20240221085104-f9d188620153/go.mod h1:j2XCl3SmslPf+3Vs7uyoaJE/QkmUlL9JzTBTShSOSiU=
 github.com/grafana/loki/pkg/push v0.0.0-20231212100434-384e5c2dc872 h1:6kPX7bngjBgUlHqADwZ6249UtzMaoQW5n0H8bOtnYeM=
@@ -1227,8 +1227,9 @@ github.com/hashicorp/vault v0.10.3/go.mod h1:KfSyffbKxoVyspOdlaGVjIuwLobi07qD1bA
 github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190318174639-195e0e9d07f1/go.mod h1:VJHHT2SC1tAPrfENQeBhLlb5FbZoKZM+oC/ROmEftz0=
 github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
 github.com/hashicorp/vault/api v1.7.2/go.mod h1:xbfA+1AvxFseDzxxdWaL0uO99n1+tndus4GCrtouy0M=
-github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ=
 github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
+github.com/hashicorp/vault/api v1.12.0 h1:meCpJSesvzQyao8FCOgk2fGdoADAnbDu2WPJN1lDLJ4=
+github.com/hashicorp/vault/api v1.12.0/go.mod h1:si+lJCYO7oGkIoNPAN8j3azBLTn9SjMGS+jFaHd1Cck=
 github.com/hashicorp/vault/api/auth/approle v0.2.0 h1:mdNYwDRp+tqvJmyfbkaHLLePGYDY27mOFtBZBb7va/I=
 github.com/hashicorp/vault/api/auth/approle v0.2.0/go.mod h1:w4PwYaLJmGq0cMss0ZAV9b49vcrpB6SKxMMLUp4voR8=
 github.com/hashicorp/vault/api/auth/aws v0.2.0 h1:s7445TloGqcL8rJ7TZtuy0mwblyVslOzt0ZAsjEKdeM=
@@ -1241,8 +1242,8 @@ github.com/hashicorp/vault/api/auth/kubernetes v0.2.0 h1:ScdzRAF8JZIdJYP4oprZKsI
 github.com/hashicorp/vault/api/auth/kubernetes v0.2.0/go.mod h1:2BKADs9mwqAycDK/6tiHRh2sX0SPnC0DN4wHjJoAirw=
 github.com/hashicorp/vault/api/auth/ldap v0.2.0 h1:pBzFM1Fu0IgS7mfKxVEiCsuPbHEgE5EbXzp6RgN9uXQ=
 github.com/hashicorp/vault/api/auth/ldap v0.2.0/go.mod h1:ezky0BvVjLnFBPN4XrFR272iJRoJVdxxor7sVKr0u3k=
-github.com/hashicorp/vault/api/auth/userpass v0.2.0 h1:xgP3Pz8P2hDbXzn0dbIBz8HhRj/wNdZVDZfBbZ0Vams=
-github.com/hashicorp/vault/api/auth/userpass v0.2.0/go.mod h1:DkYCgkWaw+UvJz3CQRKCOVSyYt6YzWgSwBTswLbL7d4=
+github.com/hashicorp/vault/api/auth/userpass v0.6.0 h1:wpiGIbS7CMdqqqs7GNQMO+AQW6DxecGBDTgxaBW5R9Q=
+github.com/hashicorp/vault/api/auth/userpass v0.6.0/go.mod h1:BYLic7wPxTqn35FX0nKU2oCdZYEDJ/UCFQY0zO4AImI=
 github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
 github.com/hashicorp/vault/sdk v0.5.1/go.mod h1:DoGraE9kKGNcVgPmTuX357Fm6WAx1Okvde8Vp3dPDoU=
 github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyuqg7yuAWUg/jMZR1/0QTzTRdNR6Uw=
@@ -1922,7 +1923,6 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
 github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
 github.com/prometheus/client_golang v1.6.1-0.20200604110148-03575cad4e55/go.mod h1:25h+Uz1WvXDBZYwqGX8PAb71RBkcjxEVV/R5wGnsq4I=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
@@ -1944,7 +1944,6 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
@@ -1970,7 +1969,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
@@ -2246,10 +2244,12 @@ github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
+github.com/xdg/scram v1.0.3 h1:nTadYh2Fs4BK2xdldEa2g5bbaZp0/+1nJMMPtPxS/to=
+github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4=
+github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -2495,6 +2495,8 @@ golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2Uz
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
@@ -2617,6 +2619,7 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2726,7 +2729,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2773,6 +2775,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
@@ -2786,6 +2790,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
@@ -2806,6 +2812,7 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/internal/cmd/integration-tests/configs/kafka/Dockerfile b/internal/cmd/integration-tests/configs/kafka/Dockerfile
new file mode 100644
index 0000000000..5a5f81659e
--- /dev/null
+++ b/internal/cmd/integration-tests/configs/kafka/Dockerfile
@@ -0,0 +1,10 @@
+FROM golang:1.22.1 as build
+WORKDIR /app/
+COPY go.mod go.sum ./
+COPY syntax/go.mod syntax/go.sum ./syntax/
+RUN go mod download
+COPY ./internal/cmd/integration-tests/configs/kafka/ ./
+RUN CGO_ENABLED=0 go build -o main main.go
+FROM alpine:3.18
+COPY --from=build /app/main /app/main
+CMD ["/app/main"]
\ No newline at end of file
diff --git a/internal/cmd/integration-tests/configs/kafka/main.go b/internal/cmd/integration-tests/configs/kafka/main.go
new file mode 100644
index 0000000000..b3cfbd1eda
--- /dev/null
+++ b/internal/cmd/integration-tests/configs/kafka/main.go
@@ -0,0 +1,109 @@
+package main
+
+import (
+	"context"
+	"log"
+	"time"
+
+	"github.com/Shopify/sarama"
+)
+
+const (
+	topicName     = "test_topic"
+	brokerAddress = "kafka:9092"
+)
+
+// This app sends and consumes messages via a Kafka topic.
+
+func main() {
+	go produceMessages()
+	consumeMessages()
+}
+
+func produceMessages() {
+	config := sarama.NewConfig()
+	config.Producer.Return.Successes = true
+
+	var producer sarama.SyncProducer
+	var err error
+
+	for {
+		producer, err = sarama.NewSyncProducer([]string{brokerAddress}, config)
+		if err == nil {
+			break
+		}
+		log.Printf("Failed to start Sarama producer: %v, retrying in 5 seconds...", err)
+		time.Sleep(5 * time.Second)
+	}
+
+	defer producer.Close()
+	log.Println("Sarama producer started successfully")
+
+	for {
+		message := &sarama.ProducerMessage{
+			Topic: topicName,
+			Value: sarama.StringEncoder("hello"),
+		}
+
+		partition, offset, err := producer.SendMessage(message)
+		if err != nil {
+			log.Printf("Failed to send message: %v", err)
+		} else {
+			log.Printf("Message is stored in topic(%s)/partition(%d)/offset(%d)\n", topicName, partition, offset)
+		}
+		time.Sleep(time.Second)
+	}
+}
+
+func consumeMessages() {
+	config := sarama.NewConfig()
+	config.Consumer.Return.Errors = true
+	config.Consumer.Offsets.Initial = sarama.OffsetOldest
+
+	var consumerGroup sarama.ConsumerGroup
+	var err error
+
+	for {
+		consumerGroup, err = sarama.NewConsumerGroup([]string{brokerAddress}, "test_consumer_group", config)
+		if err == nil {
+			break
+		}
+		log.Printf("Failed to start Sarama consumer group: %v, retrying in 5 seconds...", err)
+		time.Sleep(5 * time.Second)
+	}
+
+	defer func() {
+		if err := consumerGroup.Close(); err != nil {
+			log.Fatalf("Failed to close consumer group: %v", err)
+		}
+	}()
+	log.Println("Sarama consumer group started successfully")
+
+	ctx := context.Background()
+	consumer := Consumer{}
+
+	go func() {
+		for err := range consumerGroup.Errors() {
+			log.Printf("Consumer group error: %v", err)
+		}
+	}()
+
+	for {
+		topics := []string{topicName}
+		if err := consumerGroup.Consume(ctx, topics, &consumer); err != nil {
+			log.Fatalf("Error from consumer: %v", err)
+		}
+	}
+}
+
+type Consumer struct{}
+
+func (consumer *Consumer) Setup(_ sarama.ConsumerGroupSession) error   { return nil }
+func (consumer *Consumer) Cleanup(_ sarama.ConsumerGroupSession) error { return nil }
+func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error {
+	for message := range claim.Messages() {
+		log.Printf("Message claimed: value = %s, timestamp = %v, topic = %s\n", string(message.Value), message.Timestamp, message.Topic)
+		session.MarkMessage(message, "")
+	}
+	return nil
+}
diff --git a/internal/cmd/integration-tests/docker-compose.yaml b/internal/cmd/integration-tests/docker-compose.yaml
index 1b1d40df71..64d407c0f3 100644
--- a/internal/cmd/integration-tests/docker-compose.yaml
+++ b/internal/cmd/integration-tests/docker-compose.yaml
@@ -11,6 +11,33 @@ services:
     ports:
       - "9009:9009"
 
+  zookeeper:
+    image: confluentinc/cp-zookeeper:latest
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  kafka:
+    image: confluentinc/cp-kafka:latest
+    depends_on:
+      - zookeeper
+    ports:
+      - "9094:9094"
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:9094
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+
+  kafka-gen:
+    depends_on:
+      - kafka
+    build:
+      dockerfile: ./internal/cmd/integration-tests/configs/kafka/Dockerfile
+      context: ../../..
+
   loki:
     image: grafana/loki:latest
     command: -config.file=/etc/loki/local-config.yaml
diff --git a/internal/cmd/integration-tests/tests/kafka/config.alloy b/internal/cmd/integration-tests/tests/kafka/config.alloy
new file mode 100644
index 0000000000..7c5c72c605
--- /dev/null
+++ b/internal/cmd/integration-tests/tests/kafka/config.alloy
@@ -0,0 +1,25 @@
+prometheus.exporter.kafka "kafka_metrics" {
+  kafka_uris = ["127.0.0.1:9094"]
+}
+
+prometheus.scrape "kafka_metrics" {
+  targets    = prometheus.exporter.kafka.kafka_metrics.targets
+  forward_to = [prometheus.remote_write.kafka_metrics.receiver]
+  scrape_interval = "1s"
+  scrape_timeout = "500ms"
+}
+
+prometheus.remote_write "kafka_metrics" {
+  endpoint {
+    url = "http://localhost:9009/api/v1/push"
+    metadata_config {
+        send_interval = "1s"
+    }
+    queue_config {
+        max_samples_per_send = 100
+    }
+  }
+  external_labels = {
+    test_name = "kafka_metrics",
+  }
+}
\ No newline at end of file
diff --git a/internal/cmd/integration-tests/tests/kafka/kafka_metrics_test.go b/internal/cmd/integration-tests/tests/kafka/kafka_metrics_test.go
new file mode 100644
index 0000000000..7c8f17fe29
--- /dev/null
+++ b/internal/cmd/integration-tests/tests/kafka/kafka_metrics_test.go
@@ -0,0 +1,34 @@
+//go:build !windows
+
+package main
+
+import (
+	"testing"
+
+	"github.com/grafana/alloy/internal/cmd/integration-tests/common"
+)
+
+func TestKafkaMetrics(t *testing.T) {
+	var kafkaMetrics = []string{
+		"kafka_topic_partition_replicas",
+		"kafka_topic_partition_leader",
+		"kafka_exporter_build_info",
+		"kafka_consumergroup_current_offset",
+		"kafka_consumergroup_current_offset_sum",
+		// "kafka_consumer_lag_extrapolation", this one is not generated because it uses "kafka_consumer_lag_interpolation" instead
+		"kafka_consumer_lag_interpolation",
+		"kafka_broker_info",
+		"kafka_brokers",
+		"kafka_consumergroup_uncommitted_offsets_sum",
+		"kafka_topic_partition_current_offset",
+		"kafka_consumergroup_uncommitted_offsets",
+		"kafka_topic_partition_in_sync_replica",
+		"kafka_topic_partition_under_replicated_partition",
+		"kafka_topic_partition_leader_is_preferred",
+		"kafka_consumergroup_members",
+		"kafka_consumer_lag_millis",
+		"kafka_topic_partitions",
+		"kafka_topic_partition_oldest_offset",
+	}
+	common.MimirMetricsTest(t, kafkaMetrics, []string{}, "kafka_metrics")
+}
diff --git a/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go b/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go
index 22237bef1d..e15e9862d1 100644
--- a/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go
+++ b/internal/cmd/integration-tests/tests/unix/unix_metrics_test.go
@@ -159,6 +159,5 @@ func TestUnixMetrics(t *testing.T) {
 		"node_vmstat_pswpin",
 		"node_vmstat_pswpout",
 	}
-	// TODO(marctc): Report list of failed metrics instead of one by one.
 	common.MimirMetricsTest(t, unixMetrics, []string{}, "unix_metrics")
 }
diff --git a/internal/cmd/integration-tests/utils.go b/internal/cmd/integration-tests/utils.go
index acadf61261..37ef8d731a 100644
--- a/internal/cmd/integration-tests/utils.go
+++ b/internal/cmd/integration-tests/utils.go
@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"time"
 )
 
 const (
@@ -39,6 +40,8 @@ func buildAlloy() {
 
 func setupEnvironment() {
 	executeCommand("docker-compose", []string{"up", "-d"}, "Setting up environment with Docker Compose")
+	fmt.Println("Sleep for 30 seconds to ensure that the env has time to initialize...")
+	time.Sleep(30 * time.Second)
 }
 
 func runSingleTest(testDir string, port int) {
diff --git a/internal/component/beyla/ebpf/beyla_linux.go b/internal/component/beyla/ebpf/beyla_linux.go
index 5a041d0fc6..ede212c04b 100644
--- a/internal/component/beyla/ebpf/beyla_linux.go
+++ b/internal/component/beyla/ebpf/beyla_linux.go
@@ -62,11 +62,11 @@ func (args Routes) Convert() *transform.RoutesConfig {
 }
 
 func (args Attributes) Convert() beyla.Attributes {
-	return beyla.Attributes{
-		Kubernetes: transform.KubernetesDecorator{
-			Enable: transform.KubeEnableFlag(args.Kubernetes.Enable),
-		},
+	attrs := beyla.DefaultConfig.Attributes
+	if args.Kubernetes.Enable != "" {
+		attrs.Kubernetes.Enable = transform.KubeEnableFlag(args.Kubernetes.Enable)
 	}
+	return attrs
 }
 
 func (args Discovery) Convert() (services.DiscoveryConfig, error) {
diff --git a/internal/component/beyla/ebpf/beyla_linux_test.go b/internal/component/beyla/ebpf/beyla_linux_test.go
index a644c8dd06..ad1b6c30c8 100644
--- a/internal/component/beyla/ebpf/beyla_linux_test.go
+++ b/internal/component/beyla/ebpf/beyla_linux_test.go
@@ -5,6 +5,7 @@ package beyla
 import (
 	"errors"
 	"testing"
+	"time"
 
 	"github.com/grafana/alloy/syntax"
 	"github.com/grafana/beyla/pkg/beyla"
@@ -58,6 +59,24 @@ func TestArguments_UnmarshalSyntax(t *testing.T) {
 	require.Equal(t, "default", cfg.Discovery.Services[0].Namespace)
 }
 
+func TestArguments_ConvertDefaultConfig(t *testing.T) {
+	args := Arguments{}
+	cfg, err := args.Convert()
+	require.NoError(t, err)
+	require.Equal(t, cfg.ChannelBufferLen, beyla.DefaultConfig.ChannelBufferLen)
+	require.Equal(t, cfg.LogLevel, beyla.DefaultConfig.LogLevel)
+	require.Equal(t, cfg.EBPF, beyla.DefaultConfig.EBPF)
+	require.Equal(t, cfg.NetworkFlows, beyla.DefaultConfig.NetworkFlows)
+	require.Equal(t, cfg.Grafana, beyla.DefaultConfig.Grafana)
+	require.Equal(t, cfg.Attributes, beyla.DefaultConfig.Attributes)
+	require.Equal(t, cfg.Routes, beyla.DefaultConfig.Routes)
+	require.Equal(t, cfg.Metrics, beyla.DefaultConfig.Metrics)
+	require.Equal(t, cfg.Traces, beyla.DefaultConfig.Traces)
+	require.Equal(t, cfg.Prometheus, beyla.DefaultConfig.Prometheus)
+	require.Equal(t, cfg.InternalMetrics, beyla.DefaultConfig.InternalMetrics)
+	require.Equal(t, cfg.NetworkFlows, beyla.DefaultConfig.NetworkFlows)
+}
+
 func TestArguments_UnmarshalInvalidSyntax(t *testing.T) {
 	var tests = []struct {
 		testname      string
@@ -117,8 +136,10 @@ func TestConvert_Attribute(t *testing.T) {
 	}
 
 	expectedConfig := beyla.Attributes{
+		InstanceID: beyla.DefaultConfig.Attributes.InstanceID,
 		Kubernetes: transform.KubernetesDecorator{
-			Enable: transform.KubeEnableFlag(args.Kubernetes.Enable),
+			Enable:               transform.KubeEnableFlag(args.Kubernetes.Enable),
+			InformersSyncTimeout: 30 * time.Second,
 		},
 	}
 
diff --git a/internal/component/prometheus/exporter/kafka/kafka.go b/internal/component/prometheus/exporter/kafka/kafka.go
index 94ba4acfe8..26e64a7421 100644
--- a/internal/component/prometheus/exporter/kafka/kafka.go
+++ b/internal/component/prometheus/exporter/kafka/kafka.go
@@ -21,8 +21,12 @@ var DefaultArguments = Arguments{
 	AllowConcurrent:         true,
 	MaxOffsets:              1000,
 	PruneIntervalSeconds:    30,
+	OffsetShowAll:           true,
+	TopicWorkers:            100,
 	TopicsFilter:            ".*",
+	TopicsExclude:           "^$",
 	GroupFilter:             ".*",
+	GroupExclude:            "^$",
 }
 
 type Arguments struct {
@@ -33,7 +37,9 @@ type Arguments struct {
 	SASLUsername            string            `alloy:"sasl_username,attr,optional"`
 	SASLPassword            alloytypes.Secret `alloy:"sasl_password,attr,optional"`
 	SASLMechanism           string            `alloy:"sasl_mechanism,attr,optional"`
+	SASLDisablePAFXFast     bool              `alloy:"sasl_disable_pafx_fast,attr,optional"`
 	UseTLS                  bool              `alloy:"use_tls,attr,optional"`
+	TlsServerName           string            `alloy:"tls_server_name,attr,optional"`
 	CAFile                  string            `alloy:"ca_file,attr,optional"`
 	CertFile                string            `alloy:"cert_file,attr,optional"`
 	KeyFile                 string            `alloy:"key_file,attr,optional"`
@@ -43,11 +49,21 @@ type Arguments struct {
 	ZookeeperURIs           []string          `alloy:"zookeeper_uris,attr,optional"`
 	ClusterName             string            `alloy:"kafka_cluster_name,attr,optional"`
 	MetadataRefreshInterval string            `alloy:"metadata_refresh_interval,attr,optional"`
+	ServiceName             string            `alloy:"gssapi_service_name,attr,optional"`
+	KerberosConfigPath      string            `alloy:"gssapi_kerberos_config_path,attr,optional"`
+	Realm                   string            `alloy:"gssapi_realm,attr,optional"`
+	KeyTabPath              string            `alloy:"gssapi_key_tab_path,attr,optional"`
+	KerberosAuthType        string            `alloy:"gssapi_kerberos_auth_type,attr,optional"`
+	OffsetShowAll           bool              `alloy:"offset_show_all,attr,optional"`
+	TopicWorkers            int               `alloy:"topic_workers,attr,optional"`
 	AllowConcurrent         bool              `alloy:"allow_concurrency,attr,optional"`
+	AllowAutoTopicCreation  bool              `alloy:"allow_auto_topic_creation,attr,optional"`
 	MaxOffsets              int               `alloy:"max_offsets,attr,optional"`
-	PruneIntervalSeconds    int               `alloy:"prune_interval_seconds,attr,optional"`
+	PruneIntervalSeconds    int               `alloy:"prune_interval_seconds,attr,optional"` // deprecated - no-op
 	TopicsFilter            string            `alloy:"topics_filter_regex,attr,optional"`
+	TopicsExclude           string            `alloy:"topics_exclude_regex,attr,optional"`
 	GroupFilter             string            `alloy:"groups_filter_regex,attr,optional"`
+	GroupExclude            string            `alloy:"groups_exclude_regex,attr,optional"`
 }
 
 func init() {
@@ -99,7 +115,9 @@ func (a *Arguments) Convert() *kafka_exporter.Config {
 		SASLUsername:            a.SASLUsername,
 		SASLPassword:            config.Secret(a.SASLPassword),
 		SASLMechanism:           a.SASLMechanism,
+		SASLDisablePAFXFast:     a.SASLDisablePAFXFast,
 		UseTLS:                  a.UseTLS,
+		TlsServerName:           a.TlsServerName,
 		CAFile:                  a.CAFile,
 		CertFile:                a.CertFile,
 		KeyFile:                 a.KeyFile,
@@ -109,10 +127,20 @@ func (a *Arguments) Convert() *kafka_exporter.Config {
 		ZookeeperURIs:           a.ZookeeperURIs,
 		ClusterName:             a.ClusterName,
 		MetadataRefreshInterval: a.MetadataRefreshInterval,
+		ServiceName:             a.ServiceName,
+		KerberosConfigPath:      a.KerberosConfigPath,
+		Realm:                   a.Realm,
+		KeyTabPath:              a.KeyTabPath,
+		KerberosAuthType:        a.KerberosAuthType,
+		OffsetShowAll:           a.OffsetShowAll,
+		TopicWorkers:            a.TopicWorkers,
 		AllowConcurrent:         a.AllowConcurrent,
+		AllowAutoTopicCreation:  a.AllowAutoTopicCreation,
 		MaxOffsets:              a.MaxOffsets,
 		PruneIntervalSeconds:    a.PruneIntervalSeconds,
 		TopicsFilter:            a.TopicsFilter,
+		TopicsExclude:           a.TopicsExclude,
 		GroupFilter:             a.GroupFilter,
+		GroupExclude:            a.GroupExclude,
 	}
 }
diff --git a/internal/component/prometheus/exporter/kafka/kafka_test.go b/internal/component/prometheus/exporter/kafka/kafka_test.go
index f5a29e72e8..58f165402f 100644
--- a/internal/component/prometheus/exporter/kafka/kafka_test.go
+++ b/internal/component/prometheus/exporter/kafka/kafka_test.go
@@ -18,7 +18,6 @@ func TestAlloyUnmarshal(t *testing.T) {
 		metadata_refresh_interval = "1m"
 		allow_concurrency = true
 		max_offsets = 1000
-		prune_interval_seconds = 30
 		topics_filter_regex = ".*"
 		groups_filter_regex = ".*"
 	`
@@ -35,8 +34,12 @@ func TestAlloyUnmarshal(t *testing.T) {
 		AllowConcurrent:         true,
 		MaxOffsets:              1000,
 		PruneIntervalSeconds:    30,
+		OffsetShowAll:           true,
+		TopicWorkers:            100,
 		TopicsFilter:            ".*",
 		GroupFilter:             ".*",
+		TopicsExclude:           "^$",
+		GroupExclude:            "^$",
 	}
 	require.Equal(t, expected, args)
 }
@@ -50,7 +53,6 @@ func TestUnmarshalInvalid(t *testing.T) {
 		metadata_refresh_interval = "1m"
 		allow_concurrency = true
 		max_offsets = 1000
-		prune_interval_seconds = 30
 		topics_filter_regex = ".*"
 		groups_filter_regex = ".*"
 `
@@ -77,9 +79,13 @@ func TestAlloyConvert(t *testing.T) {
 		MetadataRefreshInterval: "1m",
 		AllowConcurrent:         true,
 		MaxOffsets:              1000,
+		OffsetShowAll:           true,
+		TopicWorkers:            100,
 		PruneIntervalSeconds:    30,
 		TopicsFilter:            ".*",
 		GroupFilter:             ".*",
+		TopicsExclude:           "^$",
+		GroupExclude:            "^$",
 	}
 	converted := orig.Convert()
 	expected := kafka_exporter.Config{
@@ -89,9 +95,13 @@ func TestAlloyConvert(t *testing.T) {
 		MetadataRefreshInterval: "1m",
 		AllowConcurrent:         true,
 		MaxOffsets:              1000,
+		OffsetShowAll:           true,
+		TopicWorkers:            100,
 		PruneIntervalSeconds:    30,
 		TopicsFilter:            ".*",
 		GroupFilter:             ".*",
+		TopicsExclude:           "^$",
+		GroupExclude:            "^$",
 	}
 
 	require.Equal(t, expected, *converted)
diff --git a/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go b/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go
index 89e0cf572a..27ca9de9b6 100644
--- a/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go
+++ b/internal/converter/internal/staticconvert/internal/build/kafka_exporter.go
@@ -14,13 +14,16 @@ func (b *ConfigBuilder) appendKafkaExporter(config *kafka_exporter.Config, insta
 
 func toKafkaExporter(config *kafka_exporter.Config) *kafka.Arguments {
 	return &kafka.Arguments{
+		Instance:                config.Instance,
 		KafkaURIs:               config.KafkaURIs,
 		UseSASL:                 config.UseSASL,
 		UseSASLHandshake:        config.UseSASLHandshake,
 		SASLUsername:            config.SASLUsername,
 		SASLPassword:            alloytypes.Secret(config.SASLPassword),
 		SASLMechanism:           config.SASLMechanism,
+		SASLDisablePAFXFast:     config.SASLDisablePAFXFast,
 		UseTLS:                  config.UseTLS,
+		TlsServerName:           config.TlsServerName,
 		CAFile:                  config.CAFile,
 		CertFile:                config.CertFile,
 		KeyFile:                 config.KeyFile,
@@ -30,10 +33,20 @@ func toKafkaExporter(config *kafka_exporter.Config) *kafka.Arguments {
 		ZookeeperURIs:           config.ZookeeperURIs,
 		ClusterName:             config.ClusterName,
 		MetadataRefreshInterval: config.MetadataRefreshInterval,
+		ServiceName:             config.ServiceName,
+		KerberosConfigPath:      config.KerberosConfigPath,
+		Realm:                   config.Realm,
+		KeyTabPath:              config.KeyTabPath,
+		KerberosAuthType:        config.KerberosAuthType,
+		OffsetShowAll:           config.OffsetShowAll,
+		TopicWorkers:            config.TopicWorkers,
 		AllowConcurrent:         config.AllowConcurrent,
+		AllowAutoTopicCreation:  config.AllowAutoTopicCreation,
 		MaxOffsets:              config.MaxOffsets,
 		PruneIntervalSeconds:    config.PruneIntervalSeconds,
 		TopicsFilter:            config.TopicsFilter,
+		TopicsExclude:           config.TopicsExclude,
 		GroupFilter:             config.GroupFilter,
+		GroupExclude:            config.GroupExclude,
 	}
 }
diff --git a/internal/static/integrations/kafka_exporter/kafka_exporter.go b/internal/static/integrations/kafka_exporter/kafka_exporter.go
index c864212614..b81f289a01 100644
--- a/internal/static/integrations/kafka_exporter/kafka_exporter.go
+++ b/internal/static/integrations/kafka_exporter/kafka_exporter.go
@@ -6,11 +6,12 @@ import (
 	config_util "github.com/prometheus/common/config"
 
 	"github.com/IBM/sarama"
-	kafka_exporter "github.com/davidmparrott/kafka_exporter/v2/exporter"
 	"github.com/go-kit/log"
+	"github.com/grafana/alloy/internal/alloy/logging/level"
 	"github.com/grafana/alloy/internal/static/integrations"
 	integrations_v2 "github.com/grafana/alloy/internal/static/integrations/v2"
 	"github.com/grafana/alloy/internal/static/integrations/v2/metricsutils"
+	kafka_exporter "github.com/grafana/kafka_exporter/exporter"
 )
 
 // DefaultConfig holds the default settings for the kafka_lag_exporter
@@ -22,8 +23,12 @@ var DefaultConfig = Config{
 	AllowConcurrent:         true,
 	MaxOffsets:              1000,
 	PruneIntervalSeconds:    30,
+	OffsetShowAll:           true,
+	TopicWorkers:            100,
 	TopicsFilter:            ".*",
+	TopicsExclude:           "^$",
 	GroupFilter:             ".*",
+	GroupExclude:            "^$",
 }
 
 // Config controls kafka_exporter
@@ -49,9 +54,15 @@ type Config struct {
 	// The SASL SCRAM SHA algorithm sha256 or sha512 as mechanism
 	SASLMechanism string `yaml:"sasl_mechanism,omitempty"`
 
+	// Configure the Kerberos client to not use PA_FX_FAST.
+	SASLDisablePAFXFast bool `yaml:"sasl_disable_pafx_fast,omitempty"`
+
 	// Connect using TLS
 	UseTLS bool `yaml:"use_tls,omitempty"`
 
+	// Used to verify the hostname on the returned certificates unless tls.insecure-skip-tls-verify is given. The kafka server's name should be given.
+	TlsServerName string `yaml:"tls_server_name,omitempty"`
+
 	// The optional certificate authority file for TLS client authentication
 	CAFile string `yaml:"ca_file,omitempty"`
 
@@ -79,20 +90,50 @@ type Config struct {
 	// Metadata refresh interval
 	MetadataRefreshInterval string `yaml:"metadata_refresh_interval,omitempty"`
 
+	// Service name when using kerberos Auth.
+	ServiceName string `yaml:"gssapi_service_name,omitempty"`
+
+	// Kerberos config path.
+	KerberosConfigPath string `yaml:"gssapi_kerberos_config_path,omitempty"`
+
+	// Kerberos realm.
+	Realm string `yaml:"gssapi_realm,omitempty"`
+
+	// Kerberos keytab file path.
+	KeyTabPath string `yaml:"gssapi_key_tab_path,omitempty"`
+
+	// Kerberos auth type. Either 'keytabAuth' or 'userAuth'.
+	KerberosAuthType string `yaml:"gssapi_kerberos_auth_type,omitempty"`
+
+	// Whether show the offset/lag for all consumer group, otherwise, only show connected consumer groups.
+	OffsetShowAll bool `yaml:"offset_show_all,omitempty"`
+
+	// Number of topic workers.
+	TopicWorkers int `yaml:"topic_workers,omitempty"`
+
 	// If true, all scrapes will trigger kafka operations otherwise, they will share results. WARN: This should be disabled on large clusters
 	AllowConcurrent bool `yaml:"allow_concurrency,omitempty"`
 
+	// If true, the broker may auto-create topics that we requested which do not already exist.
+	AllowAutoTopicCreation bool `yaml:"allow_auto_topic_creation,omitempty"`
+
 	// Maximum number of offsets to store in the interpolation table for a partition
 	MaxOffsets int `yaml:"max_offsets,omitempty"`
 
-	// How frequently should the interpolation table be pruned, in seconds
+	// No-op (deprecated). Use metadata_refresh_interval instead.
 	PruneIntervalSeconds int `yaml:"prune_interval_seconds,omitempty"`
 
 	// Regex filter for topics to be monitored
 	TopicsFilter string `yaml:"topics_filter_regex,omitempty"`
 
+	// Regex that determines which topics to exclude.
+	TopicsExclude string `yaml:"topics_exclude_regex,omitempty"`
+
 	// Regex filter for consumer groups to be monitored
 	GroupFilter string `yaml:"groups_filter_regex,omitempty"`
+
+	// Regex that determines which consumer groups to exclude.
+	GroupExclude string `yaml:"groups_exclude_regex,omitempty"`
 }
 
 // UnmarshalYAML implements yaml.Unmarshaler for Config
@@ -147,6 +188,11 @@ func New(logger log.Logger, c *Config) (integrations.Integration, error) {
 		return nil, fmt.Errorf("zookeeper lag is enabled but no zookeeper uri was provided")
 	}
 
+	// 30 is the default value
+	if c.PruneIntervalSeconds != 30 {
+		level.Warn(logger).Log("msg", "prune_interval_seconds is not used anymore, use metadata_refresh_interval instead")
+	}
+
 	options := kafka_exporter.Options{
 		Uri:                      c.KafkaURIs,
 		UseSASL:                  c.UseSASL,
@@ -154,7 +200,9 @@ func New(logger log.Logger, c *Config) (integrations.Integration, error) {
 		SaslUsername:             c.SASLUsername,
 		SaslPassword:             string(c.SASLPassword),
 		SaslMechanism:            c.SASLMechanism,
+		SaslDisablePAFXFast:      c.SASLDisablePAFXFast,
 		UseTLS:                   c.UseTLS,
+		TlsServerName:            c.TlsServerName,
 		TlsCAFile:                c.CAFile,
 		TlsCertFile:              c.CertFile,
 		TlsKeyFile:               c.KeyFile,
@@ -164,12 +212,19 @@ func New(logger log.Logger, c *Config) (integrations.Integration, error) {
 		UriZookeeper:             c.ZookeeperURIs,
 		Labels:                   c.ClusterName,
 		MetadataRefreshInterval:  c.MetadataRefreshInterval,
+		ServiceName:              c.ServiceName,
+		KerberosConfigPath:       c.KerberosConfigPath,
+		Realm:                    c.Realm,
+		KeyTabPath:               c.KeyTabPath,
+		KerberosAuthType:         c.KerberosAuthType,
+		OffsetShowAll:            c.OffsetShowAll,
+		TopicWorkers:             c.TopicWorkers,
 		AllowConcurrent:          c.AllowConcurrent,
+		AllowAutoTopicCreation:   c.AllowAutoTopicCreation,
 		MaxOffsets:               c.MaxOffsets,
-		PruneIntervalSeconds:     c.PruneIntervalSeconds,
 	}
 
-	newExporter, err := kafka_exporter.New(logger, options, c.TopicsFilter, c.GroupFilter)
+	newExporter, err := kafka_exporter.New(logger, options, c.TopicsFilter, c.TopicsExclude, c.GroupFilter, c.GroupExclude)
 	if err != nil {
 		return nil, fmt.Errorf("could not instantiate kafka lag exporter: %w", err)
 	}
diff --git a/internal/web/ui/yarn.lock b/internal/web/ui/yarn.lock
index e490feb4ec..c801c97df3 100644
--- a/internal/web/ui/yarn.lock
+++ b/internal/web/ui/yarn.lock
@@ -3095,13 +3095,13 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -3109,7 +3109,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -3474,7 +3474,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4:
+content-type@~1.0.4, content-type@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -3489,10 +3489,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
-  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
 
 core-js-compat@^3.25.1:
   version "3.30.2"
@@ -4818,16 +4818,16 @@ expect@^27.5.1:
     jest-message-util "^27.5.1"
 
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -7999,10 +7999,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
-  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"
@@ -9435,9 +9435,9 @@ webidl-conversions@^6.1.0:
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"
diff --git a/operations/helm/charts/alloy/CHANGELOG.md b/operations/helm/charts/alloy/CHANGELOG.md
index 20968bee90..884bfda2e0 100644
--- a/operations/helm/charts/alloy/CHANGELOG.md
+++ b/operations/helm/charts/alloy/CHANGELOG.md
@@ -7,6 +7,13 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+0.1.1 (2024-04-11)
+------------------
+
+### Other changes
+
+- Add missing Alloy icon to Chart.yaml. (@rfratto)
+
 0.1.0 (2024-04-09)
 ------------------
 
diff --git a/operations/helm/charts/alloy/Chart.yaml b/operations/helm/charts/alloy/Chart.yaml
index d24a9248c1..5026dbf4d5 100644
--- a/operations/helm/charts/alloy/Chart.yaml
+++ b/operations/helm/charts/alloy/Chart.yaml
@@ -2,8 +2,9 @@ apiVersion: v2
 name: alloy
 description: 'Grafana Alloy'
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: 'v1.0.0'
+icon: https://raw.githubusercontent.com/grafana/alloy/main/docs/sources/assets/alloy_icon_orange.svg
 
 dependencies:
   - name: crds
diff --git a/operations/helm/charts/alloy/README.md b/operations/helm/charts/alloy/README.md
index a60f277cb3..9a67fadf52 100644
--- a/operations/helm/charts/alloy/README.md
+++ b/operations/helm/charts/alloy/README.md
@@ -1,6 +1,6 @@
 # Grafana Alloy Helm chart
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Helm chart for deploying [Grafana Alloy][] to Kubernetes.