diff --git a/docs/sources/reference/components/discovery/discovery.openstack.md b/docs/sources/reference/components/discovery/discovery.openstack.md
index ccf5711b14..e656591a99 100644
--- a/docs/sources/reference/components/discovery/discovery.openstack.md
+++ b/docs/sources/reference/components/discovery/discovery.openstack.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.openstack/ # /docs/alloy/latest/reference/components/discovery.openstack/
 description: Learn about discovery.openstack
+labels:
+  stage: general-availability
 title: discovery.openstack
 ---
 
@@ -15,62 +17,63 @@ title: discovery.openstack
 ## Usage
 
 ```alloy
-discovery.openstack "LABEL" {
-  role   = "hypervisor"
-  region = "us-east-1"
+discovery.openstack "<LABEL>" {
+  role   = "<OPENSTACK_ROLE>"
+  region = "<OPENSTACK_REGION>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
-
-Name                            | Type       | Description                                                                                          | Default  | Required
---------------------------------|------------|------------------------------------------------------------------------------------------------------|----------|---------
-`role`                          | `string`   | Role of the discovered targets.                                                                      |          | yes
-`region`                        | `string`   | OpenStack region.                                                                                    |          | yes
-`identity_endpoint`             | `string`   | Specifies the HTTP endpoint that is required to work with te Identity API of the appropriate version |          | no
-`username`                      | `string`   | OpenStack username for the Identity V2 and V3 APIs.                                                  |          | no
-`userid`                        | `string`   | OpenStack userid for the Identity V2 and V3 APIs.                                                    |          | no
-`password`                      | `secret`   | Password for the Identity V2 and V3 APIs.                                                            |          | no
-`domain_name`                   | `string`   | OpenStack domain name for the Identity V2 and V3 APIs.                                               |          | no
-`domain_id`                     | `string`   | OpenStack domain ID for the Identity V2 and V3 APIs.                                                 |          | no
-`project_name`                  | `string`   | OpenStack project name for the Identity V2 and V3 APIs.                                              |          | no
-`project_id`                    | `string`   | OpenStack project ID for the Identity V2 and V3 APIs.                                                |          | no
-`application_credential_name`   | `string`   | OpenStack application credential name for the Identity V2 and V3 APIs.                               |          | no
-`application_credential_id`     | `string`   | OpenStack application credential ID for the Identity V2 and V3 APIs.                                 |          | no
-`application_credential_secret` | `secret`   | OpenStack application credential secret for the Identity V2 and V3 APIs.                             |          | no
-`all_tenants`                   | `bool`     | Whether the service discovery should list all instances for all projects.                            | `false`  | no
-`refresh_interval`              | `duration` | Refresh interval to re-read the instance list.                                                       | `60s`    | no
-`port`                          | `int`      | The port to scrape metrics from.                                                                     | `80`     | no
-`availability`                  | `string`   | The availability of the endpoint to connect to.                                                      | `public` | no
+You can use the following arguments with `discovery.openstack`:
+
+Name                            | Type       | Description                                                                                           | Default  | Required
+--------------------------------|------------|-------------------------------------------------------------------------------------------------------|----------|---------
+`region`                        | `string`   | OpenStack region.                                                                                     |          | yes
+`role`                          | `string`   | Role of the discovered targets.                                                                       |          | yes
+`all_tenants`                   | `bool`     | Whether the service discovery should list all instances for all projects.                             | `false`  | no
+`application_credential_id`     | `string`   | OpenStack application credential ID for the Identity V2 and V3 APIs.                                  |          | no
+`application_credential_name`   | `string`   | OpenStack application credential name for the Identity V2 and V3 APIs.                                |          | no
+`application_credential_secret` | `secret`   | OpenStack application credential secret for the Identity V2 and V3 APIs.                              |          | no
+`availability`                  | `string`   | The availability of the endpoint to connect to.                                                       | `public` | no
+`domain_id`                     | `string`   | OpenStack domain ID for the Identity V2 and V3 APIs.                                                  |          | no
+`domain_name`                   | `string`   | OpenStack domain name for the Identity V2 and V3 APIs.                                                |          | no
+`identity_endpoint`             | `string`   | Specifies the HTTP endpoint that is required to work with the Identity API of the appropriate version |          | no
+`password`                      | `secret`   | Password for the Identity V2 and V3 APIs.                                                             |          | no
+`port`                          | `int`      | The port to scrape metrics from.                                                                      | `80`     | no
+`project_id`                    | `string`   | OpenStack project ID for the Identity V2 and V3 APIs.                                                 |          | no
+`project_name`                  | `string`   | OpenStack project name for the Identity V2 and V3 APIs.                                               |          | no
+`refresh_interval`              | `duration` | Refresh interval to re-read the instance list.                                                        | `60s`    | no
+`userid`                        | `string`   | OpenStack user ID for the Identity V2 and V3 APIs.                                                    |          | no
+`username`                      | `string`   | OpenStack username for the Identity V2 and V3 APIs.                                                   |          | no
 
 `role` must be one of `hypervisor` or `instance`.
 
-`username` is required if using Identity V2 API. In Identity V3, either `userid` or a combination of `username` and `domain_id` or `domain_name` are needed.
-
-`project_id` and `project_name` fields are optional for the Identity V2 API.
-Some providers allow you to specify a `project_name` instead of the `project_id`. Some require both.
+`all_tenants` is only relevant for the `instance` role and usually requires administrator permissions.
 
 `application_credential_id` or `application_credential_name` fields are required if using an application credential to authenticate.
 Some providers allow you to create an application credential to authenticate rather than a password.
 
 `application_credential_secret` field is required if using an application credential to authenticate.
 
-`all_tenants` is only relevant for the `instance` role and usually requires admin permissions.
-
 `availability` must be one of `public`, `admin`, or `internal`.
 
+`project_id` and `project_name` fields are optional for the Identity V2 API.
+Some providers allow you to specify a `project_name` instead of the `project_id` and some require both.
+
+`username` is required if using Identity V2 API. In Identity V3, either `userid` or a combination of `username` and `domain_id` or `domain_name` are needed.
+
 ## Blocks
-The following blocks are supported inside the definition of `discovery.openstack`:
 
-Hierarchy  | Block          | Description                                          | Required
------------|----------------|------------------------------------------------------|---------
-tls_config | [tls_config][] | TLS configuration for requests to the OpenStack API. | no
+You can use the following blocks with `discovery.openstack`:
+
+Block          | Description                                          | Required
+---------------|------------------------------------------------------|---------
+[tls_config][] | TLS configuration for requests to the OpenStack API. | no
 
-[tls_config]: #tls_config-block
+[tls_config]: #tls_config
 
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -82,35 +85,34 @@ Name      | Type                | Description
 ----------|---------------------|------------------------------------------------------
 `targets` | `list(map(string))` | The set of targets discovered from the OpenStack API.
 
-#### `hypervisor`
+### hypervisor
 
-The `hypervisor` role discovers one target per Nova hypervisor node. The target
-address defaults to the `host_ip` attribute of the hypervisor.
+The `hypervisor` role discovers one target per Nova hypervisor node.
+The target address defaults to the `host_ip` attribute of the hypervisor.
 
-* `__meta_openstack_hypervisor_host_ip`: the hypervisor node's IP address.
-* `__meta_openstack_hypervisor_hostname`: the hypervisor node's name.
-* `__meta_openstack_hypervisor_id`: the hypervisor node's ID.
-* `__meta_openstack_hypervisor_state`: the hypervisor node's state.
-* `__meta_openstack_hypervisor_status`: the hypervisor node's status.
-* `__meta_openstack_hypervisor_type`: the hypervisor node's type.
+* `__meta_openstack_hypervisor_host_ip`: The hypervisor node's IP address.
+* `__meta_openstack_hypervisor_hostname`: The hypervisor node's name.
+* `__meta_openstack_hypervisor_id`: The hypervisor node's ID.
+* `__meta_openstack_hypervisor_state`: The hypervisor node's state.
+* `__meta_openstack_hypervisor_status`: The hypervisor node's status.
+* `__meta_openstack_hypervisor_type`: The hypervisor node's type.
 
-#### `instance`
+### instance
 
-The `instance` role discovers one target per network interface of Nova
-instance. The target address defaults to the private IP address of the network
-interface.
+The `instance` role discovers one target per network interface of Nova instance.
+The target address defaults to the private IP address of the network interface.
 
-* `__meta_openstack_address_pool`: the pool of the private IP.
-* `__meta_openstack_instance_flavor`: the flavor of the OpenStack instance.
-* `__meta_openstack_instance_id`: the OpenStack instance ID.
-* `__meta_openstack_instance_image`: the ID of the image the OpenStack instance is using.
-* `__meta_openstack_instance_name`: the OpenStack instance name.
-* `__meta_openstack_instance_status`: the status of the OpenStack instance.
-* `__meta_openstack_private_ip`: the private IP of the OpenStack instance.
-* `__meta_openstack_project_id`: the project (tenant) owning this instance.
-* `__meta_openstack_public_ip`: the public IP of the OpenStack instance.
-* `__meta_openstack_tag_<tagkey>`: each tag value of the instance.
-* `__meta_openstack_user_id`: the user account owning the tenant.
+* `__meta_openstack_address_pool`: The pool of the private IP.
+* `__meta_openstack_instance_flavor`: The flavor of the OpenStack instance.
+* `__meta_openstack_instance_id`: The OpenStack instance ID.
+* `__meta_openstack_instance_image`: The ID of the image the OpenStack instance is using.
+* `__meta_openstack_instance_name`: The OpenStack instance name.
+* `__meta_openstack_instance_status`: The status of the OpenStack instance.
+* `__meta_openstack_private_ip`: The private IP of the OpenStack instance.
+* `__meta_openstack_project_id`: The project (tenant) owning this instance.
+* `__meta_openstack_public_ip`: The public IP of the OpenStack instance.
+* `__meta_openstack_tag_<tagkey>`: Each tag value of the instance.
+* `__meta_openstack_user_id`: The user account owning the tenant.
 
 ## Component health
 
@@ -119,18 +121,18 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.openstack` does not expose any component-specific debug information.
+`discovery.openstack` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.openstack` does not expose any component-specific debug metrics.
+`discovery.openstack` doesn't expose any component-specific debug metrics.
 
 ## Example
 
 ```alloy
 discovery.openstack "example" {
-  role   = OPENSTACK_ROLE
-  region = OPENSTACK_REGION
+  role   = "<OPENSTACK_ROLE>"
+  region = "<OPENSTACK_REGION>"
 }
 
 prometheus.scrape "demo" {
@@ -140,21 +142,23 @@ prometheus.scrape "demo" {
 
 prometheus.remote_write "demo" {
   endpoint {
-    url = PROMETHEUS_REMOTE_WRITE_URL
+    url = "<PROMETHEUS_REMOTE_WRITE_URL>"
 
     basic_auth {
-      username = USERNAME
-      password = PASSWORD
+      username = "<USERNAME>"
+      password = "<PASSWORD>"
     }
   }
 }
 ```
+
 Replace the following:
-  - `OPENSTACK_ROLE`: Your OpenStack role.
-  - `OPENSTACK_REGION`: Your OpenStack region.
-  - `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-  - `USERNAME`: The username to use for authentication to the remote_write API.
-  - `PASSWORD`: The password to use for authentication to the remote_write API.
+
+* _`<OPENSTACK_ROLE>`_: Your OpenStack role.
+* _`<OPENSTACK_REGION>`_: Your OpenStack region.
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
diff --git a/docs/sources/reference/components/discovery/discovery.ovhcloud.md b/docs/sources/reference/components/discovery/discovery.ovhcloud.md
index cfae35baee..8467707ea2 100644
--- a/docs/sources/reference/components/discovery/discovery.ovhcloud.md
+++ b/docs/sources/reference/components/discovery/discovery.ovhcloud.md
@@ -3,14 +3,16 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.ovhcloud/ # /docs/alloy/latest/reference/components/discovery.ovhcloud/
 description: Learn about discovery.ovhcloud
+labels:
+  stage: general-availability
 title: discovery.ovhcloud
 ---
 
 # discovery.ovhcloud
 
 `discovery.ovhcloud` discovers scrape targets from OVHcloud's [dedicated servers][] and [VPS][] using their [API][].
-{{< param "PRODUCT_NAME" >}} will periodically check the REST endpoint and create a target for every discovered server.
-The public IPv4 address will be used by default - if there's none, the IPv6 address will be used.
+{{< param "PRODUCT_NAME" >}} periodically checks the REST endpoint and create a target for every discovered server.
+The public IPv4 address is used by default. If there's no IPv4 address, the IPv6 address is used.
 This may be changed via relabeling with `discovery.relabel`.
 For OVHcloud's [public cloud][] instances you can use `discovery.openstack`.
 
@@ -22,33 +24,37 @@ For OVHcloud's [public cloud][] instances you can use `discovery.openstack`.
 ## Usage
 
 ```alloy
-discovery.ovhcloud "LABEL" {
-    application_key    = APPLICATION_KEY
-    application_secret = APPLICATION_SECRET
-    consumer_key       = CONSUMER_KEY
-    service            = SERVICE
+discovery.ovhcloud "<LABEL>" {
+    application_key    = "<APPLICATION_KEY>"
+    application_secret = "<APPLICATION_SECRET>"
+    consumer_key       = "<CONSUMER_KEY>"
+    service            = "<SERVICE>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.ovhcloud`:
 
-Name               | Type           | Description                                                    | Default       | Required
------------------- | -------------- | -------------------------------------------------------------- | ------------- | --------
-application_key    | `string`       | [API][] application key.                                       |               | yes
-application_secret | `secret`       | [API][] application secret.                                    |               | yes
-consumer_key       | `secret`       | [API][] consumer key.                                          |               | yes
-endpoint           | `string`       | [API][] endpoint.                                              | "ovh-eu"      | no
-refresh_interval   | `duration`     | Refresh interval to re-read the resources list.                | "60s"         | no
-service            | `string`       | Service of the targets to retrieve.                            |               | yes
-
-`endpoint` must be one of the [supported API endpoints][supported-apis].
+Name                 | Type       | Description                                     | Default  | Required
+---------------------|------------|-------------------------------------------------|----------|---------
+`application_key`    | `string`   | [API][] application key.                        |          | yes
+`application_secret` | `secret`   | [API][] application secret.                     |          | yes
+`consumer_key`       | `secret`   | [API][] consumer key.                           |          | yes
+`service`            | `string`   | Service of the targets to retrieve.             |          | yes
+`endpoint`           | `string`   | [API][] endpoint.                               | "ovh-eu" | no
+`refresh_interval`   | `duration` | Refresh interval to re-read the resources list. | "60s"    | no
 
 `service` must be either `vps` or `dedicated_server`.
 
+`endpoint` must be one of the [supported API endpoints][supported-apis].
+
 [supported-apis]: https://github.com/ovh/go-ovh#supported-apis
 
+## Blocks
+
+The `discovery.ovhcloud` component doesn't support any blocks. You can configure this component with arguments.
+
 ## Exported fields
 
 The following fields are exported and can be referenced by other components:
@@ -60,39 +66,41 @@ Name      | Type                | Description
 Multiple meta labels are available on `targets` and can be used by the `discovery.relabel` component.
 
 [VPS][] meta labels:
-* `__meta_ovhcloud_vps_cluster`: the cluster of the server.
-* `__meta_ovhcloud_vps_datacenter`: the datacenter of the server.
-* `__meta_ovhcloud_vps_disk`: the disk of the server.
-* `__meta_ovhcloud_vps_display_name`: the display name of the server.
-* `__meta_ovhcloud_vps_ipv4`: the IPv4 of the server.
-* `__meta_ovhcloud_vps_ipv6`: the IPv6 of the server.
-* `__meta_ovhcloud_vps_keymap`: the KVM keyboard layout of the server.
-* `__meta_ovhcloud_vps_maximum_additional_ip`: the maximum additional IPs of the server.
-* `__meta_ovhcloud_vps_memory_limit`: the memory limit of the server.
-* `__meta_ovhcloud_vps_memory`: the memory of the server.
-* `__meta_ovhcloud_vps_monitoring_ip_blocks`: the monitoring IP blocks of the server.
-* `__meta_ovhcloud_vps_name`: the name of the server.
-* `__meta_ovhcloud_vps_netboot_mode`: the netboot mode of the server.
-* `__meta_ovhcloud_vps_offer_type`: the offer type of the server.
-* `__meta_ovhcloud_vps_offer`: the offer of the server.
-* `__meta_ovhcloud_vps_state`: the state of the server.
-* `__meta_ovhcloud_vps_vcore`: the number of virtual cores of the server.
-* `__meta_ovhcloud_vps_version`: the version of the server.
-* `__meta_ovhcloud_vps_zone`: the zone of the server.
+
+* `__meta_ovhcloud_vps_cluster`: The cluster of the server.
+* `__meta_ovhcloud_vps_datacenter`: The data center of the server.
+* `__meta_ovhcloud_vps_disk`: The disk of the server.
+* `__meta_ovhcloud_vps_display_name`: The display name of the server.
+* `__meta_ovhcloud_vps_ipv4`: The IPv4 of the server.
+* `__meta_ovhcloud_vps_ipv6`: The IPv6 of the server.
+* `__meta_ovhcloud_vps_keymap`: The KVM keyboard layout of the server.
+* `__meta_ovhcloud_vps_maximum_additional_ip`: The maximum additional IPs of the server.
+* `__meta_ovhcloud_vps_memory_limit`: The memory limit of the server.
+* `__meta_ovhcloud_vps_memory`: The memory of the server.
+* `__meta_ovhcloud_vps_monitoring_ip_blocks`: The monitoring IP blocks of the server.
+* `__meta_ovhcloud_vps_name`: The name of the server.
+* `__meta_ovhcloud_vps_netboot_mode`: The netboot mode of the server.
+* `__meta_ovhcloud_vps_offer_type`: The offer type of the server.
+* `__meta_ovhcloud_vps_offer`: The offer of the server.
+* `__meta_ovhcloud_vps_state`: The state of the server.
+* `__meta_ovhcloud_vps_vcore`: The number of virtual cores of the server.
+* `__meta_ovhcloud_vps_version`: The version of the server.
+* `__meta_ovhcloud_vps_zone`: The zone of the server.
 
 [Dedicated servers][] meta labels:
-* `__meta_ovhcloud_dedicated_server_commercial_range`: the commercial range of the server.
-* `__meta_ovhcloud_dedicated_server_datacenter`: the datacenter of the server.
-* `__meta_ovhcloud_dedicated_server_ipv4`: the IPv4 of the server.
-* `__meta_ovhcloud_dedicated_server_ipv6`: the IPv6 of the server.
-* `__meta_ovhcloud_dedicated_server_link_speed`: the link speed of the server.
-* `__meta_ovhcloud_dedicated_server_name`: the name of the server.
-* `__meta_ovhcloud_dedicated_server_os`: the operating system of the server.
-* `__meta_ovhcloud_dedicated_server_rack`: the rack of the server.
-* `__meta_ovhcloud_dedicated_server_reverse`: the reverse DNS name of the server.
-* `__meta_ovhcloud_dedicated_server_server_id`: the ID of the server.
-* `__meta_ovhcloud_dedicated_server_state`: the state of the server.
-* `__meta_ovhcloud_dedicated_server_support_level`: the support level of the server.
+
+* `__meta_ovhcloud_dedicated_server_commercial_range`: The commercial range of the server.
+* `__meta_ovhcloud_dedicated_server_datacenter`: The datacenter of the server.
+* `__meta_ovhcloud_dedicated_server_ipv4`: The IPv4 of the server.
+* `__meta_ovhcloud_dedicated_server_ipv6`: The IPv6 of the server.
+* `__meta_ovhcloud_dedicated_server_link_speed`: The link speed of the server.
+* `__meta_ovhcloud_dedicated_server_name`: The name of the server.
+* `__meta_ovhcloud_dedicated_server_os`: The operating system of the server.
+* `__meta_ovhcloud_dedicated_server_rack`: The rack of the server.
+* `__meta_ovhcloud_dedicated_server_reverse`: The reverse DNS name of the server.
+* `__meta_ovhcloud_dedicated_server_server_id`: The ID of the server.
+* `__meta_ovhcloud_dedicated_server_state`: The state of the server.
+* `__meta_ovhcloud_dedicated_server_support_level`: The support level of the server.
 
 ## Component health
 
@@ -101,47 +109,47 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.ovhcloud` does not expose any component-specific debug information.
+`discovery.ovhcloud` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.ovhcloud` does not expose any component-specific debug metrics.
+`discovery.ovhcloud` doesn't expose any component-specific debug metrics.
 
 ## Example
 
 ```alloy
 discovery.ovhcloud "example" {
-	application_key    = APPLICATION_KEY
-	application_secret = APPLICATION_SECRET
-	consumer_key       = CONSUMER_KEY
-	service            = SERVICE
+    application_key    = "<APPLICATION_KEY>"
+    application_secret = "<APPLICATION_SECRET>"
+    consumer_key       = "<CONSUMER_KEY>"
+    service            = "<SERVICE>"
 }
 
 prometheus.scrape "demo" {
-	targets    = discovery.ovhcloud.example.targets
-	forward_to = [prometheus.remote_write.demo.receiver]
+    targets    = discovery.ovhcloud.example.targets
+    forward_to = [prometheus.remote_write.demo.receiver]
 }
 
 prometheus.remote_write "demo" {
-	endpoint {
-		url = PROMETHEUS_REMOTE_WRITE_URL
-		basic_auth {
-			username = USERNAME
-			password = PASSWORD
-		}
-	}
+    endpoint {
+        url = "<PROMETHEUS_REMOTE_WRITE_URL>"
+        basic_auth {
+            username = "<USERNAME>"
+            password = "<PASSWORD>"
+        }
+    }
 }
 ```
 
 Replace the following:
-  - `APPLICATION_KEY`: The OVHcloud [API][] application key.
-  - `APPLICATION_SECRET`: The OVHcloud [API][] application secret.
-  - `CONSUMER_KEY`: The OVHcloud [API][] consumer key.
-  - `SERVICE`: The OVHcloud service of the targets to retrieve.
-  - `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-  - `USERNAME`: The username to use for authentication to the remote_write API.
-  - `PASSWORD`: The password to use for authentication to the remote_write API.
 
+* _`<APPLICATION_KEY>`_: The OVHcloud [API][] application key.
+* _`<APPLICATION_SECRET>`_: The OVHcloud [API][] application secret.
+* _`<CONSUMER_KEY>`_: The OVHcloud [API][] consumer key.
+* _`<SERVICE>`_: The OVHcloud service of the targets to retrieve.
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
diff --git a/docs/sources/reference/components/discovery/discovery.process.md b/docs/sources/reference/components/discovery/discovery.process.md
index 2ab527316e..e1103e88b4 100644
--- a/docs/sources/reference/components/discovery/discovery.process.md
+++ b/docs/sources/reference/components/discovery/discovery.process.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.process/ # /docs/alloy/latest/reference/components/discovery.process/
 description: Learn about discovery.process
+labels:
+  stage: general-availability
 title: discovery.process
 ---
 
@@ -17,23 +19,23 @@ To use the `discovery.process` component you must run {{< param "PRODUCT_NAME" >
 ## Usage
 
 ```alloy
-discovery.process "LABEL" {
+discovery.process "<LABEL>" {
 
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.process`:
 
-| Name               | Type                | Description                                                                              | Default | Required |
-|--------------------|---------------------|------------------------------------------------------------------------------------------|---------|----------|
-| `join`             | `list(map(string))` | Join external targets to discovered processes targets based on `__container_id__` label. |         | no       |
-| `refresh_interval` | `duration`          | How often to sync targets.                                                               | "60s"   | no       |
+Name               | Type                | Description                                                                              | Default | Required
+-------------------|---------------------|------------------------------------------------------------------------------------------|---------|---------
+`join`             | `list(map(string))` | Join external targets to discovered processes targets based on `__container_id__` label. |         | no
+`refresh_interval` | `duration`          | How often to sync targets.                                                               | "60s"   | no
 
 ### Targets joining
 
-If `join` is specified, `discovery.process` will join the discovered processes based on the `__container_id__` label.
+If you specify `join`, `discovery.process` joins the discovered processes based on the `__container_id__` label.
 
 For example, if `join` is specified as follows:
 
@@ -89,49 +91,48 @@ The resulting targets are:
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.process`:
+You can use the following blocks with `discovery.process`:
 
-| Hierarchy       | Block               | Description                                    | Required |
-|-----------------|---------------------|------------------------------------------------|----------|
-| discover_config | [discover_config][] | Configures which process metadata to discover. | no       |
+Block               | Description                                    | Required
+--------------------|------------------------------------------------|---------
+[discover_config][] | Configures which process metadata to discover. | no
 
-[discover_config]: #discover_config-block
+[discover_config]: #discover_config
 
-### discover_config block
+### discover_config
 
 The `discover_config` block describes which process metadata to discover.
 
 The following arguments are supported:
 
-| Name           | Type   | Description                                                      | Default | Required |
-|----------------|--------|------------------------------------------------------------------|---------|----------|
-| `exe`          | `bool` | A flag to enable discovering `__meta_process_exe` label.         | true    | no       |
-| `cwd`          | `bool` | A flag to enable discovering `__meta_process_cwd` label.         | true    | no       |
-| `commandline`  | `bool` | A flag to enable discovering `__meta_process_commandline` label. | true    | no       |
-| `uid`          | `bool` | A flag to enable discovering `__meta_process_uid`: label.        | true    | no       |
-| `username`     | `bool` | A flag to enable discovering `__meta_process_username`: label.   | true    | no       |
-| `cgroup_path`  | `bool` | A flag to enable discovering `__meta_cgroup_path__` label.       | false    | no       |
-| `container_id` | `bool` | A flag to enable discovering `__container_id__` label.           | true    | no       |
+Name           | Type   | Description                                                      | Default | Required
+---------------|--------|------------------------------------------------------------------|---------|---------
+`exe`          | `bool` | A flag to enable discovering `__meta_process_exe` label.         | `true`  | no
+`cwd`          | `bool` | A flag to enable discovering `__meta_process_cwd` label.         | `true`  | no
+`commandline`  | `bool` | A flag to enable discovering `__meta_process_commandline` label. | `true`  | no
+`uid`          | `bool` | A flag to enable discovering `__meta_process_uid`: label.        | `true`  | no
+`username`     | `bool` | A flag to enable discovering `__meta_process_username`: label.   | `true`  | no
+`cgroup_path`  | `bool` | A flag to enable discovering `__meta_cgroup_path__` label.       | `false` | no
+`container_id` | `bool` | A flag to enable discovering `__container_id__` label.           | `true`  | no
 
 ## Exported fields
 
 The following fields are exported and can be referenced by other components:
 
-| Name      | Type                | Description                                            |
-|-----------|---------------------|--------------------------------------------------------|
-| `targets` | `list(map(string))` | The set of processes discovered on the local Linux OS. |
+Name      | Type                | Description
+----------|---------------------|-------------------------------------------------------
+`targets` | `list(map(string))` | The set of processes discovered on the local Linux OS.
 
 Each target includes the following labels:
 
-* `__process_pid__`: The process PID.
-* `__meta_process_exe`: The process executable path. Taken from `/proc/<pid>/exe`.
-* `__meta_process_cwd`: The process current working directory. Taken from `/proc/<pid>/cwd`.
+* `__container_id__`: The container ID. Taken from `/proc/<pid>/cgroup`. If the process isn't running in a container, this label isn't set.
+* `__meta_cgroup_path`: The cgroup path under which the process is running. In the case of cgroups v1, this label includes all the controllers paths delimited by `|`.
 * `__meta_process_commandline`: The process command line. Taken from `/proc/<pid>/cmdline`.
+* `__meta_process_cwd`: The process current working directory. Taken from `/proc/<pid>/cwd`.
+* `__meta_process_exe`: The process executable path. Taken from `/proc/<pid>/exe`.
 * `__meta_process_uid`: The process UID. Taken from `/proc/<pid>/status`.
 * `__meta_process_username`: The process username. Taken from `__meta_process_uid` and `os/user/LookupID`.
-* `__meta_cgroup_path`: The cgroup path under which the process is running. In the case of cgroups v1, this label includes all the controllers paths delimited by `|`.
-* `__container_id__`: The container ID. Taken from `/proc/<pid>/cgroup`. If the process is not running in a container, this label is not set.
+* `__process_pid__`: The process PID.
 
 ## Component health
 
@@ -140,11 +141,11 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.process` does not expose any component-specific debug information.
+`discovery.process` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.process` does not expose any component-specific debug metrics.
+`discovery.process` doesn't expose any component-specific debug metrics.
 
 ## Examples
 
@@ -189,6 +190,7 @@ discovery.process "all" {
     container_id = true
   }
 }
+```
 
 ### Example discovering processes on the local host based on `cgroups` path
 
@@ -219,6 +221,7 @@ discovery.relabel "systemd_services" {
 }
 
 ```
+
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
 ## Compatible components
diff --git a/docs/sources/reference/components/discovery/discovery.puppetdb.md b/docs/sources/reference/components/discovery/discovery.puppetdb.md
index 05b00b109d..2d748ad598 100644
--- a/docs/sources/reference/components/discovery/discovery.puppetdb.md
+++ b/docs/sources/reference/components/discovery/discovery.puppetdb.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.puppetdb/ # /docs/alloy/latest/reference/components/discovery.puppetdb/
 description: Learn about discovery.puppetdb
+labels:
+  stage: general-availability
 title: discovery.puppetdb
 ---
 
@@ -10,7 +12,7 @@ title: discovery.puppetdb
 
 `discovery.puppetdb` allows you to retrieve scrape targets from [PuppetDB](https://www.puppet.com/docs/puppetdb/7/overview.html) resources.
 
-This SD discovers resources and will create a target for each resource returned by the API.
+This SD discovers resources and creates a target for each resource returned by the API.
 
 The resource address is the `certname` of the resource, and can be changed during relabeling.
 
@@ -19,37 +21,38 @@ The queries for this component are expected to be valid [PQL (Puppet Query Langu
 ## Usage
 
 ```alloy
-discovery.puppetdb "LABEL" {
-  url = PUPPET_SERVER
+discovery.puppetdb "<LABEL>" {
+  url = "<PUPPET_SERVER>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.puppetdb`:
 
-Name                     | Type                | Description                                                   | Default | Required
------------------------- | ------------------- | ------------------------------------------------------------- | ------- | --------
-`url`                    | `string`            | The URL of the PuppetDB root query endpoint.                  |         | yes
-`query`                  | `string`            | Puppet Query Language (PQL) query. Only resources are supported. |      | yes
+Name                     | Type                | Description                                                                                      | Default | Required
+-------------------------|---------------------|--------------------------------------------------------------------------------------------------|---------|---------
+`query`                  | `string`            | Puppet Query Language (PQL) query. Only resources are supported.                                 |         | yes
+`url`                    | `string`            | The URL of the PuppetDB root query endpoint.                                                     |         | yes
+`bearer_token_file`      | `string`            | File containing a bearer token to authenticate with.                                             |         | no
+`bearer_token`           | `secret`            | Bearer token to authenticate with.                                                               |         | no
+`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`  | no
+`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.                                     | `true`  | no
 `include_parameters`     | `bool`              | Whether to include the parameters as meta labels. Due to the differences between parameter types and Prometheus labels, some parameters might not be rendered. The format of the parameters might also change in future releases. Make sure that you don't have secrets exposed as parameters if you enable this. | `false` | no
-`port`                   | `int`               | The port to scrape metrics from.                              | `80`    | no
-`refresh_interval`       | `duration`          | Frequency to refresh targets.                                 | `"30s"` | no
-`bearer_token_file`      | `string`            | File containing a bearer token to authenticate with.          |         | no
-`bearer_token`           | `secret`            | Bearer token to authenticate with.                            |         | no
-`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                      | `true`  | no
-`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.  | `true`  | no
-`proxy_url`              | `string`            | HTTP proxy to send requests through.                          |         | no
-`no_proxy`               | `string`            | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. | | no
-`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.         | `false` | no
-`proxy_connect_header`   | `map(list(secret))` | Specifies headers to send to proxies during CONNECT requests. |         | no
+`no_proxy`               | `string`            | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |         | no
+`port`                   | `int`               | The port to scrape metrics from.                                                                 | `80`    | no
+`proxy_connect_header`   | `map(list(secret))` | Specifies headers to send to proxies during CONNECT requests.                                    |         | no
+`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.                                            | `false` | no
+`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |         | no
+`refresh_interval`       | `duration`          | Frequency to refresh targets.                                                                    | `"30s"` | no
 
  At most, one of the following can be provided:
- - [`bearer_token` argument](#arguments).
- - [`bearer_token_file` argument](#arguments).
- - [`basic_auth` block][basic_auth].
- - [`authorization` block][authorization].
- - [`oauth2` block][oauth2].
+
+* [`authorization`][authorization] block
+* [`basic_auth`][basic_auth] block
+* [`bearer_token_file`][arguments] argument
+* [`bearer_token`][arguments] argument
+* [`oauth2`][oauth2] block
 
 [arguments]: #arguments
 
@@ -57,38 +60,45 @@ Name                     | Type                | Description
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.puppetdb`:
+You can use the following blocks with `discovery.puppetdb`:
 
-Hierarchy           | Block             | Description                                              | Required
---------------------|-------------------|----------------------------------------------------------|---------
-basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint. | no
-authorization       | [authorization][] | Configure generic authorization to the endpoint.         | no
-oauth2              | [oauth2][]        | Configure OAuth2 for authenticating to the endpoint.     | no
-oauth2 > tls_config | [tls_config][]    | Configure TLS settings for connecting to the endpoint.   | no
-tls_config          | [tls_config][]    | Configure TLS settings for connecting to the endpoint.   | no
+Block                   | Description                                                | Required
+------------------------|------------------------------------------------------------|---------
+[authorization][]       | Configure generic authorization to the endpoint.           | no
+[basic_auth][]          | Configure `basic_auth` for authenticating to the endpoint. | no
+[oauth2][]              | Configure OAuth 2.0 for authenticating to the endpoint.    | no
+oauth2 > [tls_config][] | Configure TLS settings for connecting to the endpoint.     | no
+[tls_config][]          | Configure TLS settings for connecting to the endpoint.     | no
 
 The `>` symbol indicates deeper levels of nesting.
 For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
 
-[basic_auth]: #basic_auth-block
-[authorization]: #authorization-block
-[oauth2]: #oauth2-block
-[tls_config]: #tls_config-block
-
-### basic_auth block
+[authorization]: #authorization
+[basic_auth]: #basic_auth
+[oauth2]: #oauth2
+[tls_config]: #tls_config
 
-{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+### authorization
 
-### authorization block
+The `authorization` block configures generic authorization to the endpoint.
 
 {{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### oauth2 block
+### basic_auth
+
+The `basic_auth` block configures basic authentication to the endpoint.
+
+{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+
+### oauth2
+
+The `oauth` block configures OAuth 2.0 authentication to the endpoint.
 
 {{< docs/shared lookup="reference/components/oauth2-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### tls_config block
+### tls_config
+
+The `tls_config` block configures TLS settings for connecting to the endpoint.
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -98,20 +108,20 @@ The following fields are exported and can be referenced by other components:
 
 Name      | Type                | Description
 ----------|---------------------|---------------------------------------------
-`targets` | `list(map(string))` | The set of targets discovered from puppetdb.
+`targets` | `list(map(string))` | The set of targets discovered from PuppetDB.
 
 Each target includes the following labels:
 
-* `__meta_puppetdb_query`: the Puppet Query Language (PQL) query.
-* `__meta_puppetdb_certname`: the name of the node associated with the resourcet.
-* `__meta_puppetdb_resource`: a SHA-1 hash of the resource’s type, title, and parameters, for identification.
-* `__meta_puppetdb_type`: the resource type.
-* `__meta_puppetdb_title`: the resource title.
-* `__meta_puppetdb_exported`: whether the resource is exported ("true" or "false").
-* `__meta_puppetdb_tags`: comma separated list of resource tags.
-* `__meta_puppetdb_file`: the manifest file in which the resource was declared.
-* `__meta_puppetdb_environment`: the environment of the node associated with the resource.
-* `__meta_puppetdb_parameter_<parametername>`: the parameters of the resource.
+* `__meta_puppetdb_certname`: The name of the node associated with the resource.
+* `__meta_puppetdb_environment`: The environment of the node associated with the resource.
+* `__meta_puppetdb_exported`: Whether the resource is exported, either `true` or `false`.
+* `__meta_puppetdb_file`: The manifest file in which the resource was declared.
+* `__meta_puppetdb_parameter_<parametername>`: The parameters of the resource.
+* `__meta_puppetdb_query`: The Puppet Query Language (PQL) query.
+* `__meta_puppetdb_resource`: A SHA-1 hash of the resource's type, title, and parameters, for identification.
+* `__meta_puppetdb_tags`: A comma separated list of resource tags.
+* `__meta_puppetdb_title`: The resource title.
+* `__meta_puppetdb_type`: The resource type.
 
 ## Component health
 
@@ -120,43 +130,45 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.puppetdb` does not expose any component-specific debug information.
+`discovery.puppetdb` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.puppetdb` does not expose any component-specific debug metrics.
+`discovery.puppetdb` doesn't expose any component-specific debug metrics.
 
 ## Example
 
-This example discovers targets from puppetdb for all the servers that have a specific package defined:
+This example discovers targets from PuppetDB for all the servers that have a specific package defined:
 
 ```alloy
 discovery.puppetdb "example" {
-	url   = "http://puppetdb.local:8080"
-	query = "resources { type = \"Package\" and title = \"node_exporter\" }"
-	port  = 9100
+    url   = "http://puppetdb.local:8080"
+    query = "resources { type = \"Package\" and title = \"node_exporter\" }"
+    port  = 9100
 }
 
 prometheus.scrape "demo" {
-	targets    = discovery.puppetdb.example.targets
-	forward_to = [prometheus.remote_write.demo.receiver]
+    targets    = discovery.puppetdb.example.targets
+    forward_to = [prometheus.remote_write.demo.receiver]
 }
 
 prometheus.remote_write "demo" {
-	endpoint {
-		url = PROMETHEUS_REMOTE_WRITE_URL
-
-		basic_auth {
-			username = USERNAME
-			password = PASSWORD
-		}
-	}
+    endpoint {
+        url = "<PROMETHEUS_REMOTE_WRITE_URL>"
+
+        basic_auth {
+            username = "<USERNAME>"
+            password = "<PASSWORD>"
+        }
+    }
 }
 ```
+
 Replace the following:
-  - `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-  - `USERNAME`: The username to use for authentication to the remote_write API.
-  - `PASSWORD`: The password to use for authentication to the remote_write API.
+
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
diff --git a/docs/sources/reference/components/discovery/discovery.relabel.md b/docs/sources/reference/components/discovery/discovery.relabel.md
index 8abd5501e6..74a8147aa2 100644
--- a/docs/sources/reference/components/discovery/discovery.relabel.md
+++ b/docs/sources/reference/components/discovery/discovery.relabel.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.relabel/ # /docs/alloy/latest/reference/components/discovery.relabel/
 description: Learn about discovery.relabel
+labels:
+  stage: general-availability
 title: discovery.relabel
 ---
 
@@ -28,8 +30,8 @@ Multiple `discovery.relabel` components can be specified by giving them differen
 ## Usage
 
 ```alloy
-discovery.relabel "LABEL" {
-  targets = TARGET_LIST
+discovery.relabel "<LABEL>" {
+  targets = "<TARGET_LIST>"
 
   rule {
     ...
@@ -41,7 +43,7 @@ discovery.relabel "LABEL" {
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.relabel`:
 
 Name      | Type                | Description        | Default | Required
 ----------|---------------------|--------------------|---------|---------
@@ -49,16 +51,17 @@ Name      | Type                | Description        | Default | Required
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.relabel`:
+You can use the following blocks with `discovery.relabel`:
 
 Hierarchy | Block    | Description                           | Required
 ----------|----------|---------------------------------------|---------
 rule      | [rule][] | Relabeling rules to apply to targets. | no
 
-[rule]: #rule-block
+[rule]: #rule
 
-### rule block
+### rule
+
+The `rule` block configures the relabeling rules to apply to targets.
 
 {{< docs/shared lookup="reference/components/rule-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -78,11 +81,11 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.relabel` does not expose any component-specific debug information.
+`discovery.relabel` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.relabel` does not expose any component-specific debug metrics.
+`discovery.relabel` doesn't expose any component-specific debug metrics.
 
 ## Example
 
diff --git a/docs/sources/reference/components/discovery/discovery.scaleway.md b/docs/sources/reference/components/discovery/discovery.scaleway.md
index b2dac9a5f3..4be3ad8d45 100644
--- a/docs/sources/reference/components/discovery/discovery.scaleway.md
+++ b/docs/sources/reference/components/discovery/discovery.scaleway.md
@@ -3,55 +3,57 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.scaleway/ # /docs/alloy/latest/reference/components/discovery.scaleway/
 description: Learn about discovery.scaleway
+labels:
+  stage: general-availability
 title: discovery.scaleway
 ---
 
 # discovery.scaleway
 
-`discovery.scaleway` discovers targets from [Scaleway instances][instance] and [baremetal services][baremetal].
+`discovery.scaleway` discovers targets from [Scaleway instances][instance] and [bare metal services][bare metal].
 
 [instance]: https://www.scaleway.com/en/virtual-instances/
-[baremetal]: https://www.scaleway.com/en/bare-metal-servers/
+[bare metal]: https://www.scaleway.com/en/bare-metal-servers/
 
 ## Usage
 
 ```alloy
-discovery.scaleway "LABEL" {
-    project_id = "SCALEWAY_PROJECT_ID"
-    role       = "SCALEWAY_PROJECT_ROLE"
-    access_key = "SCALEWAY_ACCESS_KEY"
-    secret_key = "SCALEWAY_SECRET_KEY"
+discovery.scaleway "<LABEL>" {
+    project_id = "<SCALEWAY_PROJECT_ID>"
+    role       = "<SCALEWAY_PROJECT_ROLE>"
+    access_key = "<SCALEWAY_ACCESS_KEY>"
+    secret_key = "<SCALEWAY_SECRET_KEY>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.scaleway`:
 
 Name                     | Type                | Description                                                                                      | Default                      | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|------------------------------|------------
+`access_key`             | `string`            | Access key for the Scaleway API.                                                                 |                              | yes
 `project_id`             | `string`            | Scaleway project ID of targets.                                                                  |                              | yes
 `role`                   | `string`            | Role of targets to retrieve.                                                                     |                              | yes
-`api_url`                | `string`            | Scaleway API URL.                                                                                | `"https://api.scaleway.com"` | no
-`zone`                   | `string`            | Availability zone of targets.                                                                    | `"fr-par-1"`                 | no
-`access_key`             | `string`            | Access key for the Scaleway API.                                                                 |                              | yes
-`secret_key`             | `secret`            | Secret key for the Scaleway API.                                                                 |                              | conditional
 `secret_key_file`        | `string`            | Path to file containing secret key for the Scaleway API.                                         |                              | conditional
+`secret_key`             | `secret`            | Secret key for the Scaleway API.                                                                 |                              | conditional
+`api_url`                | `string`            | Scaleway API URL.                                                                                | `"https://api.scaleway.com"` | no
+`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`                       | no
+`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.                                     | `true`                       | no
 `name_filter`            | `string`            | Name filter to apply against the listing request.                                                |                              | no
-`tags_filter`            | `list(string)`      | List of tags to search for.                                                                      |                              | no
-`refresh_interval`       | `duration`          | Frequency to rediscover targets.                                                                 | `"60s"`                      | no
-`port`                   | `number`            | Default port on servers to associate with generated targets.                                     | `80`                         | no
-`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |                              | no
 `no_proxy`               | `string`            | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |                              | no
-`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.                                            | `false`                      | no
+`port`                   | `number`            | Default port on servers to associate with generated targets.                                     | `80`                         | no
 `proxy_connect_header`   | `map(list(secret))` | Specifies headers to send to proxies during CONNECT requests.                                    |                              | no
-`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.                                     | `true`                       | no
-`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`                       | no
+`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.                                            | `false`                      | no
+`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |                              | no
+`refresh_interval`       | `duration`          | Frequency to rediscover targets.                                                                 | `"60s"`                      | no
+`tags_filter`            | `list(string)`      | List of tags to search for.                                                                      |                              | no
+`zone`                   | `string`            | Availability zone of targets.                                                                    | `"fr-par-1"`                 | no
 
 The `role` argument determines what type of Scaleway machines to discover.
 It must be set to one of the following:
 
-* `"baremetal"`: Discover [baremetal][] Scaleway machines.
+* `"baremetal"`: Discover [bare metal][] Scaleway machines.
 * `"instance"`: Discover virtual Scaleway [instances][instance].
 
 The `name_filter` and `tags_filter` arguments can be used to filter the set of discovered servers.
@@ -61,19 +63,17 @@ The `name_filter` and `tags_filter` arguments can be used to filter the set of d
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.scaleway`:
+You can use the following blocks with `discovery.scaleway`:
 
-Hierarchy  | Block          | Description                                            | Required
------------|----------------|--------------------------------------------------------|---------
-tls_config | [tls_config][] | Configure TLS settings for connecting to the endpoint. | no
+ Block          | Description                                            | Required
+----------------|--------------------------------------------------------|---------
+ [tls_config][] | Configure TLS settings for connecting to the endpoint. | no
 
-The `>` symbol indicates deeper levels of nesting.
-For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
+[tls_config]: #tls_config
 
-[tls_config]: #tls_config-block
+### tls_config
 
-### tls_config block
+The `tls_config` block configures TLS settings for connecting to the endpoint.
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -87,42 +87,42 @@ Name      | Type                | Description
 
 When `role` is `baremetal`, discovered targets include the following labels:
 
-* `__meta_scaleway_baremetal_id`: ID of the server.
-* `__meta_scaleway_baremetal_public_ipv4`: Public IPv4 address of the server.
-* `__meta_scaleway_baremetal_public_ipv6`: Public IPv6 address of the server.
-* `__meta_scaleway_baremetal_name`: Name of the server.
-* `__meta_scaleway_baremetal_os_name`: Operating system name of the server.
-* `__meta_scaleway_baremetal_os_version`: Operation system version of the server.
-* `__meta_scaleway_baremetal_project_id`: Project ID the server belongs to.
-* `__meta_scaleway_baremetal_status`: Current status of the server.
+* `__meta_scaleway_baremetal_id`: The ID of the server.
+* `__meta_scaleway_baremetal_name`: The name of the server.
+* `__meta_scaleway_baremetal_os_name`: The operating system name of the server.
+* `__meta_scaleway_baremetal_os_version`: The operating system version of the server.
+* `__meta_scaleway_baremetal_project_id`: The project ID the server belongs to.
+* `__meta_scaleway_baremetal_public_ipv4`: The public IPv4 address of the server.
+* `__meta_scaleway_baremetal_public_ipv6`: The public IPv6 address of the server.
+* `__meta_scaleway_baremetal_status`: The current status of the server.
 * `__meta_scaleway_baremetal_tags`: The list of tags associated with the server concatenated with a `,`.
-* `__meta_scaleway_baremetal_type`: Commercial type of the server.
-* `__meta_scaleway_baremetal_zone`: Availability zone of the server.
+* `__meta_scaleway_baremetal_type`: The commercial type of the server.
+* `__meta_scaleway_baremetal_zone`: The availability zone of the server.
 
 When `role` is `instance`, discovered targets include the following labels:
 
-* `__meta_scaleway_instance_boot_type`: Boot type of the server.
-* `__meta_scaleway_instance_hostname`: Hostname of the server.
-* `__meta_scaleway_instance_id`: ID of the server.
-* `__meta_scaleway_instance_image_arch`: Architecture of the image the server is running.
-* `__meta_scaleway_instance_image_id`: ID of the image the server is running.
-* `__meta_scaleway_instance_image_name`: Name of the image the server is running.
-* `__meta_scaleway_instance_location_cluster_id`: ID of the cluster for the server's location.
-* `__meta_scaleway_instance_location_hypervisor_id`: Hypervisor ID for the server's location.
-* `__meta_scaleway_instance_location_node_id`: Node ID for the server's location.
-* `__meta_scaleway_instance_name`: Name of the server.
-* `__meta_scaleway_instance_organization_id`: Organization ID that the server belongs to.
-* `__meta_scaleway_instance_private_ipv4`: Private IPv4 address of the server.
-* `__meta_scaleway_instance_project_id`: Project ID the server belongs to.
-* `__meta_scaleway_instance_public_ipv4`: Public IPv4 address of the server.
-* `__meta_scaleway_instance_public_ipv6`: Public IPv6 address of the server.
-* `__meta_scaleway_instance_region`: Region of the server.
-* `__meta_scaleway_instance_security_group_id`: ID of the security group the server is assigned to.
-* `__meta_scaleway_instance_security_group_name`: Name of the security group the server is assigned to.
-* `__meta_scaleway_instance_status`: Current status of the server.
+* `__meta_scaleway_instance_boot_type`: The boot type of the server.
+* `__meta_scaleway_instance_hostname`: The hostname of the server.
+* `__meta_scaleway_instance_id`: The ID of the server.
+* `__meta_scaleway_instance_image_arch`: The architecture of the image the server is running.
+* `__meta_scaleway_instance_image_id`: The ID of the image the server is running.
+* `__meta_scaleway_instance_image_name`: The name of the image the server is running.
+* `__meta_scaleway_instance_location_cluster_id`: The ID of the cluster for the server's location.
+* `__meta_scaleway_instance_location_hypervisor_id`: The hypervisor ID for the server's location.
+* `__meta_scaleway_instance_location_node_id`: The node ID for the server's location.
+* `__meta_scaleway_instance_name`: The name of the server.
+* `__meta_scaleway_instance_organization_id`: The organization ID that the server belongs to.
+* `__meta_scaleway_instance_private_ipv4`: The private IPv4 address of the server.
+* `__meta_scaleway_instance_project_id`: The project ID the server belongs to.
+* `__meta_scaleway_instance_public_ipv4`: The public IPv4 address of the server.
+* `__meta_scaleway_instance_public_ipv6`: The public IPv6 address of the server.
+* `__meta_scaleway_instance_region`: The region of the server.
+* `__meta_scaleway_instance_security_group_id`: The ID of the security group the server is assigned to.
+* `__meta_scaleway_instance_security_group_name`: The name of the security group the server is assigned to.
+* `__meta_scaleway_instance_status`: The current status of the server.
 * `__meta_scaleway_instance_tags`: The list of tags associated with the server concatenated with a `,`.
-* `__meta_scaleway_instance_type`: Commercial type of the server.
-* `__meta_scaleway_instance_zone`: Availability zone of the server.
+* `__meta_scaleway_instance_type`: The commercial type of the server.
+* `__meta_scaleway_instance_zone`: The availability zone of the server.
 
 ## Component health
 
@@ -131,20 +131,20 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.scaleway` does not expose any component-specific debug information.
+`discovery.scaleway` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.scaleway` does not expose any component-specific debug metrics.
+`discovery.scaleway` doesn't expose any component-specific debug metrics.
 
 ## Example
 
 ```alloy
 discovery.scaleway "example" {
-    project_id = "SCALEWAY_PROJECT_ID"
-    role       = "SCALEWAY_PROJECT_ROLE"
-    access_key = "SCALEWAY_ACCESS_KEY"
-    secret_key = "SCALEWAY_SECRET_KEY"
+    project_id = "<SCALEWAY_PROJECT_ID>"
+    role       = "<SCALEWAY_PROJECT_ROLE>"
+    access_key = "<SCALEWAY_ACCESS_KEY>"
+    secret_key = "<SCALEWAY_SECRET_KEY>"
 }
 
 prometheus.scrape "demo" {
@@ -154,11 +154,11 @@ prometheus.scrape "demo" {
 
 prometheus.remote_write "demo" {
     endpoint {
-        url = PROMETHEUS_REMOTE_WRITE_URL
+        url = "<PROMETHEUS_REMOTE_WRITE_URL>"
 
         basic_auth {
-            username = USERNAME
-            password = PASSWORD
+            username = "<USERNAME>"
+            password = "<PASSWORD>"
         }
     }
 }
@@ -166,13 +166,13 @@ prometheus.remote_write "demo" {
 
 Replace the following:
 
-* `SCALEWAY_PROJECT_ID`: The project ID of your Scaleway machines.
-* `SCALEWAY_PROJECT_ROLE`: Set to `baremetal` to discover [baremetal][] machines or `instance` to discover [virtual instances][instance].
-* `SCALEWAY_ACCESS_KEY`: Your Scaleway API access key.
-* `SCALEWAY_SECRET_KEY`: Your Scaleway API secret key.
-* `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-* `USERNAME`: The username to use for authentication to the remote_write API.
-* `PASSWORD`: The password to use for authentication to the remote_write API.
+* _`<SCALEWAY_PROJECT_ID>`_: The project ID of your Scaleway machines.
+* _`<SCALEWAY_PROJECT_ROLE>`_: Set to `baremetal` to discover [bare metal][] machines or `instance` to discover [virtual instances][instance].
+* _`<SCALEWAY_ACCESS_KEY>`_: Your Scaleway API access key.
+* _`<SCALEWAY_SECRET_KEY>`_: Your Scaleway API secret key.
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
diff --git a/docs/sources/reference/components/discovery/discovery.serverset.md b/docs/sources/reference/components/discovery/discovery.serverset.md
index c02b6f8355..a051705a3e 100644
--- a/docs/sources/reference/components/discovery/discovery.serverset.md
+++ b/docs/sources/reference/components/discovery/discovery.serverset.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.serverset/ # /docs/alloy/latest/reference/components/discovery.serverset/
 description: Learn about discovery.serverset
+labels:
+  stage: general-availability
 title: discovery.serverset
 ---
 
@@ -18,9 +20,9 @@ Serversets are commonly used by [Finagle][] and [Aurora][].
 ## Usage
 
 ```alloy
-discovery.serverset "LABEL" {
-	servers = SERVERS_LIST
-	paths   = ZOOKEEPER_PATHS_LIST
+discovery.serverset "<LABEL>" {
+    servers = "<SERVERS_LIST>"
+    paths   = "<ZOOKEEPER_PATHS_LIST>"
 }
 ```
 
@@ -29,13 +31,17 @@ The Thrift format isn't supported.
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.serverset`:
 
-| Name      | Type           | Description                                      | Default | Required |
-|-----------|----------------|--------------------------------------------------|---------|----------|
-| `servers` | `list(string)` | The Zookeeper servers to connect to.             |         | yes      |
-| `paths`   | `list(string)` | The Zookeeper paths to discover Serversets from. |         | yes      |
-| `timeout` | `duration`     | The Zookeeper session timeout                    | `10s`   | no       |
+Name      | Type           | Description                                      | Default | Required
+----------|----------------|--------------------------------------------------|---------|---------
+`paths`   | `list(string)` | The Zookeeper paths to discover Serversets from. |         | yes
+`servers` | `list(string)` | The Zookeeper servers to connect to.             |         | yes
+`timeout` | `duration`     | The Zookeeper session timeout                    | `10s`   | no
+
+## Blocks
+
+The `discovery.serverset` component doesn't support any blocks. You can configure this component with arguments.
 
 ## Exported fields
 
@@ -46,13 +52,14 @@ Name      | Type                | Description
 `targets` | `list(map(string))` | The set of targets discovered.
 
 The following metadata labels are available on targets during relabeling:
-* `__meta_serverset_path`: the full path to the serverset member node in Zookeeper
-* `__meta_serverset_endpoint_host`: the host of the default endpoint
-* `__meta_serverset_endpoint_port`: the port of the default endpoint
-* `__meta_serverset_endpoint_host_<endpoint>`: the host of the given endpoint
-* `__meta_serverset_endpoint_port_<endpoint>`: the port of the given endpoint
-* `__meta_serverset_shard`: the shard number of the member
-* `__meta_serverset_status`: the status of the member
+
+* `__meta_serverset_endpoint_host_<endpoint>`: The host of the given endpoint.
+* `__meta_serverset_endpoint_host`: The host of the default endpoint.
+* `__meta_serverset_endpoint_port_<endpoint>`: The port of the given endpoint.
+* `__meta_serverset_endpoint_port`: The port of the default endpoint.
+* `__meta_serverset_path`: The full path to the serverset member node in Zookeeper.
+* `__meta_serverset_shard`: The shard number of the member.
+* `__meta_serverset_status`: The status of the member.
 
 ## Component health
 
@@ -61,33 +68,33 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.serverset` does not expose any component-specific debug information.
+`discovery.serverset` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.serverset` does not expose any component-specific debug metrics.
+`discovery.serverset` doesn't expose any component-specific debug metrics.
 
 ## Example
 
-The configuration below will connect to one of the Zookeeper servers (either `zk1`, `zk2`, or `zk3`) and discover JSON Serversets at paths `/path/to/znode1` and `/path/to/znode2`.
-The discovered targets are scraped by the `prometheus.scrape.default` component and forwarded to the `prometheus.remote_write.default` component, which will send the samples to specified remote_write URL.
+The configuration below connects to one of the Zookeeper servers, either `zk1`, `zk2`, or `zk3`, and discovers JSON Serversets at paths `/path/to/znode1` and `/path/to/znode2`.
+The discovered targets are scraped by the `prometheus.scrape.default` component and forwarded to the `prometheus.remote_write.default` component, which sends the samples to specified `remote_write` URL.
 
 ```alloy
 discovery.serverset "zookeeper" {
-	servers = ["zk1", "zk2", "zk3"]
-	paths   = ["/path/to/znode1", "/path/to/znode2"]
-	timeout = "30s"
+    servers = ["zk1", "zk2", "zk3"]
+    paths   = ["/path/to/znode1", "/path/to/znode2"]
+    timeout = "30s"
 }
 
 prometheus.scrape "default" {
-	targets    = discovery.serverset.zookeeper.targets
-	forward_to = [prometheus.remote_write.default.receiver]
+    targets    = discovery.serverset.zookeeper.targets
+    forward_to = [prometheus.remote_write.default.receiver]
 }
 
 prometheus.remote_write "default" {
-	endpoint {
-		url = "http://remote-write-url1"
-	}
+    endpoint {
+        url = "http://remote-write-url1"
+    }
 }
 ```
 
diff --git a/docs/sources/reference/components/discovery/discovery.triton.md b/docs/sources/reference/components/discovery/discovery.triton.md
index 558be24fd0..c4e03dbfcd 100644
--- a/docs/sources/reference/components/discovery/discovery.triton.md
+++ b/docs/sources/reference/components/discovery/discovery.triton.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.triton/ # /docs/alloy/latest/reference/components/discovery.triton/
 description: Learn about discovery.triton
+labels:
+  stage: general-availability
 title: discovery.triton
 ---
 
@@ -15,46 +17,49 @@ title: discovery.triton
 ## Usage
 
 ```alloy
-discovery.triton "LABEL" {
-	account    = ACCOUNT
-	dns_suffix = DNS_SUFFIX
-	endpoint   = ENDPOINT
+discovery.triton "<LABEL>" {
+    account    = "<ACCOUNT>"
+    dns_suffix = "<DNS_SUFFIX>"
+    endpoint   = "<ENDPOINT>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.triton`:
 
 Name               | Type           | Description                                         | Default       | Required
------------------- | -------------- | --------------------------------------------------- | ------------- | --------
+-------------------|----------------|-----------------------------------------------------|---------------|---------
 `account`          | `string`       | The account to use for discovering new targets.     |               | yes
-`role`             | `string`       | The type of targets to discover.                    | `"container"` | no
 `dns_suffix`       | `string`       | The DNS suffix that is applied to the target.       |               | yes
-`endpoint`         | `string`       | The Triton discovery endpoint. 					  |               | yes
+`endpoint`         | `string`       | The Triton discovery endpoint.                      |               | yes
 `groups`           | `list(string)` | A list of groups to retrieve targets from.          |               | no
 `port`             | `int`          | The port to use for discovery and metrics scraping. | `9163`        | no
 `refresh_interval` | `duration`     | The refresh interval for the list of targets.       | `60s`         | no
+`role`             | `string`       | The type of targets to discover.                    | `"container"` | no
 `version`          | `int`          | The Triton discovery API version.                   | `1`           | no
 
+`groups` is only supported when `role` is set to `"container"`.
+If you omit `groups`, all containers owned by the requesting account are scraped.
+
 `role` can be set to:
-* `"container"` to discover virtual machines (SmartOS zones, lx/KVM/bhyve branded zones) running on Triton
-* `"cn"` to discover compute nodes (servers/global zones) making up the Triton infrastructure
 
-`groups` is only supported when `role` is set to `"container"`.
-If omitted all containers owned by the requesting account are scraped.
+* `"container"` to discover virtual machines (SmartOS zones, lx/KVM/bhyve branded zones) running on Triton.
+* `"cn"` to discover compute nodes (servers/global zones) making up the Triton infrastructure.
 
 ## Blocks
-The following blocks are supported inside the definition of
-`discovery.triton`:
 
-Hierarchy  | Block          | Description                                       | Required
------------|----------------|---------------------------------------------------|---------
-tls_config | [tls_config][] | TLS configuration for requests to the Triton API. | no
+You can use the following blocks with `discovery.triton`:
 
-[tls_config]: #tls_config-block
+Block          | Description                                       | Required
+---------------|---------------------------------------------------|---------
+[tls_config][] | TLS configuration for requests to the Triton API. | no
 
-### tls_config block
+[tls_config]: #tls_config
+
+### tls_config
+
+The `tls_config` block configures TLS settings for requests to the Triton API.
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -77,7 +82,7 @@ When `role` is set to `"container"`, each target includes the following labels:
 
 When `role` is set to `"cn"` each target includes the following labels:
 
-* `__meta_triton_machine_alias`: The hostname of the target (requires triton-cmon 1.7.0 or newer).
+* `__meta_triton_machine_alias`: The hostname of the target. Requires triton-cmon 1.7.0 or newer.
 * `__meta_triton_machine_id`: The UUID of the target.
 
 ## Component health
@@ -87,44 +92,46 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.triton` does not expose any component-specific debug information.
+`discovery.triton` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.triton` does not expose any component-specific debug metrics.
+`discovery.triton` doesn't expose any component-specific debug metrics.
 
 ## Example
 
 ```alloy
 discovery.triton "example" {
-	account    = TRITON_ACCOUNT
-	dns_suffix = TRITON_DNS_SUFFIX
-	endpoint   = TRITON_ENDPOINT
+    account    = "<TRITON_ACCOUNT>"
+    dns_suffix = "<TRITON_DNS_SUFFIX>"
+    endpoint   = "<TRITON_ENDPOINT>"
 }
 
 prometheus.scrape "demo" {
-	targets    = discovery.triton.example.targets
-	forward_to = [prometheus.remote_write.demo.receiver]
+    targets    = discovery.triton.example.targets
+    forward_to = [prometheus.remote_write.demo.receiver]
 }
 
 prometheus.remote_write "demo" {
-	endpoint {
-		url = PROMETHEUS_REMOTE_WRITE_URL
-
-		basic_auth {
-			username = USERNAME
-			password = PASSWORD
-		}
-	}
+    endpoint {
+        url = "<PROMETHEUS_REMOTE_WRITE_URL>"
+
+        basic_auth {
+            username = "<USERNAME>"
+            password = "<PASSWORD>"
+        }
+    }
 }
 ```
+
 Replace the following:
-  - `TRITON_ACCOUNT`: Your Triton account.
-  - `TRITON_DNS_SUFFIX`: Your Triton DNS suffix.
-  - `TRITON_ENDPOINT`: Your Triton endpoint.
-  - `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-  - `USERNAME`: The username to use for authentication to the remote_write API.
-  - `PASSWORD`: The password to use for authentication to the remote_write API.
+
+* _`<TRITON_ACCOUNT>`_: Your Triton account.
+* _`<TRITON_DNS_SUFFIX>`_: Your Triton DNS suffix.
+* _`<TRITON_ENDPOINT>`_: Your Triton endpoint.
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 
diff --git a/docs/sources/reference/components/discovery/discovery.uyuni.md b/docs/sources/reference/components/discovery/discovery.uyuni.md
index 6a48bb16d2..129aea68b6 100644
--- a/docs/sources/reference/components/discovery/discovery.uyuni.md
+++ b/docs/sources/reference/components/discovery/discovery.uyuni.md
@@ -3,6 +3,8 @@ canonical: https://grafana.com/docs/alloy/latest/reference/components/discovery/
 aliases:
   - ../discovery.uyuni/ # /docs/alloy/latest/reference/components/discovery.uyuni/
 description: Learn about discovery.uyuni
+labels:
+  stage: general-availability
 title: discovery.uyuni
 ---
 
@@ -15,45 +17,47 @@ title: discovery.uyuni
 ## Usage
 
 ```alloy
-discovery.uyuni "LABEL" {
-    server   = SERVER
-    username = USERNAME
-    password = PASSWORD
+discovery.uyuni "<LABEL>" {
+    server   = "<SERVER>"
+    username = "<USERNAME>"
+    password = "<PASSWORD>"
 }
 ```
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.uyuni`:
 
 Name                     | Type                | Description                                                                                      | Default                 | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|-------------------------|---------
+`password`               | `Secret`            | The password to use for authentication to the Uyuni API.                                         |                         | yes
 `server`                 | `string`            | The primary Uyuni Server.                                                                        |                         | yes
 `username`               | `string`            | The username to use for authentication to the Uyuni API.                                         |                         | yes
-`password`               | `Secret`            | The password to use for authentication to the Uyuni API.                                         |                         | yes
+`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`                  | no
 `entitlement`            | `string`            | The entitlement to filter on when listing targets.                                               | `"monitoring_entitled"` | no
-`separator`              | `string`            | The separator to use when building the `__meta_uyuni_groups` label.                              | `","`                   | no
-`refresh_interval`       | `duration`          | Interval at which to refresh the list of targets.                                                | `1m`                    | no
-`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |                         | no
+`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.                                     | `true`                  | no
 `no_proxy`               | `string`            | Comma-separated list of IP addresses, CIDR notations, and domain names to exclude from proxying. |                         | no
-`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.                                            | `false`                 | no
 `proxy_connect_header`   | `map(list(secret))` | Specifies headers to send to proxies during CONNECT requests.                                    |                         | no
-`follow_redirects`       | `bool`              | Whether redirects returned by the server should be followed.                                     | `true`                  | no
-`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`                  | no
+`proxy_from_environment` | `bool`              | Use the proxy URL indicated by environment variables.                                            | `false`                 | no
+`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |                         | no
+`refresh_interval`       | `duration`          | Interval at which to refresh the list of targets.                                                | `1m`                    | no
+`separator`              | `string`            | The separator to use when building the `__meta_uyuni_groups` label.                              | `","`                   | no
 
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
 ## Blocks
-The following blocks are supported inside the definition of
-`discovery.uyuni`:
 
-Hierarchy  | Block          | Description                                      | Required
------------|----------------|--------------------------------------------------|---------
-tls_config | [tls_config][] | TLS configuration for requests to the Uyuni API. | no
+You can use the following blocks with `discovery.uyuni`:
 
-[tls_config]: #tls_config-block
+Block          | Description                                      | Required
+---------------|--------------------------------------------------|---------
+[tls_config][] | TLS configuration for requests to the Uyuni API. | no
 
-### tls_config block
+[tls_config]: #tls_config
+
+### tls_config
+
+The `tls_config` block configures TLS settings for requests to the Uyuni API.
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -67,15 +71,15 @@ Name      | Type                | Description
 
 Each target includes the following labels:
 
-* `__meta_uyuni_minion_hostname`: The hostname of the Uyuni Minion.
-* `__meta_uyuni_primary_fqdn`: The FQDN of the Uyuni primary.
-* `__meta_uyuni_system_id`: The system ID of the Uyuni Minion.
-* `__meta_uyuni_groups`: The groups the Uyuni Minion belongs to.
 * `__meta_uyuni_endpoint_name`: The name of the endpoint.
 * `__meta_uyuni_exporter`: The name of the exporter.
-* `__meta_uyuni_proxy_module`: The name of the Uyuni module.
+* `__meta_uyuni_groups`: The groups the Uyuni Minion belongs to.
 * `__meta_uyuni_metrics_path`: The path to the metrics endpoint.
+* `__meta_uyuni_minion_hostname`: The hostname of the Uyuni Minion.
+* `__meta_uyuni_primary_fqdn`: The FQDN of the Uyuni primary.
+* `__meta_uyuni_proxy_module`: The name of the Uyuni module.
 * `__meta_uyuni_scheme`: `https` if TLS is enabled on the endpoint, `http` otherwise.
+* `__meta_uyuni_system_id`: The system ID of the Uyuni Minion.
 
 These labels are largely derived from a [listEndpoints][] API call to the Uyuni Server.
 
@@ -88,19 +92,19 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.uyuni` does not expose any component-specific debug information.
+`discovery.uyuni` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.uyuni` does not expose any component-specific debug metrics.
+`discovery.uyuni` doesn't expose any component-specific debug metrics.
 
 ## Example
 
 ```alloy
 discovery.uyuni "example" {
   server    = "https://127.0.0.1/rpc/api"
-  username  = UYUNI_USERNAME
-  password  = UYUNI_PASSWORD
+  username  = "<UYUNI_USERNAME>"
+  password  = "<UYUNI_PASSWORD>"
 }
 
 prometheus.scrape "demo" {
@@ -110,21 +114,23 @@ prometheus.scrape "demo" {
 
 prometheus.remote_write "demo" {
   endpoint {
-    url = PROMETHEUS_REMOTE_WRITE_URL
+    url = "<PROMETHEUS_REMOTE_WRITE_URL>"
 
     basic_auth {
-      username = USERNAME
-      password = PASSWORD
+      username = "<USERNAME>"
+      password = "<PASSWORD>"
     }
   }
 }
 ```
+
 Replace the following:
-  - `UYUNI_USERNAME`: The username to use for authentication to the Uyuni server.
-  - `UYUNI_PASSWORD`: The password to use for authentication to the Uyuni server.
-  - `PROMETHEUS_REMOTE_WRITE_URL`: The URL of the Prometheus remote_write-compatible server to send metrics to.
-  - `USERNAME`: The username to use for authentication to the remote_write API.
-  - `PASSWORD`: The password to use for authentication to the remote_write API.
+
+* _`<UYUNI_USERNAME>`_: The username to use for authentication to the Uyuni server.
+* _`<UYUNI_PASSWORD>`_: The password to use for authentication to the Uyuni server.
+* _`<PROMETHEUS_REMOTE_WRITE_URL>`_: The URL of the Prometheus remote_write-compatible server to send metrics to.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->