Merge branch 'main' into fix-broken-link-index

grafana · Oct 16, 2023 · 779b8a0 · 779b8a0
2 parents ad58f80 + 8186196
commit 779b8a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md b/docs/sources/flow/reference/components/prometheus.exporter.blackbox.md
@@ -57,10 +57,13 @@ The following blocks are supported inside the definition of
 The `target` block defines an individual blackbox target.
 The `target` block may be specified multiple times to define multiple targets. The label of the block is required and will be used in the target's `job` label.
 
-| Name      | Type     | Description                         | Default | Required |
-| --------- | -------- | ----------------------------------- | ------- | -------- |
-| `address` | `string` | The address of the target to probe. |         | yes      |
-| `module`  | `string` | Blackbox module to use to probe.    | `""`    | no       |
+| Name      | Type             | Description                         | Default | Required |
+| --------- | ---------------- | ----------------------------------- | ------- | -------- |
+| `address` | `string`         | The address of the target to probe. |         | yes      |
+| `module`  | `string`         | Blackbox module to use to probe.    | `""`    | no       |
+| `labels`  | `map(string)`    | Labels to add to the target.        |         | no       |
+
+Labels specified in the `labels` argument will not override labels set by `blackbox_exporter`.
 
 ## Exported fields
 

diff --git a/docs/sources/flow/setup/install/linux.md b/docs/sources/flow/setup/install/linux.md
@@ -31,8 +31,8 @@ To install Grafana Agent in flow mode on Linux, run the following commands in a
    ```rhel-fedora
    wget -q -O gpg.key https://rpm.grafana.com/gpg.key
    sudo rpm --import gpg.key
-   sudo echo '[grafana]\nname=grafana\nbaseurl=https://rpm.grafana.com\nrepo_gpgcheck=1\nenabled=1\ngpgcheck=1\ngpgkey=https://rpm.grafana.com/gpg.key\nsslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt' > /etc/yum.repos.d/grafana.repo
+   echo -e '[grafana]\nname=grafana\nbaseurl=https://rpm.grafana.com\nrepo_gpgcheck=1\nenabled=1\ngpgcheck=1\ngpgkey=https://rpm.grafana.com/gpg.key\nsslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt' | sudo tee /etc/yum.repos.d/grafana.repo
    ```
 
    ```suse-opensuse