Merge branch 'grafana:main' into main

Author: qclaogui

.gitignore

@@ -97,7 +97,6 @@ Backup of *.doc*
 # NodeJS
 # ---------------------------------------------------
 # Logs
-logs
 *.log
 npm-debug.log*
 yarn-debug.log*

modules/broker/rabbitmq/README.md

@@ -100,7 +100,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all rabbitmq instances in cluster.
 
-```river
+```alloy
 import.git "rabbitmq" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -136,7 +136,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape rabbitmq for metrics on the local machine.
 
-```river
+```alloy
 import.git "rabbitmq" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/cloud/grafana/cloud/README.md

@@ -49,7 +49,7 @@ The token must have permissions to read stack information. The setup of these pe
 
 ### `stack`
 
-```river
+```alloy
 import.git "grafana_cloud" {
   repository = "https://github.com/grafana/alloy-modules.git"
   revision = "main"

modules/collector/agent/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all agents in cluster.
 
-```river
+```alloy
 import.git "agent" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape the agent for metrics on the local machine.
 
-```river
+```alloy
 import.git "agent" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/collector/push-gateway/README.md

@@ -67,7 +67,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all push-gateway in cluster.
 
-```river
+```alloy
 import.git "push_gateway" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/kv/etcd/README.md

@@ -98,7 +98,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all etcd instances in cluster.
 
-```river
+```alloy
 import.git "etcd" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -134,7 +134,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape etcd for metrics on the local machine.
 
-```river
+```alloy
 import.git "etcd" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/kv/memcached/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all memcached instances in cluster.
 
-```river
+```alloy
 import.git "memcached" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape memcached for metrics on the local machine.
 
-```river
+```alloy
 import.git "memcached" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/kv/redis/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all redis instances in cluster.
 
-```river
+```alloy
 import.git "redis" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape redis for metrics on the local machine.
 
-```river
+```alloy
 import.git "redis" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/sql/mysql/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all mysql instances in cluster.
 
-```river
+```alloy
 import.git "mysql" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape mysql for metrics on the local machine.
 
-```river
+```alloy
 import.git "mysql" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/sql/postgres/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all postgres instances in cluster.
 
-```river
+```alloy
 import.git "postgres" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape postgres for metrics on the local machine.
 
-```river
+```alloy
 import.git "postgres" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/timeseries/loki/README.md

@@ -98,7 +98,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all Loki instances in cluster.
 
-```river
+```alloy
 import.git "loki" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -134,7 +134,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape Loki for metrics on the local machine.
 
-```river
+```alloy
 import.git "loki" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/timeseries/mimir/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all Mimir instances in cluster.
 
-```river
+```alloy
 import.git "mimir" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape Mimir for metrics on the local machine.
 
-```river
+```alloy
 import.git "mimir" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/timeseries/pyroscope/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all pyroscope instances in cluster.
 
-```river
+```alloy
 import.git "pyroscope" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape pyroscope for metrics on the local machine.
 
-```river
+```alloy
 import.git "pyroscope" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/databases/timeseries/tempo/README.md

@@ -99,7 +99,7 @@ The following labels are automatically added to exported targets.
 
 The following example will scrape all Tempo instances in cluster.
 
-```river
+```alloy
 import.git "tempo" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
@@ -135,7 +135,7 @@ prometheus.remote_write "local" {
 
 The following example will scrape Tempo for metrics on the local machine.
 
-```river
+```alloy
 import.git "tempo" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"

modules/kubernetes/annotations/README.md

@@ -1,11 +1,11 @@
-# Kubernetes Annotation Modules
+# Kubernetes Metric Annotation Module
 
 **Modules:**
 
--   [`metrics.river`](#metricsriver)
--   [`probes.river`](#probesriver)
+-   [`metrics.alloy`](#metricsalloy)
+-   [`probes.alloy`](#probesalloy)
 
-## `metrics.river`
+## `metrics.alloy`
 
 This module is meant to be used to automatically scrape targets based on a certain role and set of annotations.  This module can be consumed
 multiple times with different roles.  The supported roles are:
@@ -143,8 +143,8 @@ The following labels are automatically added to exported targets.
 | :---------------- | :------- | :---------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `targets`         | _yes_    | `list(map(string))`           | List of targets to scrape                                                                                                                           |
 | `forward_to`      | _yes_    | `list(MetricsReceiver)`       | Must be a where scraped should be forwarded to                                                                                                      |
-| `keep_metrics`    | _no_     | [see code](module.river#L228) | A regular expression of metrics to keep                                                                                                             |
-| `drop_metrics`    | _no_     | [see code](module.river#L235) | A regular expression of metrics to drop                                                                                                             |
+| `keep_metrics`    | _no_     | [see code](module.alloy#L228) | A regular expression of metrics to keep                                                                                                             |
+| `drop_metrics`    | _no_     | [see code](module.alloy#L235) | A regular expression of metrics to drop                                                                                                             |
 | `scrape_interval` | _no_     | `60s`                         | How often to scrape metrics from the targets                                                                                                        |
 | `scrape_timeout`  | _no_     | `10s`                         | How long before a scrape times out                                                                                                                  |
 | `max_cache_size`  | _no_     | `100000`                      | The maximum number of elements to hold in the relabeling cache.  This should be at least 2x-5x your largest scrape target or samples appended rate. |
@@ -156,7 +156,7 @@ N/A
 
 ---
 
-## `probes.river`
+## `probes.alloy`
 
 This module is meant to be used to automatically scrape targets based on a certain role and set of annotations.  This module can be consumed
 multiple times with different roles.  The supported roles are:
@@ -267,8 +267,8 @@ The following labels are automatically added to exported targets.
 | :---------------- | :------- | :---------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `targets`         | _yes_    | `list(map(string))`           | List of targets to scrape                                                                                                                           |
 | `forward_to`      | _yes_    | `list(MetricsReceiver)`       | Must be a where scraped should be forwarded to                                                                                                      |
-| `keep_metrics`    | _no_     | [see code](module.river#L228) | A regular expression of metrics to keep                                                                                                             |
-| `drop_metrics`    | _no_     | [see code](module.river#L235) | A regular expression of metrics to drop                                                                                                             |
+| `keep_metrics`    | _no_     | [see code](module.alloy#L228) | A regular expression of metrics to keep                                                                                                             |
+| `drop_metrics`    | _no_     | [see code](module.alloy#L235) | A regular expression of metrics to drop                                                                                                             |
 | `scrape_interval` | _no_     | `60s`                         | How often to scrape metrics from the targets                                                                                                        |
 | `scrape_timeout`  | _no_     | `10s`                         | How long before a scrape times out                                                                                                                  |
 | `max_cache_size`  | _no_     | `100000`                      | The maximum number of elements to hold in the relabeling cache.  This should be at least 2x-5x your largest scrape target or samples appended rate. |
@@ -286,11 +286,11 @@ N/A
 
 The following example will scrape all metric annotation instances in cluster.
 
-```river
+```alloy
 import.git "metric_annotations" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
-  path = "modules/kubernetes/annotations/metrics.river"
+  path = "modules/kubernetes/annotations/metrics.alloy"
   pull_frequency = "15m"
 }
 
@@ -324,11 +324,11 @@ prometheus.remote_write "local" {
 
 The following example will scrape all probe annotation instances in cluster.
 
-```river
+```alloy
 import.git "probe_annotations" {
   repository = "https://github.com/grafana/flow-modules.git"
   revision = "main"
-  path = "modules/kubernetes/annotations/probes.river"
+  path = "modules/kubernetes/annotations/probes.alloy"
   pull_frequency = "15m"
 }