From 6f64b3ad931ea09ba0da6aaf823bfb8f5d83f15e Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Mon, 13 Jan 2025 11:38:58 -0800
Subject: [PATCH 1/6] Update discover azure and consul topics

---
 .../components/discovery/discovery.azure.md   | 69 ++++++++--------
 .../components/discovery/discovery.consul.md  | 74 ++++++++---------
 .../discovery/discovery.consulagent.md        | 79 +++++++++----------
 3 files changed, 113 insertions(+), 109 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.azure.md b/docs/sources/reference/components/discovery/discovery.azure.md
index 72c5123017..a2fb6000dc 100644
--- a/docs/sources/reference/components/discovery/discovery.azure.md
+++ b/docs/sources/reference/components/discovery/discovery.azure.md
@@ -25,36 +25,45 @@ The following arguments are supported:
 
 Name                     | Type                | Description                                                                                      | Default              | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|----------------------|---------
+`enable_http2`           | `bool`              | Whether HTTP2 is supported for requests.                                                         | `true`               | no
 `environment`            | `string`            | Azure environment.                                                                               | `"AzurePublicCloud"` | no
-`port`                   | `number`            | Port to be appended to the `__address__` label for each target.                                  | `80`                 | no
-`subscription_id`        | `string`            | Azure subscription ID.                                                                           |                      | no
-`refresh_interval`       | `duration`          | Interval at which to refresh the list of targets.                                                | `5m`                 | 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
+`port`                   | `number`            | Port to be appended to the `__address__` label for each target.                                  | `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`          | Interval at which to refresh the list of targets.                                                | `5m`                 | no
+`subscription_id`        | `string`            | Azure subscription ID.                                                                           |                      | 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.azure`:
+
+The following blocks are supported inside the definition of `discovery.azure`:
 
 Hierarchy        | Block                | Description                                      | Required
 -----------------|----------------------|--------------------------------------------------|---------
-oauth            | [oauth][]            | OAuth configuration for Azure API.               | no
 managed_identity | [managed_identity][] | Managed Identity configuration for Azure API.    | no
+oauth            | [oauth][]            | OAuth configuration for Azure API.               | no
 tls_config       | [tls_config][]       | TLS configuration for requests to the Azure API. | no
 
 Exactly one of the `oauth` or `managed_identity` blocks must be specified.
 
-[oauth]: #oauth-block
 [managed_identity]: #managed_identity-block
+[oauth]: #oauth-block
 [tls_config]: #tls_config-block
 
-### oauth block
+### managed_identity
+
+The `managed_identity` block configures Managed Identity authentication for the Azure API.
+
+Name        | Type     | Description                 | Default | Required
+------------|----------|-----------------------------|---------|---------
+`client_id` | `string` | Managed Identity client ID. |         | yes
+
+### oauth
+
 The `oauth` block configures OAuth authentication for the Azure API.
 
 Name            | Type     | Description          | Default | Required
@@ -63,14 +72,7 @@ Name            | Type     | Description          | Default | Required
 `client_secret` | `string` | OAuth client secret. |         | yes
 `tenant_id`     | `string` | OAuth tenant ID.     |         | yes
 
-### managed_identity block
-The `managed_identity` block configures Managed Identity authentication for the Azure API.
-
-Name        | Type     | Description                 | Default | Required
-------------|----------|-----------------------------|---------|---------
-`client_id` | `string` | Managed Identity client ID. |         | yes
-
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -84,19 +86,19 @@ Name      | Type                | Description
 
 Each target includes the following labels:
 
-* `__meta_azure_subscription_id`: The Azure subscription ID.
-* `__meta_azure_tenant_id`: The Azure tenant ID.
+* `__meta_azure_machine_computer_name`: The host OS name of the VM.
 * `__meta_azure_machine_id`: The UUID of the Azure VM.
-* `__meta_azure_machine_resource_group`: The name of the resource group the VM is in.
+* `__meta_azure_machine_location`: The region the VM is in.
 * `__meta_azure_machine_name`: The name of the VM.
-* `__meta_azure_machine_computer_name`: The host OS name of the VM.
 * `__meta_azure_machine_os_type`: The OS the VM is running (either `Linux` or `Windows`).
-* `__meta_azure_machine_location`: The region the VM is in.
 * `__meta_azure_machine_private_ip`: The private IP address of the VM.
 * `__meta_azure_machine_public_ip`: The public IP address of the VM.
-* `__meta_azure_machine_tag_*`: A tag on the VM. There will be one label per tag.
+* `__meta_azure_machine_resource_group`: The name of the resource group the VM is in.
 * `__meta_azure_machine_scale_set`: The name of the scale set the VM is in.
 * `__meta_azure_machine_size`: The size of the VM.
+* `__meta_azure_machine_tag_*`: A tag on the VM. There will be one label per tag.
+* `__meta_azure_subscription_id`: The Azure subscription ID.
+* `__meta_azure_tenant_id`: The Azure tenant ID.
 
 Each discovered VM maps to a single target. The `__address__` label is set to the `private_ip:port` (`[private_ip]:port` if the private IP is an IPv6 address) of the VM.
 
@@ -144,13 +146,14 @@ prometheus.remote_write "demo" {
 ```
 
 Replace the following:
-  - _`<AZURE_SUBSCRIPTION_ID>`_: Your Azure subscription ID.
-  - _`<AZURE_CLIENT_ID>`_: Your Azure client ID.
-  - _`<AZURE_CLIENT_SECRET>`_: Your Azure client secret.
-  - _`<AZURE_TENANT_ID>`_: Your Azure tenant ID.
-  - _`<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.
+
+* _`<AZURE_SUBSCRIPTION_ID>`_: Your Azure subscription ID.
+* _`<AZURE_CLIENT_ID>`_: Your Azure client ID.
+* _`<AZURE_CLIENT_SECRET>`_: Your Azure client secret.
+* _`<AZURE_TENANT_ID>`_: Your Azure tenant ID.
+* _`<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.consul.md b/docs/sources/reference/components/discovery/discovery.consul.md
index f2d09557ed..53646c5829 100644
--- a/docs/sources/reference/components/discovery/discovery.consul.md
+++ b/docs/sources/reference/components/discovery/discovery.consul.md
@@ -8,15 +8,15 @@ title: discovery.consul
 
 # discovery.consul
 
-`discovery.consul` allows retrieving scrape targets from [Consul's Catalog API][].
+`discovery.consul` allows you to retrieve scrape targets from [Consul's Catalog API][].
 
 [Consul's Catalog API]: https://www.consul.io/use-cases/discover-services
 
 ## Usage
 
 ```alloy
-discovery.consul "LABEL" {
-  server = CONSUL_SERVER
+discovery.consul "<LABEL>" {
+  server = <CONSUL_SERVER>
 }
 ```
 
@@ -26,35 +26,36 @@ The following arguments are supported:
 
 Name                     | Type                | Description                                                                                                     | Default          | Required
 -------------------------|---------------------|-----------------------------------------------------------------------------------------------------------------|------------------|---------
-`server`                 | `string`            | Host and port of the Consul API.                                                                                | `localhost:8500` | no
-`token`                  | `secret`            | Secret token used to access the Consul API.                                                                     |                  | no
-`datacenter`             | `string`            | Datacenter to query. If not provided, the default is used.                                                      |                  | no
-`namespace`              | `string`            | Namespace to use. Only supported in Consul Enterprise.                                                          |                  | no
-`partition`              | `string`            | Admin partition to use. Only supported in Consul Enterprise.                                                    |                  | no
-`tag_separator`          | `string`            | The string by which Consul tags are joined into the tag label.                                                  | `,`              | no
-`scheme`                 | `string`            | The scheme to use when talking to Consul.                                                                       | `http`           | no
-`username`               | `string`            | The username to use. Deprecated in favor of the `basic_auth` configuration.                                     |                  | no
-`password`               | `secret`            | The password to use. Deprecated in favor of the `basic_auth` configuration.                                     |                  | no
 `allow_stale`            | `bool`              | Allow stale Consul results. Reduces load on Consul. Refer to the [Consul documentation][] for more information. | `true`           | no
-`services`               | `list(string)`      | A list of services for which targets are retrieved. If omitted, all services are scraped.                       |                  | no
-`tags`                   | `list(string)`      | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.  |                  | no
-`node_meta`              | `map(string)`       | Node metadata key/value pairs to filter nodes for a given service.                                              |                  | no
-`refresh_interval`       | `duration`          | Frequency to refresh list of containers.                                                                        | `"30s"`          | no
 `bearer_token_file`      | `string`            | File containing a bearer token to authenticate with.                                                            |                  | no
 `bearer_token`           | `secret`            | Bearer token to authenticate with.                                                                              |                  | no
+`datacenter`             | `string`            | Datacenter to query. If not provided, the default is used.                                                      |                  | 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
+`namespace`              | `string`            | Namespace to use. Only supported in Consul Enterprise.                                                          |                  | 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
+`node_meta`              | `map(string)`       | Node metadata key/value pairs to filter nodes for a given service.                                              |                  | no
+`partition`              | `string`            | Admin partition to use. Only supported in Consul Enterprise.                                                    |                  | no
+`password`               | `secret`            | The password to use. Deprecated in favor of the `basic_auth` configuration.                                     |                  | 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 list of containers.                                                                        | `"30s"`          | no
+`scheme`                 | `string`            | The scheme to use when talking to Consul.                                                                       | `http`           | no
+`server`                 | `string`            | Host and port of the Consul API.                                                                                | `localhost:8500` | no
+`services`               | `list(string)`      | A list of services for which targets are retrieved. If omitted, all services are scraped.                       |                  | no
+`tag_separator`          | `string`            | The string by which Consul tags are joined into the tag label.                                                  | `,`              | no
+`tags`                   | `list(string)`      | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.  |                  | no
+`token`                  | `secret`            | Secret token used to access the Consul API.                                                                     |                  | no
+`username`               | `string`            | The username to use. Deprecated in favor of the `basic_auth` configuration.                                     |                  | 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` block][authorization]
+* [`basic_auth` block][basic_auth]
+* [`bearer_token_file` argument](#arguments)
+* [`bearer_token` argument](#arguments)
+* [`oauth2` block][oauth2]
 
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -63,13 +64,12 @@ Name                     | Type                | Description
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.consul`:
+The following blocks are supported inside the definition of `discovery.consul`:
 
 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
+basic_auth          | [basic_auth][]    | Configure `basic_auth` for authenticating 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
@@ -82,19 +82,19 @@ For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside
 [oauth2]: #oauth2-block
 [tls_config]: #tls_config-block
 
-### basic_auth block
+### authorization
 
-{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### authorization block
+### basic_auth
 
-{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### oauth2 block
+### oauth2
 
 {{< docs/shared lookup="reference/components/oauth2-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -109,9 +109,9 @@ Name      | Type                | Description
 Each target includes the following labels:
 
 * `__meta_consul_address`: The address of the target.
-* `__meta_consul_partition`: The admin partition name where the service is registered.
 * `__meta_consul_metadata_<key>`: Each node metadata key value of the target.
 * `__meta_consul_node`: The node name defined for the target.
+* `__meta_consul_partition`: The admin partition name where the service is registered.
 * `__meta_consul_service_address`: The service address of the target.
 * `__meta_consul_service_id`: The service ID of the target.
 * `__meta_consul_service_metadata_<key>`: Each service metadata key value of the target.
@@ -162,10 +162,12 @@ prometheus.remote_write "demo" {
   }
 }
 ```
+
 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.consulagent.md b/docs/sources/reference/components/discovery/discovery.consulagent.md
index 17eb8acb6a..00a00c089a 100644
--- a/docs/sources/reference/components/discovery/discovery.consulagent.md
+++ b/docs/sources/reference/components/discovery/discovery.consulagent.md
@@ -17,8 +17,8 @@ This is suitable for very large Consul clusters for which using the Catalog API
 ## Usage
 
 ```alloy
-discovery.consulagent "LABEL" {
-  server = CONSUL_SERVER
+discovery.consulagent "<LABEL>" {
+  server = <CONSUL_SERVER>
 }
 ```
 
@@ -26,31 +26,30 @@ discovery.consulagent "LABEL" {
 
 The following arguments are supported:
 
-| Name               | Type           | Description                                                                                                                          | Default          | Required |
-|--------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------|------------------|----------|
-| `server`           | `string`       | Host and port of the Consul Agent API.                                                                                               | `localhost:8500` | no       |
-| `token`            | `secret`       | Secret token used to access the Consul Agent API.                                                                                    |                  | no       |
-| `datacenter`       | `string`       | Datacenter in which the Consul Agent is configured to run. If not provided, the datacenter is retrieved from the local Consul Agent. |                  | no       |
-| `tag_separator`    | `string`       | The string by which Consul tags are joined into the tag label.                                                                       | `,`              | no       |
-| `scheme`           | `string`       | The scheme to use when talking to the Consul Agent.                                                                                  | `http`           | no       |
-| `username`         | `string`       | The username to use.                                                                                                                 |                  | no       |
-| `password`         | `secret`       | The password to use.                                                                                                                 |                  | no       |
-| `services`         | `list(string)` | A list of services for which targets are retrieved. If omitted, all services are scraped.                                            |                  | no       |
-| `tags`             | `list(string)` | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.                       |                  | no       |
-| `refresh_interval` | `duration`     | Frequency to refresh list of containers.                                                                                             | `"30s"`          | no       |
+Name               | Type           | Description                                                                                                                          | Default          | Required
+-------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------|------------------|---------
+`datacenter`       | `string`       | Datacenter in which the Consul Agent is configured to run. If not provided, the datacenter is retrieved from the local Consul Agent. |                  | no
+`password`         | `secret`       | The password to use.                                                                                                                 |                  | no
+`refresh_interval` | `duration`     | Frequency to refresh list of containers.                                                                                             | `"30s"`          | no
+`scheme`           | `string`       | The scheme to use when talking to the Consul Agent.                                                                                  | `http`           | no
+`server`           | `string`       | Host and port of the Consul Agent API.                                                                                               | `localhost:8500` | no
+`services`         | `list(string)` | A list of services for which targets are retrieved. If omitted, all services are scraped.                                            |                  | no
+`tag_separator`    | `string`       | The string by which Consul tags are joined into the tag label.                                                                       | `,`              | no
+`tags`             | `list(string)` | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.                       |                  | no
+`token`            | `secret`       | Secret token used to access the Consul Agent API.                                                                                    |                  | no
+`username`         | `string`       | The username to use.                                                                                                                 |                  | no
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.consulagent`:
+The following blocks are supported inside the definition of `discovery.consulagent`:
 
-| Hierarchy  | Block          | Description                                            | Required |
-| ---------- | -------------- | ------------------------------------------------------ | -------- |
-| tls_config | [tls_config][] | Configure TLS settings for connecting to the endpoint. | no       |
+Hierarchy  | Block          | Description                                            | Required
+-----------|----------------|--------------------------------------------------------|---------
+tls_config | [tls_config][] | Configure TLS settings for connecting to the endpoint. | no
 
 [tls_config]: #tls_config-block
 
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -58,24 +57,24 @@ The following blocks are supported inside the definition of
 
 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 the Consul Agent API. |
+Name      | Type                | Description
+----------|---------------------|---------------------------------------------------------
+`targets` | `list(map(string))` | The set of targets discovered from the Consul Agent API.
 
 Each target includes the following labels:
 
-- `__meta_consulagent_address`: The address of the target.
-- `__meta_consulagent_dc`: The datacenter name for the target.
-- `__meta_consulagent_health`: The health status of the service.
-- `__meta_consulagent_metadata_<key>`: Each node metadata key value of the target.
-- `__meta_consulagent_node`: The node name defined for the target.
-- `__meta_consulagent_service`: The name of the service the target belongs to.
-- `__meta_consulagent_service_address`: The service address of the target.
-- `__meta_consulagent_service_id`: The service ID of the target.
-- `__meta_consulagent_service_metadata_<key>`: Each service metadata key value of the target.
-- `__meta_consulagent_service_port`: The service port of the target.
-- `__meta_consulagent_tagged_address_<key>`: Each node tagged address key value of the target.
-- `__meta_consulagent_tags`: The list of tags of the target joined by the tag separator.
+* `__meta_consulagent_address`: The address of the target.
+* `__meta_consulagent_dc`: The datacenter name for the target.
+* `__meta_consulagent_health`: The health status of the service.
+* `__meta_consulagent_metadata_<key>`: Each node metadata key value of the target.
+* `__meta_consulagent_node`: The node name defined for the target.
+* `__meta_consulagent_service_address`: The service address of the target.
+* `__meta_consulagent_service_id`: The service ID of the target.
+* `__meta_consulagent_service_metadata_<key>`: Each service metadata key value of the target.
+* `__meta_consulagent_service_port`: The service port of the target.
+* `__meta_consulagent_service`: The name of the service the target belongs to.
+* `__meta_consulagent_tagged_address_<key>`: Each node tagged address key value of the target.
+* `__meta_consulagent_tags`: The list of tags of the target joined by the tag separator.
 
 ## Component health
 
@@ -88,8 +87,8 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug metrics
 
-- `discovery_consulagent_rpc_failures_total` (Counter): The number of Consul Agent RPC call failures.
-- `discovery_consulagent_rpc_duration_seconds` (SummaryVec): The duration of a Consul Agent RPC call in seconds.
+* `discovery_consulagent_rpc_duration_seconds` (SummaryVec): The duration of a Consul Agent RPC call in seconds.
+* `discovery_consulagent_rpc_failures_total` (Counter): The number of Consul Agent RPC call failures.
 
 ## Example
 
@@ -124,9 +123,9 @@ prometheus.remote_write "demo" {
 
 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 -->
 

From a91634a4e2d932c77c36c6ed277d986af409fff6 Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Mon, 13 Jan 2025 11:48:35 -0800
Subject: [PATCH 2/6] Update dogitalocean, dns, and docker topics

---
 .../discovery/discovery.digitalocean.md       | 34 ++++---
 .../components/discovery/discovery.dns.md     | 28 +++---
 .../components/discovery/discovery.docker.md  | 99 ++++++++++---------
 3 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.digitalocean.md b/docs/sources/reference/components/discovery/discovery.digitalocean.md
index f0f4bcbcc0..0a0224effc 100644
--- a/docs/sources/reference/components/discovery/discovery.digitalocean.md
+++ b/docs/sources/reference/components/discovery/discovery.digitalocean.md
@@ -28,16 +28,16 @@ The following arguments are supported:
 
 Name                     | Type                | Description                                                                                      | Default | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|---------|---------
-`port`                   | `number`            | Port to be appended to the `__address__` label for each Droplet.                                 | `80`    | no
-`refresh_interval`       | `duration`          | Frequency to refresh list of Droplets.                                                           | `"1m"`  | no
-`bearer_token`           | `secret`            | Bearer token to authenticate with.                                                               |         | no
 `bearer_token_file`      | `string`            | File containing a bearer token to authenticate with.                                             |         | no
-`proxy_url`              | `string`            | HTTP proxy to send requests through.                                                             |         | 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
 `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`            | Port to be appended to the `__address__` label for each Droplet.                                 | `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 refresh list of Droplets.                                                           | `"1m"`  | no
 
 The DigitalOcean API uses bearer tokens for authentication, see more about it in the [DigitalOcean API documentation](https://docs.digitalocean.com/reference/api/api-reference/#section/Authentication).
 
@@ -48,8 +48,8 @@ Exactly one of the [`bearer_token`](#arguments) and [`bearer_token_file`](#argum
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
 ## Blocks
-The `discovery.digitalocean` component doesn't support any blocks, and is configured fully through arguments.
 
+The `discovery.digitalocean` component doesn't support any blocks, and is configured fully through arguments.
 
 ## Exported fields
 
@@ -63,15 +63,15 @@ Each target includes the following labels:
 
 * `__meta_digitalocean_droplet_id`: ID of the Droplet.
 * `__meta_digitalocean_droplet_name`: Name of the Droplet.
-* `__meta_digitalocean_image`: The image slug (unique text identifier of the image) used to create the Droplet.
+* `__meta_digitalocean_features`: Optional properties configured for the Droplet, such as IPV6 networking, private networking, or backups.
 * `__meta_digitalocean_image_name`: Name of the image used to create the Droplet.
+* `__meta_digitalocean_image`: The image slug (unique text identifier of the image) used to create the Droplet.
 * `__meta_digitalocean_private_ipv4`: The private IPv4 address of the Droplet.
 * `__meta_digitalocean_public_ipv4`: The public IPv4 address of the Droplet.
 * `__meta_digitalocean_public_ipv6`: The public IPv6 address of the Droplet.
 * `__meta_digitalocean_region`: The region the Droplet is running in.
 * `__meta_digitalocean_size`: The size of the Droplet.
 * `__meta_digitalocean_status`: The current status of the Droplet.
-* `__meta_digitalocean_features`: Optional properties configured for the Droplet, such as IPV6 networking, private networking, or backups.
 * `__meta_digitalocean_tags`: The tags assigned to the Droplet.
 * `__meta_digitalocean_vpc`: The ID of the VPC where the Droplet is located.
 
@@ -79,9 +79,8 @@ Each discovered Droplet maps to one target.
 
 ## Component health
 
-`discovery.digitalocean` is only reported as unhealthy when given an invalid
-configuration. In those cases, exported fields retain their last healthy
-values.
+`discovery.digitalocean` is only reported as unhealthy when given an invalid configuration.
+In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
@@ -94,6 +93,7 @@ values.
 ## Example
 
 This would result in targets with `__address__` labels like: `192.0.2.1:8080`:
+
 ```alloy
 discovery.digitalocean "example" {
   port             = 8080
@@ -117,10 +117,12 @@ prometheus.remote_write "demo" {
   }
 }
 ```
+
 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.dns.md b/docs/sources/reference/components/discovery/discovery.dns.md
index 7c441b8bf1..17613a0526 100644
--- a/docs/sources/reference/components/discovery/discovery.dns.md
+++ b/docs/sources/reference/components/discovery/discovery.dns.md
@@ -33,17 +33,17 @@ Name               | Type           | Description
 
 The following field is exported and can be referenced by other components:
 
-Name | Type | Description
----- | ---- | -----------
+Name      | Type                | Description
+----------|---------------------|---------------------------------------------------
 `targets` | `list(map(string))` | The set of targets discovered from the docker API.
 
 Each target includes the following labels:
 
-* `__meta_dns_name`: Name of the record that produced the discovered target.
-* `__meta_dns_srv_record_target`: Target field of the SRV record.
-* `__meta_dns_srv_record_port`: Port field of the SRV record.
 * `__meta_dns_mx_record_target`: Target field of the MX record.
+* `__meta_dns_name`: Name of the record that produced the discovered target.
 * `__meta_dns_ns_record_target`: Target field of the NS record.
+* `__meta_dns_srv_record_port`: Port field of the SRV record.
+* `__meta_dns_srv_record_target`: Target field of the SRV record.
 
 ## Component health
 
@@ -52,11 +52,11 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.dns` does not expose any component-specific debug information.
+`discovery.dns` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.dns` does not expose any component-specific debug metrics.
+`discovery.dns` doesn't expose any component-specific debug metrics.
 
 ## Example
 
@@ -76,19 +76,21 @@ 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:
-  - `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.docker.md b/docs/sources/reference/components/discovery/discovery.docker.md
index e1a689515f..aa033764f7 100644
--- a/docs/sources/reference/components/discovery/discovery.docker.md
+++ b/docs/sources/reference/components/discovery/discovery.docker.md
@@ -15,8 +15,8 @@ title: discovery.docker
 ## Usage
 
 ```alloy
-discovery.docker "LABEL" {
-  host = DOCKER_ENGINE_HOST
+discovery.docker "<LABEL>" {
+  host = <DOCKER_ENGINE_HOST>
 }
 ```
 
@@ -27,24 +27,25 @@ The following arguments are supported:
 Name                     | Type                | Description                                                                                      | Default       | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|---------------|---------
 `host`                   | `string`            | Address of the Docker Daemon to connect to.                                                      |               | yes
-`port`                   | `number`            | Port to use for collecting metrics when containers don't have any port mappings.                 | `80`          | no
-`host_networking_host`   | `string`            | Host to use if the container is in host networking mode.                                         | `"localhost"` | no
-`refresh_interval`       | `duration`          | Frequency to refresh list of containers.                                                         | `"1m"`        | 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
+`host_networking_host`   | `string`            | Host to use if the container is in host networking mode.                                         | `"localhost"` | 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`            | Port to use for collecting metrics when containers don't have any port mappings.                 | `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 list of containers.                                                         | `"1m"`        | 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` block][authorization]
+* [`basic_auth` block][basic_auth]
+* [`bearer_token_file` argument](#arguments)
+* [`bearer_token` argument](#arguments)
+* [`oauth2` block][oauth2]
 
 [arguments]: #arguments
 
@@ -52,14 +53,13 @@ Name                     | Type                | Description
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.docker`:
+The following blocks are supported inside the definition of `discovery.docker`:
 
 Hierarchy           | Block             | Description                                              | Required
 --------------------|-------------------|----------------------------------------------------------|---------
-filter              | [filter][]        | Filters discoverable resources.                          | no
-basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint. | no
 authorization       | [authorization][] | Configure generic authorization to the endpoint.         | no
+basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint. | no
+filter              | [filter][]        | Filters discoverable resources.                          | 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
@@ -73,7 +73,15 @@ For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside
 [oauth2]: #oauth2-block
 [tls_config]: #tls_config-block
 
-### filter block
+### authorization
+
+{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+
+### basic_auth
+
+{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+
+### filter
 
 The `filter` block configures a filter to pass to the Docker Engine to limit the amount of containers returned.
 The `filter` block can be specified multiple times to provide more than one filter.
@@ -87,19 +95,11 @@ Refer to [List containers][List containers] from the Docker Engine API documenta
 
 [List containers]: https://docs.docker.com/engine/api/v1.41/#tag/Container/operation/ContainerList
 
-### basic_auth block
-
-{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
-
-### authorization block
-
-{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
-
-### oauth2 block
+### oauth2
 
 {{< docs/shared lookup="reference/components/oauth2-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -114,19 +114,19 @@ Name      | Type                | Description
 Each target includes the following labels:
 
 * `__meta_docker_container_id`: ID of the container.
+* `__meta_docker_container_label_<labelname>`: Each label from the container.
 * `__meta_docker_container_name`: Name of the container.
 * `__meta_docker_container_network_mode`: Network mode of the container.
-* `__meta_docker_container_label_<labelname>`: Each label from the container.
 * `__meta_docker_network_id`: ID of the Docker network the container is in.
-* `__meta_docker_network_name`: Name of the Docker network the container is in.
 * `__meta_docker_network_ingress`: Set to `true` if the Docker network is an ingress network.
 * `__meta_docker_network_internal`: Set to `true` if the Docker network is an internal network.
+* `__meta_docker_network_ip`: The IP of the container in the network.
 * `__meta_docker_network_label_<labelname>`: Each label from the network the container is in.
+* `__meta_docker_network_name`: Name of the Docker network the container is in.
 * `__meta_docker_network_scope`: The scope of the network the container is in.
-* `__meta_docker_network_ip`: The IP of the container in the network.
 * `__meta_docker_port_private`: The private port on the container.
-* `__meta_docker_port_public`: The publicly exposed port from the container, if a port mapping exists.
 * `__meta_docker_port_public_ip`: The public IP of the container, if a port mapping exists.
+* `__meta_docker_port_public`: The publicly exposed port from the container, if a port mapping exists.
 
 Each discovered container maps to one target per unique combination of networks and port mappings used by the container.
 
@@ -137,11 +137,11 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.docker` does not expose any component-specific debug information.
+`discovery.docker` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.docker` does not expose any component-specific debug metrics.
+`discovery.docker` doesn't expose any component-specific debug metrics.
 
 ## Examples
 
@@ -161,19 +161,21 @@ 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:
-  - `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.
 
 ### Windows hosts
 
@@ -191,22 +193,25 @@ 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:
-  - `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.
 
-> **NOTE**: This example requires the "Expose daemon on tcp://localhost:2375
-> without TLS" setting to be enabled in the Docker Engine settings.
+* _`<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.
+
+{{< admonition type="note" >}}
+This example requires the "Expose daemon on tcp://localhost:2375 without TLS" setting to be enabled in the Docker Engine settings.
+{{< /admonition >}}
 
 <!-- START GENERATED COMPATIBLE COMPONENTS -->
 

From a9e00ee0aaf712ea2e9c287155da9e4c7165c40d Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Tue, 14 Jan 2025 09:40:58 -0800
Subject: [PATCH 3/6] Additional style cleanup

---
 .../components/discovery/discovery.azure.md   |   6 +-
 .../components/discovery/discovery.consul.md  |   8 +-
 .../discovery/discovery.consulagent.md        |   2 +-
 .../discovery/discovery.digitalocean.md       |   2 +-
 .../components/discovery/discovery.docker.md  |  14 +-
 .../discovery/discovery.dockerswarm.md        | 131 +++++++++---------
 6 files changed, 81 insertions(+), 82 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.azure.md b/docs/sources/reference/components/discovery/discovery.azure.md
index a2fb6000dc..579d00f2e7 100644
--- a/docs/sources/reference/components/discovery/discovery.azure.md
+++ b/docs/sources/reference/components/discovery/discovery.azure.md
@@ -50,9 +50,9 @@ tls_config       | [tls_config][]       | TLS configuration for requests to the
 
 Exactly one of the `oauth` or `managed_identity` blocks must be specified.
 
-[managed_identity]: #managed_identity-block
-[oauth]: #oauth-block
-[tls_config]: #tls_config-block
+[managed_identity]: #managed_identity
+[oauth]: #oauth
+[tls_config]: #tls_config
 
 ### managed_identity
 
diff --git a/docs/sources/reference/components/discovery/discovery.consul.md b/docs/sources/reference/components/discovery/discovery.consul.md
index 53646c5829..d41007f326 100644
--- a/docs/sources/reference/components/discovery/discovery.consul.md
+++ b/docs/sources/reference/components/discovery/discovery.consul.md
@@ -77,10 +77,10 @@ tls_config          | [tls_config][]    | Configure TLS settings for connecting
 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
+[authorization]: #authorization
+[basic_auth]: #basic_auth
+[oauth2]: #oauth2
+[tls_config]: #tls_config
 
 ### authorization
 
diff --git a/docs/sources/reference/components/discovery/discovery.consulagent.md b/docs/sources/reference/components/discovery/discovery.consulagent.md
index 00a00c089a..09cf9272ca 100644
--- a/docs/sources/reference/components/discovery/discovery.consulagent.md
+++ b/docs/sources/reference/components/discovery/discovery.consulagent.md
@@ -47,7 +47,7 @@ Hierarchy  | Block          | Description
 -----------|----------------|--------------------------------------------------------|---------
 tls_config | [tls_config][] | Configure TLS settings for connecting to the endpoint. | no
 
-[tls_config]: #tls_config-block
+[tls_config]: #tls_config
 
 ### tls_config
 
diff --git a/docs/sources/reference/components/discovery/discovery.digitalocean.md b/docs/sources/reference/components/discovery/discovery.digitalocean.md
index 0a0224effc..ad257cb2d4 100644
--- a/docs/sources/reference/components/discovery/discovery.digitalocean.md
+++ b/docs/sources/reference/components/discovery/discovery.digitalocean.md
@@ -41,7 +41,7 @@ Name                     | Type                | Description
 
 The DigitalOcean API uses bearer tokens for authentication, see more about it in the [DigitalOcean API documentation](https://docs.digitalocean.com/reference/api/api-reference/#section/Authentication).
 
-Exactly one of the [`bearer_token`](#arguments) and [`bearer_token_file`](#arguments) arguments must be specified to authenticate against DigitalOcean.
+Exactly one of the [`bearer_token`][arguments] and [`bearer_token_file`][arguments] arguments must be specified to authenticate against DigitalOcean.
 
 [arguments]: #arguments
 
diff --git a/docs/sources/reference/components/discovery/discovery.docker.md b/docs/sources/reference/components/discovery/discovery.docker.md
index aa033764f7..99a0d2d3e4 100644
--- a/docs/sources/reference/components/discovery/discovery.docker.md
+++ b/docs/sources/reference/components/discovery/discovery.docker.md
@@ -43,8 +43,8 @@ Name                     | Type                | Description
 
 * [`authorization` block][authorization]
 * [`basic_auth` block][basic_auth]
-* [`bearer_token_file` argument](#arguments)
-* [`bearer_token` argument](#arguments)
+* [`bearer_token_file` argument][arguments]
+* [`bearer_token` argument][arguments]
 * [`oauth2` block][oauth2]
 
 [arguments]: #arguments
@@ -67,11 +67,11 @@ tls_config          | [tls_config][]    | Configure TLS settings for connecting
 The `>` symbol indicates deeper levels of nesting.
 For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
 
-[filter]: #filter-block
-[basic_auth]: #basic_auth-block
-[authorization]: #authorization-block
-[oauth2]: #oauth2-block
-[tls_config]: #tls_config-block
+[filter]: #filter
+[basic_auth]: #basic_auth
+[authorization]: #authorization
+[oauth2]: #oauth2
+[tls_config]: #tls_config
 
 ### authorization
 
diff --git a/docs/sources/reference/components/discovery/discovery.dockerswarm.md b/docs/sources/reference/components/discovery/discovery.dockerswarm.md
index ce3a636105..f21f55293f 100644
--- a/docs/sources/reference/components/discovery/discovery.dockerswarm.md
+++ b/docs/sources/reference/components/discovery/discovery.dockerswarm.md
@@ -13,9 +13,9 @@ title: discovery.dockerswarm
 ## Usage
 
 ```alloy
-discovery.dockerswarm "LABEL" {
-  host = "DOCKER_DAEMON_HOST"
-  role = "SWARM_ROLE"
+discovery.dockerswarm "<LABEL>" {
+  host = "<DOCKER_DAEMON_HOST>"
+  role = "<SWARM_ROLE>"
 }
 ```
 
@@ -27,23 +27,24 @@ Name                     | Type                | Description
 -------------------------|---------------------|-------------------------------------------------------------------------------------------------------------------------------|---------|---------
 `host`                   | `string`            | Address of the Docker daemon.                                                                                                 |         | yes
 `role`                   | `string`            | Role of the targets to retrieve. Must be `services`, `tasks`, or `nodes`.                                                     |         | yes
-`port`                   | `number`            | The port to scrape metrics from, when `role` is nodes, and for discovered tasks and services that don't have published ports. | `80`    | no
-`refresh_interval`       | `duration`          | Interval at which to refresh the list of targets.                                                                             | `"60s"` | 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
+`port`                   | `number`            | The port to scrape metrics from, when `role` is nodes, and for discovered tasks and services that don't have published ports. | `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`          | Interval at which to refresh the list of targets.                                                                             | `"60s"` | 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` block][authorization]
+* [`basic_auth` block][basic_auth]
+* [`bearer_token_file` argument](#arguments)
+* [`bearer_token` argument](#arguments)
+* [`oauth2` block][oauth2]
 
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -51,58 +52,56 @@ Name                     | Type                | Description
 
 ## Blocks
 
-The following blocks are supported inside the definition of
-`discovery.dockerswarm`:
+The following blocks are supported inside the definition of `discovery.dockerswarm`:
 
-| Hierarchy           | Block             | Description                                                                        | Required |
-| ------------------- | ----------------- | ---------------------------------------------------------------------------------- | -------- |
-| filter              | [filter][]        | Optional filter to limit the discovery process to a subset of available resources. | no       |
-| 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       |
+Hierarchy           | Block             | Description                                                                        | Required
+--------------------|-------------------|------------------------------------------------------------------------------------|---------
+authorization       | [authorization][] | Configure generic authorization to the endpoint.                                   | no
+basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint.                           | no
+filter              | [filter][]        | Optional filter to limit the discovery process to a subset of available resources. | 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
 
-The `>` symbol indicates deeper levels of nesting. For example,
-`oauth2 > tls_config` refers to a `tls_config` block defined inside
-an `oauth2` block.
+The `>` symbol indicates deeper levels of nesting.
+For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
 
-[filter]: #filter-block
-[basic_auth]: #basic_auth-block
-[authorization]: #authorization-block
-[oauth2]: #oauth2-block
-[tls_config]: #tls_config-block
+[filter]: #filter
+[basic_auth]: #basic_auth
+[authorization]: #authorization
+[oauth2]: #oauth2
+[tls_config]: #tls_config
 
-### filter block
+### authorization
 
-Filters can be used to limit the discovery process to a subset of available resources.
-It is possible to define multiple `filter` blocks within the `discovery.dockerswarm` block.
-The list of available filters depends on the `role`:
+{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-- [services filters](https://docs.docker.com/engine/api/v1.40/#operation/ServiceList)
-- [tasks filters](https://docs.docker.com/engine/api/v1.40/#operation/TaskList)
-- [nodes filters](https://docs.docker.com/engine/api/v1.40/#operation/NodeList)
+### basic_auth
 
-The following arguments can be used to configure a filter.
+{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-| Name     | Type           | Description                                | Default | Required |
-| -------- | -------------- | ------------------------------------------ | ------- | -------- |
-| `name`   | `string`       | Name of the filter.                        |         | yes      |
-| `values` | `list(string)` | List of values associated with the filter. |         | yes      |
+### filter
 
-### basic_auth block
+Filters can be used to limit the discovery process to a subset of available resources.
+It is possible to define multiple `filter` blocks within the `discovery.dockerswarm` block.
+The list of available filters depends on the `role`:
 
-{{< docs/shared lookup="reference/components/basic-auth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+* [nodes filters](https://docs.docker.com/engine/api/v1.40/#operation/NodeList)
+* [services filters](https://docs.docker.com/engine/api/v1.40/#operation/ServiceList)
+* [tasks filters](https://docs.docker.com/engine/api/v1.40/#operation/TaskList)
 
-### authorization block
+The following arguments can be used to configure a filter.
 
-{{< docs/shared lookup="reference/components/authorization-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
+Name     | Type           | Description                                | Default | Required
+---------|----------------|--------------------------------------------|---------|---------
+`name`   | `string`       | Name of the filter.                        |         | yes
+`values` | `list(string)` | List of values associated with the filter. |         | yes
 
-### oauth2 block
+### oauth2
 
 {{< docs/shared lookup="reference/components/oauth2-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
-### tls_config block
+### tls_config
 
 {{< docs/shared lookup="reference/components/tls-config-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
@@ -110,9 +109,9 @@ The following arguments can be used to configure a filter.
 
 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 Swarm. |
+Name      | Type                | Description
+----------|---------------------|------------------------------------------
+`targets` | `list(map(string))` | The set of targets discovered from Swarm.
 
 ## Roles
 
@@ -126,21 +125,21 @@ If a service has no published ports, a target per service is created using the `
 
 Available meta labels:
 
-- `__meta_dockerswarm_service_id`: the ID of the service.
-- `__meta_dockerswarm_service_name`: the name of the service.
-- `__meta_dockerswarm_service_mode`: the mode of the service.
-- `__meta_dockerswarm_service_endpoint_port_name`: the name of the endpoint port, if available.
-- `__meta_dockerswarm_service_endpoint_port_publish_mode`: the publish mode of the endpoint port.
-- `__meta_dockerswarm_service_label_<labelname>`: each label of the service.
-- `__meta_dockerswarm_service_task_container_hostname`: the container hostname of the target, if available.
-- `__meta_dockerswarm_service_task_container_image`: the container image of the target.
-- `__meta_dockerswarm_service_updating_status`: the status of the service, if available.
-- `__meta_dockerswarm_network_id`: the ID of the network.
-- `__meta_dockerswarm_network_name`: the name of the network.
-- `__meta_dockerswarm_network_ingress`: whether the network is ingress.
-- `__meta_dockerswarm_network_internal`: whether the network is internal.
-- `__meta_dockerswarm_network_label_<labelname>`: each label of the network.
-- `__meta_dockerswarm_network_scope`: the scope of the network.
+* `__meta_dockerswarm_network_id`: the ID of the network.
+* `__meta_dockerswarm_network_ingress`: whether the network is ingress.
+* `__meta_dockerswarm_network_internal`: whether the network is internal.
+* `__meta_dockerswarm_network_label_<labelname>`: each label of the network.
+* `__meta_dockerswarm_network_name`: the name of the network.
+* `__meta_dockerswarm_network_scope`: the scope of the network.
+* `__meta_dockerswarm_service_endpoint_port_name`: the name of the endpoint port, if available.
+* `__meta_dockerswarm_service_endpoint_port_publish_mode`: the publish mode of the endpoint port.
+* `__meta_dockerswarm_service_id`: the ID of the service.
+* `__meta_dockerswarm_service_label_<labelname>`: each label of the service.
+* `__meta_dockerswarm_service_mode`: the mode of the service.
+* `__meta_dockerswarm_service_name`: the name of the service.
+* `__meta_dockerswarm_service_task_container_hostname`: the container hostname of the target, if available.
+* `__meta_dockerswarm_service_task_container_image`: the container image of the target.
+* `__meta_dockerswarm_service_updating_status`: the status of the service, if available.
 
 ### tasks
 

From 5829494e75d5fdd92874d5d68ecce52c93ad7e4c Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Tue, 14 Jan 2025 10:06:21 -0800
Subject: [PATCH 4/6] Linting updates and edits

---
 .../components/discovery/discovery.azure.md   | 29 +++++++++--------
 .../components/discovery/discovery.consul.md  |  8 ++---
 .../discovery/discovery.consulagent.md        | 32 +++++++++----------
 .../discovery/discovery.digitalocean.md       |  4 +--
 .../components/discovery/discovery.dns.md     |  4 +--
 5 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.azure.md b/docs/sources/reference/components/discovery/discovery.azure.md
index 579d00f2e7..b866e4db31 100644
--- a/docs/sources/reference/components/discovery/discovery.azure.md
+++ b/docs/sources/reference/components/discovery/discovery.azure.md
@@ -21,7 +21,7 @@ discovery.azure "<LABEL>" {
 
 ## Arguments
 
-The following arguments are supported:
+You can use the following arguments with `discovery.azure`:
 
 Name                     | Type                | Description                                                                                      | Default              | Required
 -------------------------|---------------------|--------------------------------------------------------------------------------------------------|----------------------|---------
@@ -29,7 +29,7 @@ Name                     | Type                | Description
 `environment`            | `string`            | Azure environment.                                                                               | `"AzurePublicCloud"` | 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
-`port`                   | `number`            | Port to be appended to the `__address__` label for each target.                                  | `80`                 | no
+`port`                   | `number`            | The port appended to the `__address__` label for each target.                                    | `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
@@ -45,7 +45,7 @@ The following blocks are supported inside the definition of `discovery.azure`:
 Hierarchy        | Block                | Description                                      | Required
 -----------------|----------------------|--------------------------------------------------|---------
 managed_identity | [managed_identity][] | Managed Identity configuration for Azure API.    | no
-oauth            | [oauth][]            | OAuth configuration for Azure API.               | no
+oauth            | [oauth][]            | OAuth 2.0 configuration for Azure API.           | no
 tls_config       | [tls_config][]       | TLS configuration for requests to the Azure API. | no
 
 Exactly one of the `oauth` or `managed_identity` blocks must be specified.
@@ -64,13 +64,13 @@ Name        | Type     | Description                 | Default | Required
 
 ### oauth
 
-The `oauth` block configures OAuth authentication for the Azure API.
+The `oauth` block configures OAuth 2.0 authentication for the Azure API.
 
-Name            | Type     | Description          | Default | Required
-----------------|----------|----------------------|---------|---------
-`client_id`     | `string` | OAuth client ID.     |         | yes
-`client_secret` | `string` | OAuth client secret. |         | yes
-`tenant_id`     | `string` | OAuth tenant ID.     |         | yes
+Name            | Type     | Description              | Default | Required
+----------------|----------|--------------------------|---------|---------
+`client_id`     | `string` | OAuth 2.0 client ID.     |         | yes
+`client_secret` | `string` | OAuth 2.0 client secret. |         | yes
+`tenant_id`     | `string` | OAuth 2.0 tenant ID.     |         | yes
 
 ### tls_config
 
@@ -90,17 +90,18 @@ Each target includes the following labels:
 * `__meta_azure_machine_id`: The UUID of the Azure VM.
 * `__meta_azure_machine_location`: The region the VM is in.
 * `__meta_azure_machine_name`: The name of the VM.
-* `__meta_azure_machine_os_type`: The OS the VM is running (either `Linux` or `Windows`).
+* `__meta_azure_machine_os_type`: The OS the VM is running, either `Linux` or `Windows`.
 * `__meta_azure_machine_private_ip`: The private IP address of the VM.
 * `__meta_azure_machine_public_ip`: The public IP address of the VM.
 * `__meta_azure_machine_resource_group`: The name of the resource group the VM is in.
 * `__meta_azure_machine_scale_set`: The name of the scale set the VM is in.
 * `__meta_azure_machine_size`: The size of the VM.
-* `__meta_azure_machine_tag_*`: A tag on the VM. There will be one label per tag.
+* `__meta_azure_machine_tag_*`: A tag on the VM. There is one label per tag.
 * `__meta_azure_subscription_id`: The Azure subscription ID.
 * `__meta_azure_tenant_id`: The Azure tenant ID.
 
-Each discovered VM maps to a single target. The `__address__` label is set to the `private_ip:port` (`[private_ip]:port` if the private IP is an IPv6 address) of the VM.
+Each discovered VM maps to a single target.
+The `__address__` label is set to the `private_ip:port` of the VM if the private IP is an IPv4 address, or `[private_ip]:port` if the private IP of the VM is an IPv6 address.
 
 ## Component health
 
@@ -152,8 +153,8 @@ Replace the following:
 * _`<AZURE_CLIENT_SECRET>`_: Your Azure client secret.
 * _`<AZURE_TENANT_ID>`_: Your Azure tenant ID.
 * _`<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.
+* _`<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.consul.md b/docs/sources/reference/components/discovery/discovery.consul.md
index d41007f326..d108be5a76 100644
--- a/docs/sources/reference/components/discovery/discovery.consul.md
+++ b/docs/sources/reference/components/discovery/discovery.consul.md
@@ -29,7 +29,7 @@ Name                     | Type                | Description
 `allow_stale`            | `bool`              | Allow stale Consul results. Reduces load on Consul. Refer to the [Consul documentation][] for more information. | `true`           | no
 `bearer_token_file`      | `string`            | File containing a bearer token to authenticate with.                                                            |                  | no
 `bearer_token`           | `secret`            | Bearer token to authenticate with.                                                                              |                  | no
-`datacenter`             | `string`            | Datacenter to query. If not provided, the default is used.                                                      |                  | no
+`datacenter`             | `string`            | Data center to query. If not provided, the default is used.                                                     |                  | 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
 `namespace`              | `string`            | Namespace to use. Only supported in Consul Enterprise.                                                          |                  | no
@@ -53,8 +53,8 @@ Name                     | Type                | Description
 
 * [`authorization` block][authorization]
 * [`basic_auth` block][basic_auth]
-* [`bearer_token_file` argument](#arguments)
-* [`bearer_token` argument](#arguments)
+* [`bearer_token_file` argument][arguments]
+* [`bearer_token` argument][arguments]
 * [`oauth2` block][oauth2]
 
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
@@ -111,7 +111,7 @@ Each target includes the following labels:
 * `__meta_consul_address`: The address of the target.
 * `__meta_consul_metadata_<key>`: Each node metadata key value of the target.
 * `__meta_consul_node`: The node name defined for the target.
-* `__meta_consul_partition`: The admin partition name where the service is registered.
+* `__meta_consul_partition`: The administrator partition name where the service is registered.
 * `__meta_consul_service_address`: The service address of the target.
 * `__meta_consul_service_id`: The service ID of the target.
 * `__meta_consul_service_metadata_<key>`: Each service metadata key value of the target.
diff --git a/docs/sources/reference/components/discovery/discovery.consulagent.md b/docs/sources/reference/components/discovery/discovery.consulagent.md
index 09cf9272ca..9c338e37d3 100644
--- a/docs/sources/reference/components/discovery/discovery.consulagent.md
+++ b/docs/sources/reference/components/discovery/discovery.consulagent.md
@@ -9,7 +9,7 @@ title: discovery.consulagent
 # discovery.consulagent
 
 `discovery.consulagent` allows you to retrieve scrape targets from [Consul's Agent API][].
-Only the services registered with the local agent running on the same host will be watched.
+Only the services registered with the local agent running on the same host are watched.
 This is suitable for very large Consul clusters for which using the Catalog API would be too slow or resource intensive.
 
 [Consul's Agent API]: https://developer.hashicorp.com/consul/api-docs/agent
@@ -26,18 +26,18 @@ discovery.consulagent "<LABEL>" {
 
 The following arguments are supported:
 
-Name               | Type           | Description                                                                                                                          | Default          | Required
--------------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------|------------------|---------
-`datacenter`       | `string`       | Datacenter in which the Consul Agent is configured to run. If not provided, the datacenter is retrieved from the local Consul Agent. |                  | no
-`password`         | `secret`       | The password to use.                                                                                                                 |                  | no
-`refresh_interval` | `duration`     | Frequency to refresh list of containers.                                                                                             | `"30s"`          | no
-`scheme`           | `string`       | The scheme to use when talking to the Consul Agent.                                                                                  | `http`           | no
-`server`           | `string`       | Host and port of the Consul Agent API.                                                                                               | `localhost:8500` | no
-`services`         | `list(string)` | A list of services for which targets are retrieved. If omitted, all services are scraped.                                            |                  | no
-`tag_separator`    | `string`       | The string by which Consul tags are joined into the tag label.                                                                       | `,`              | no
-`tags`             | `list(string)` | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.                       |                  | no
-`token`            | `secret`       | Secret token used to access the Consul Agent API.                                                                                    |                  | no
-`username`         | `string`       | The username to use.                                                                                                                 |                  | no
+Name               | Type           | Description                                                                                                                            | Default          | Required
+-------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------|------------------|---------
+`datacenter`       | `string`       | Data center in which the Consul Agent is configured to run. If not provided, the data center is retrieved from the local Consul Agent. |                  | no
+`password`         | `secret`       | The password to use.                                                                                                                   |                  | no
+`refresh_interval` | `duration`     | Frequency to refresh list of containers.                                                                                               | `"30s"`          | no
+`scheme`           | `string`       | The scheme to use when talking to the Consul Agent.                                                                                    | `http`           | no
+`server`           | `string`       | Host and port of the Consul Agent API.                                                                                                 | `localhost:8500` | no
+`services`         | `list(string)` | A list of services for which targets are retrieved. If omitted, all services are scraped.                                              |                  | no
+`tag_separator`    | `string`       | The string by which Consul tags are joined into the tag label.                                                                         | `,`              | no
+`tags`             | `list(string)` | An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.                         |                  | no
+`token`            | `secret`       | Secret token used to access the Consul Agent API.                                                                                      |                  | no
+`username`         | `string`       | The username to use.                                                                                                                   |                  | no
 
 ## Blocks
 
@@ -64,7 +64,7 @@ Name      | Type                | Description
 Each target includes the following labels:
 
 * `__meta_consulagent_address`: The address of the target.
-* `__meta_consulagent_dc`: The datacenter name for the target.
+* `__meta_consulagent_dc`: The data center name for the target.
 * `__meta_consulagent_health`: The health status of the service.
 * `__meta_consulagent_metadata_<key>`: Each node metadata key value of the target.
 * `__meta_consulagent_node`: The node name defined for the target.
@@ -124,8 +124,8 @@ prometheus.remote_write "demo" {
 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.
+* _`<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.digitalocean.md b/docs/sources/reference/components/discovery/discovery.digitalocean.md
index ad257cb2d4..2b04f0ac86 100644
--- a/docs/sources/reference/components/discovery/discovery.digitalocean.md
+++ b/docs/sources/reference/components/discovery/discovery.digitalocean.md
@@ -121,8 +121,8 @@ prometheus.remote_write "demo" {
 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.
+* _`<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.dns.md b/docs/sources/reference/components/discovery/discovery.dns.md
index 17613a0526..64d12f4573 100644
--- a/docs/sources/reference/components/discovery/discovery.dns.md
+++ b/docs/sources/reference/components/discovery/discovery.dns.md
@@ -89,8 +89,8 @@ prometheus.remote_write "demo" {
 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.
+* _`<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 -->
 

From 221a537a55ee7e50960c6bc9a453941b06ad94eb Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Tue, 14 Jan 2025 11:04:06 -0800
Subject: [PATCH 5/6] Syntax and mardown cleanup

---
 .../components/discovery/discovery.consul.md  |   2 +-
 .../components/discovery/discovery.docker.md  |   2 +-
 .../discovery/discovery.dockerswarm.md        | 138 +++++++++---------
 3 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.consul.md b/docs/sources/reference/components/discovery/discovery.consul.md
index d108be5a76..2235578994 100644
--- a/docs/sources/reference/components/discovery/discovery.consul.md
+++ b/docs/sources/reference/components/discovery/discovery.consul.md
@@ -70,7 +70,7 @@ Hierarchy           | Block             | Description
 --------------------|-------------------|------------------------------------------------------------|---------
 authorization       | [authorization][] | Configure generic authorization to the endpoint.           | no
 basic_auth          | [basic_auth][]    | Configure `basic_auth` for authenticating to the endpoint. | no
-oauth2              | [oauth2][]        | Configure OAuth2 for authenticating to the endpoint.       | no
+oauth2              | [oauth2][]        | Configure OAuth 2.0 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
 
diff --git a/docs/sources/reference/components/discovery/discovery.docker.md b/docs/sources/reference/components/discovery/discovery.docker.md
index 99a0d2d3e4..3ebe084df1 100644
--- a/docs/sources/reference/components/discovery/discovery.docker.md
+++ b/docs/sources/reference/components/discovery/discovery.docker.md
@@ -60,7 +60,7 @@ Hierarchy           | Block             | Description
 authorization       | [authorization][] | Configure generic authorization to the endpoint.         | no
 basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint. | no
 filter              | [filter][]        | Filters discoverable resources.                          | no
-oauth2              | [oauth2][]        | Configure OAuth2 for authenticating to the endpoint.     | no
+oauth2              | [oauth2][]        | Configure OAuth 2.0 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
 
diff --git a/docs/sources/reference/components/discovery/discovery.dockerswarm.md b/docs/sources/reference/components/discovery/discovery.dockerswarm.md
index f21f55293f..9e5d92ca1a 100644
--- a/docs/sources/reference/components/discovery/discovery.dockerswarm.md
+++ b/docs/sources/reference/components/discovery/discovery.dockerswarm.md
@@ -42,8 +42,8 @@ Name                     | Type                | Description
 
 * [`authorization` block][authorization]
 * [`basic_auth` block][basic_auth]
-* [`bearer_token_file` argument](#arguments)
-* [`bearer_token` argument](#arguments)
+* [`bearer_token_file` argument][arguments]
+* [`bearer_token` argument][arguments]
 * [`oauth2` block][oauth2]
 
 {{< docs/shared lookup="reference/components/http-client-proxy-config-description.md" source="alloy" version="<ALLOY_VERSION>" >}}
@@ -57,7 +57,7 @@ The following blocks are supported inside the definition of `discovery.dockerswa
 Hierarchy           | Block             | Description                                                                        | Required
 --------------------|-------------------|------------------------------------------------------------------------------------|---------
 authorization       | [authorization][] | Configure generic authorization to the endpoint.                                   | no
-basic_auth          | [basic_auth][]    | Configure basic_auth for authenticating to the endpoint.                           | no
+basic_auth          | [basic_auth][]    | Configure `basic_auth` for authenticating to the endpoint.                         | no
 filter              | [filter][]        | Optional filter to limit the discovery process to a subset of available resources. | 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
@@ -83,7 +83,7 @@ For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside
 ### filter
 
 Filters can be used to limit the discovery process to a subset of available resources.
-It is possible to define multiple `filter` blocks within the `discovery.dockerswarm` block.
+It's possible to define multiple `filter` blocks within the `discovery.dockerswarm` block.
 The list of available filters depends on the `role`:
 
 * [nodes filters](https://docs.docker.com/engine/api/v1.40/#operation/NodeList)
@@ -125,21 +125,21 @@ If a service has no published ports, a target per service is created using the `
 
 Available meta labels:
 
-* `__meta_dockerswarm_network_id`: the ID of the network.
-* `__meta_dockerswarm_network_ingress`: whether the network is ingress.
-* `__meta_dockerswarm_network_internal`: whether the network is internal.
-* `__meta_dockerswarm_network_label_<labelname>`: each label of the network.
-* `__meta_dockerswarm_network_name`: the name of the network.
-* `__meta_dockerswarm_network_scope`: the scope of the network.
-* `__meta_dockerswarm_service_endpoint_port_name`: the name of the endpoint port, if available.
-* `__meta_dockerswarm_service_endpoint_port_publish_mode`: the publish mode of the endpoint port.
-* `__meta_dockerswarm_service_id`: the ID of the service.
-* `__meta_dockerswarm_service_label_<labelname>`: each label of the service.
-* `__meta_dockerswarm_service_mode`: the mode of the service.
-* `__meta_dockerswarm_service_name`: the name of the service.
-* `__meta_dockerswarm_service_task_container_hostname`: the container hostname of the target, if available.
-* `__meta_dockerswarm_service_task_container_image`: the container image of the target.
-* `__meta_dockerswarm_service_updating_status`: the status of the service, if available.
+* `__meta_dockerswarm_network_id`: The ID of the network.
+* `__meta_dockerswarm_network_ingress`: Whether the network is ingress.
+* `__meta_dockerswarm_network_internal`: Whether the network is internal.
+* `__meta_dockerswarm_network_label_<labelname>`: Each label of the network.
+* `__meta_dockerswarm_network_name`: The name of the network.
+* `__meta_dockerswarm_network_scope`: The scope of the network.
+* `__meta_dockerswarm_service_endpoint_port_name`: The name of the endpoint port, if available.
+* `__meta_dockerswarm_service_endpoint_port_publish_mode`: The publish mode of the endpoint port.
+* `__meta_dockerswarm_service_id`: The ID of the service.
+* `__meta_dockerswarm_service_label_<labelname>`: Each label of the service.
+* `__meta_dockerswarm_service_mode`: The mode of the service.
+* `__meta_dockerswarm_service_name`: The name of the service.
+* `__meta_dockerswarm_service_task_container_hostname`: The container hostname of the target, if available.
+* `__meta_dockerswarm_service_task_container_image`: The container image of the target.
+* `__meta_dockerswarm_service_updating_status`: The status of the service, if available.
 
 ### tasks
 
@@ -149,35 +149,35 @@ If a task has no published ports, a target per task is created using the `port`
 
 Available meta labels:
 
-- `__meta_dockerswarm_container_label_<labelname>`: each label of the container.
-- `__meta_dockerswarm_task_id`: the ID of the task.
-- `__meta_dockerswarm_task_container_id`: the container ID of the task.
-- `__meta_dockerswarm_task_desired_state`: the desired state of the task.
-- `__meta_dockerswarm_task_slot`: the slot of the task.
-- `__meta_dockerswarm_task_state`: the state of the task.
-- `__meta_dockerswarm_task_port_publish_mode`: the publish mode of the task port.
-- `__meta_dockerswarm_service_id`: the ID of the service.
-- `__meta_dockerswarm_service_name`: the name of the service.
-- `__meta_dockerswarm_service_mode`: the mode of the service.
-- `__meta_dockerswarm_service_label_<labelname>`: each label of the service.
-- `__meta_dockerswarm_network_id`: the ID of the network.
-- `__meta_dockerswarm_network_name`: the name of the network.
-- `__meta_dockerswarm_network_ingress`: whether the network is ingress.
-- `__meta_dockerswarm_network_internal`: whether the network is internal.
-- `__meta_dockerswarm_network_label_<labelname>`: each label of the network.
-- `__meta_dockerswarm_network_label`: each label of the network.
-- `__meta_dockerswarm_network_scope`: the scope of the network.
-- `__meta_dockerswarm_node_id`: the ID of the node.
-- `__meta_dockerswarm_node_hostname`: the hostname of the node.
-- `__meta_dockerswarm_node_address`: the address of the node.
-- `__meta_dockerswarm_node_availability`: the availability of the node.
-- `__meta_dockerswarm_node_label_<labelname>`: each label of the node.
-- `__meta_dockerswarm_node_platform_architecture`: the architecture of the node.
-- `__meta_dockerswarm_node_platform_os`: the operating system of the node.
-- `__meta_dockerswarm_node_role`: the role of the node.
-- `__meta_dockerswarm_node_status`: the status of the node.
-
-The `__meta_dockerswarm_network_*` meta labels are not populated for ports which are published with mode=host.
+* `__meta_dockerswarm_container_label_<labelname>`: Each label of the container.
+* `__meta_dockerswarm_network_id`: The ID of the network.
+* `__meta_dockerswarm_network_ingress`: Whether the network is ingress.
+* `__meta_dockerswarm_network_internal`: Whether the network is internal.
+* `__meta_dockerswarm_network_label_<labelname>`: Each label of the network.
+* `__meta_dockerswarm_network_label`: Each label of the network.
+* `__meta_dockerswarm_network_name`: The name of the network.
+* `__meta_dockerswarm_network_scope`: The scope of the network.
+* `__meta_dockerswarm_node_address`: The address of the node.
+* `__meta_dockerswarm_node_availability`: The availability of the node.
+* `__meta_dockerswarm_node_hostname`: The hostname of the node.
+* `__meta_dockerswarm_node_id`: The ID of the node.
+* `__meta_dockerswarm_node_label_<labelname>`: Each label of the node.
+* `__meta_dockerswarm_node_platform_architecture`: The architecture of the node.
+* `__meta_dockerswarm_node_platform_os`: The operating system of the node.
+* `__meta_dockerswarm_node_role`: The role of the node.
+* `__meta_dockerswarm_node_status`: The status of the node.
+* `__meta_dockerswarm_service_id`: The ID of the service.
+* `__meta_dockerswarm_service_label_<labelname>`: Each label of the service.
+* `__meta_dockerswarm_service_mode`: The mode of the service.
+* `__meta_dockerswarm_service_name`: The name of the service.
+* `__meta_dockerswarm_task_container_id`: The container ID of the task.
+* `__meta_dockerswarm_task_desired_state`: The desired state of the task.
+* `__meta_dockerswarm_task_id`: The ID of the task.
+* `__meta_dockerswarm_task_port_publish_mode`: The publish mode of the task port.
+* `__meta_dockerswarm_task_slot`: The slot of the task.
+* `__meta_dockerswarm_task_state`: The state of the task.
+
+The `__meta_dockerswarm_network_*` meta labels aren't populated for ports which are published with mode=host.
 
 ### nodes
 
@@ -185,19 +185,19 @@ The `nodes` role is used to discover [Swarm nodes](https://docs.docker.com/engin
 
 Available meta labels:
 
-- `__meta_dockerswarm_node_address`: the address of the node.
-- `__meta_dockerswarm_node_availability`: the availability of the node.
-- `__meta_dockerswarm_node_engine_version`: the version of the node engine.
-- `__meta_dockerswarm_node_hostname`: the hostname of the node.
-- `__meta_dockerswarm_node_id`: the ID of the node.
-- `__meta_dockerswarm_node_label_<labelname>`: each label of the node.
-- `__meta_dockerswarm_node_manager_address`: the address of the manager component of the node.
-- `__meta_dockerswarm_node_manager_leader`: the leadership status of the manager component of the node (true or false).
-- `__meta_dockerswarm_node_manager_reachability`: the reachability of the manager component of the node.
-- `__meta_dockerswarm_node_platform_architecture`: the architecture of the node.
-- `__meta_dockerswarm_node_platform_os`: the operating system of the node.
-- `__meta_dockerswarm_node_role`: the role of the node.
-- `__meta_dockerswarm_node_status`: the status of the node.
+* `__meta_dockerswarm_node_address`: The address of the node.
+* `__meta_dockerswarm_node_availability`: The availability of the node.
+* `__meta_dockerswarm_node_engine_version`: The version of the node engine.
+* `__meta_dockerswarm_node_hostname`: The hostname of the node.
+* `__meta_dockerswarm_node_id`: The ID of the node.
+* `__meta_dockerswarm_node_label_<labelname>`: Each label of the node.
+* `__meta_dockerswarm_node_manager_address`: The address of the manager component of the node.
+* `__meta_dockerswarm_node_manager_leader`: The leadership status of the manager component of the node (true or false).
+* `__meta_dockerswarm_node_manager_reachability`: The reachability of the manager component of the node.
+* `__meta_dockerswarm_node_platform_architecture`: The architecture of the node.
+* `__meta_dockerswarm_node_platform_os`: The operating system of the node.
+* `__meta_dockerswarm_node_role`: The role of the node.
+* `__meta_dockerswarm_node_status`: The status of the node.
 
 ## Component health
 
@@ -206,11 +206,11 @@ In those cases, exported fields retain their last healthy values.
 
 ## Debug information
 
-`discovery.dockerswarm` does not expose any component-specific debug information.
+`discovery.dockerswarm` doesn't expose any component-specific debug information.
 
 ## Debug metrics
 
-`discovery.dockerswarm` does not expose any component-specific debug metrics.
+`discovery.dockerswarm` doesn't expose any component-specific debug metrics.
 
 ## Example
 
@@ -239,11 +239,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>
     }
   }
 }
@@ -251,9 +251,9 @@ prometheus.remote_write "demo" {
 
 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 -->
 

From e56dfd03a8cb295dc9ef30f5ad39a67faf18bec0 Mon Sep 17 00:00:00 2001
From: Clayton Cornell <clayton.cornell@grafana.com>
Date: Fri, 17 Jan 2025 09:59:20 -0800
Subject: [PATCH 6/6] Minor updates from review

---
 .../discovery/discovery.digitalocean.md          |  6 +++---
 .../components/discovery/discovery.dns.md        |  4 ++--
 .../components/discovery/discovery.docker.md     | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/sources/reference/components/discovery/discovery.digitalocean.md b/docs/sources/reference/components/discovery/discovery.digitalocean.md
index 2b04f0ac86..a05bdca94c 100644
--- a/docs/sources/reference/components/discovery/discovery.digitalocean.md
+++ b/docs/sources/reference/components/discovery/discovery.digitalocean.md
@@ -15,10 +15,10 @@ title: discovery.digitalocean
 ## Usage
 
 ```alloy
-discovery.digitalocean "LABEL" {
+discovery.digitalocean "<LABEL>" {
     // Use one of:
-    // bearer_token      = BEARER_TOKEN
-    // bearer_token_file = PATH_TO_BEARER_TOKEN_FILE
+    // bearer_token      = <BEARER_TOKEN>
+    // bearer_token_file = <PATH_TO_BEARER_TOKEN_FILE>
 }
 ```
 
diff --git a/docs/sources/reference/components/discovery/discovery.dns.md b/docs/sources/reference/components/discovery/discovery.dns.md
index 64d12f4573..b2392c42b0 100644
--- a/docs/sources/reference/components/discovery/discovery.dns.md
+++ b/docs/sources/reference/components/discovery/discovery.dns.md
@@ -13,8 +13,8 @@ title: discovery.dns
 ## Usage
 
 ```alloy
-discovery.dns "LABEL" {
-  names = [NAME_1, NAME_2, ...]
+discovery.dns "<LABEL>" {
+  names = [<NAME_1>, <NAME_2>, ...]
 }
 ```
 
diff --git a/docs/sources/reference/components/discovery/discovery.docker.md b/docs/sources/reference/components/discovery/discovery.docker.md
index 3ebe084df1..e380ebf126 100644
--- a/docs/sources/reference/components/discovery/discovery.docker.md
+++ b/docs/sources/reference/components/discovery/discovery.docker.md
@@ -174,13 +174,17 @@ prometheus.remote_write "demo" {
 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.
+* _`<USERNAME>`_: The username to use for authentication to the `remote_write` API.
+* _`<PASSWORD>`_: The password to use for authentication to the `remote_write` API.
 
 ### Windows hosts
 
 This example discovers Docker containers when the host machine is Windows:
 
+{{< admonition type="note" >}}
+This example requires the "Expose daemon on tcp://localhost:2375 without TLS" setting to be enabled in the Docker Engine settings.
+{{< /admonition >}}
+
 ```alloy
 discovery.docker "containers" {
   host = "tcp://localhost:2375"
@@ -206,12 +210,8 @@ prometheus.remote_write "demo" {
 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.
-
-{{< admonition type="note" >}}
-This example requires the "Expose daemon on tcp://localhost:2375 without TLS" setting to be enabled in the Docker Engine settings.
-{{< /admonition >}}
+* _`<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 -->