Skip to content

Commit b1264f5

Browse files
bentonambentonam
authored
Merge pull request #8 from grafana/alloy-rename
Alloy rename #minor
2 parents 2cd3cff + 1b09ac0 commit b1264f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+261
-240
lines changed

‎modules/broker/rabbitmq/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1414

1515
#### Arguments
1616

17-
| Name | Required | Default | Description |
18-
| :----------- | :------- | :-------------------------------------------------------- | :-------------------------------------------------------------------------- |
19-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20-
| `selectors` | _no_ | `["app.kubernetes.io/name=prometheus-rabbitmq-exporter"]` | The label selectors to use to find matching targets |
21-
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
17+
| Name | Required | Default | Description |
18+
| :---------------- | :------- | :-------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
19+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
21+
| `label_selectors` | _no_ | `["app.kubernetes.io/name=prometheus-rabbitmq-exporter"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
22+
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
2223

2324
#### Exports
2425

@@ -103,7 +104,7 @@ The following example will scrape all rabbitmq instances in cluster.
103104
import.git "rabbitmq" {
104105
repository = "https://github.com/grafana/flow-modules.git"
105106
revision = "main"
106-
path = "modules/brokers/rabbitmq/metric.river"
107+
path = "modules/brokers/rabbitmq/metrics.alloy"
107108
pull_frequency = "15m"
108109
}
109110
@@ -139,7 +140,7 @@ The following example will scrape rabbitmq for metrics on the local machine.
139140
import.git "rabbitmq" {
140141
repository = "https://github.com/grafana/flow-modules.git"
141142
revision = "main"
142-
path = "modules/brokers/rabbitmq/metric.river"
143+
path = "modules/brokers/rabbitmq/metrics.alloy"
143144
pull_frequency = "15m"
144145
}
145146

‎modules/broker/rabbitmq/metrics.river ‎modules/broker/rabbitmq/metrics.alloy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ declare "kubernetes" {
3737

3838
selectors {
3939
role = "pod"
40-
field = join(coalesce(argument.fieldselectors.value, []), ",")
40+
field = join(coalesce(argument.field_selectors.value, []), ",")
4141
label = join(coalesce(argument.label_selectors.value, ["app.kubernetes.io/name=prometheus-rabbitmq-exporter"]), ",")
4242
}
4343

‎modules/cloud/grafana/cloud/module.river ‎modules/cloud/grafana/cloud/module.alloy

File renamed without changes.

‎modules/collector/agent/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1414

1515
#### Arguments
1616

17-
| Name | Required | Default | Description |
18-
| :----------- | :------- | :----------------------------------------- | :-------------------------------------------------------------------------- |
19-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20-
| `selectors` | _no_ | `["app.kubernetes.io/name=grafana-agent"]` | The label selectors to use to find matching targets |
21-
| `port_name` | _no_ | `http-metrics` | The of the port to scrape metrics from |
17+
| Name | Required | Default | Description |
18+
| :---------------- | :------- | :----------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
19+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
21+
| `label_selectors` | _no_ | `["app.kubernetes.io/name=grafana-agent"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
22+
| `port_name` | _no_ | `http-metrics` | The of the port to scrape metrics from |
2223

2324
#### Exports
2425

@@ -102,7 +103,7 @@ The following example will scrape all agents in cluster.
102103
import.git "agent" {
103104
repository = "https://github.com/grafana/flow-modules.git"
104105
revision = "main"
105-
path = "module/collectors/agent/metric.river"
106+
path = "module/collectors/agent/metrics.alloy"
106107
pull_frequency = "15m"
107108
}
108109
@@ -138,7 +139,7 @@ The following example will scrape the agent for metrics on the local machine.
138139
import.git "agent" {
139140
repository = "https://github.com/grafana/flow-modules.git"
140141
revision = "main"
141-
path = "module/collectors/agent/metric.river"
142+
path = "module/collectors/agent/metrics.alloy"
142143
pull_frequency = "15m"
143144
}
144145

‎modules/collector/agent/metrics.river ‎modules/collector/agent/metrics.alloy

File renamed without changes.

‎modules/collector/push-gateway/README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1313

1414
#### Arguments
1515

16-
| Name | Required | Default | Description |
17-
| :----------- | :------- | :-------------------------------------------------- | :-------------------------------------------------------------------------- |
18-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
19-
| `selectors` | _no_ | `["app.kubernetes.io/name=prometheus-pushgateway"]` | The label selectors to use to find matching targets |
20-
| `port_name` | _no_ | `http-metrics` | The of the port to scrape metrics from |
16+
| Name | Required | Default | Description |
17+
| :---------------- | :------- | :-------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
18+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
19+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
20+
| `label_selectors` | _no_ | `["app.kubernetes.io/name=prometheus-pushgateway"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
21+
| `port_name` | _no_ | `http-metrics` | The of the port to scrape metrics from |
2122

2223
#### Exports
2324

@@ -70,7 +71,7 @@ The following example will scrape all push-gateway in cluster.
7071
import.git "push_gateway" {
7172
repository = "https://github.com/grafana/flow-modules.git"
7273
revision = "main"
73-
path = "modules/collectors/push-gateway/metrics.river"
74+
path = "modules/collectors/push-gateway/metrics.alloy"
7475
pull_frequency = "15m"
7576
}
7677

‎modules/collector/push-gateway/metrics.river ‎modules/collector/push-gateway/metrics.alloy

File renamed without changes.

‎modules/databases/kv/etcd/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1414

1515
#### Arguments
1616

17-
| Name | Required | Default | Description |
18-
| :----------- | :------- | :------------------------------------- | :-------------------------------------------------------------------------- |
19-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20-
| `selectors` | _no_ | `["app.kubernetes.io/component=etcd"]` | The label selectors to use to find matching targets |
21-
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
17+
| Name | Required | Default | Description |
18+
| :---------------- | :------- | :------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
19+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
21+
| `label_selectors` | _no_ | `["app.kubernetes.io/component=etcd"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
22+
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
2223

2324
#### Exports
2425

@@ -101,7 +102,7 @@ The following example will scrape all etcd instances in cluster.
101102
import.git "etcd" {
102103
repository = "https://github.com/grafana/flow-modules.git"
103104
revision = "main"
104-
path = "modules/databases/kv/etcd/metrics.river"
105+
path = "modules/databases/kv/etcd/metrics.alloy"
105106
pull_frequency = "15m"
106107
}
107108
@@ -137,7 +138,7 @@ The following example will scrape etcd for metrics on the local machine.
137138
import.git "etcd" {
138139
repository = "https://github.com/grafana/flow-modules.git"
139140
revision = "main"
140-
path = "modules/databases/kv/etcd/metrics.river"
141+
path = "modules/databases/kv/etcd/metrics.alloy"
141142
pull_frequency = "15m"
142143
}
143144

‎modules/databases/kv/etcd/metrics.river ‎modules/databases/kv/etcd/metrics.alloy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ declare "kubernetes" {
3737

3838
selectors {
3939
role = "pod"
40-
field = join(coalesce(argument.fieldselectors.value, []), ",")
40+
field = join(coalesce(argument.field_selectors.value, []), ",")
4141
label = join(coalesce(argument.label_selectors.value, ["app.kubernetes.io/component=etcd"]), ",")
4242
}
4343

‎modules/databases/kv/memcached/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1414

1515
#### Arguments
1616

17-
| Name | Required | Default | Description |
18-
| :----------- | :------- | :------------------------------------- | :-------------------------------------------------------------------------- |
19-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20-
| `selectors` | _no_ | `["app.kubernetes.io/name=memcached"]` | The label selectors to use to find matching targets |
21-
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
17+
| Name | Required | Default | Description |
18+
| :---------------- | :------- | :------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
19+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
21+
| `label_selectors` | _no_ | `["app.kubernetes.io/name=memcached"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
22+
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
2223

2324
#### Exports
2425

@@ -102,7 +103,7 @@ The following example will scrape all memcached instances in cluster.
102103
import.git "memcached" {
103104
repository = "https://github.com/grafana/flow-modules.git"
104105
revision = "main"
105-
path = "modules/databases/kv/memcached/metrics.river"
106+
path = "modules/databases/kv/memcached/metrics.alloy"
106107
pull_frequency = "15m"
107108
}
108109
@@ -138,7 +139,7 @@ The following example will scrape memcached for metrics on the local machine.
138139
import.git "memcached" {
139140
repository = "https://github.com/grafana/flow-modules.git"
140141
revision = "main"
141-
path = "modules/databases/kv/memcached/metrics.river"
142+
path = "modules/databases/kv/memcached/metrics.alloy"
142143
pull_frequency = "15m"
143144
}
144145

‎modules/databases/kv/memcached/metrics.river ‎modules/databases/kv/memcached/metrics.alloy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ declare "kubernetes" {
3737

3838
selectors {
3939
role = "pod"
40-
field = join(coalesce(argument.fieldselectors.value, []), ",")
40+
field = join(coalesce(argument.field_selectors.value, []), ",")
4141
label = join(coalesce(argument.label_selectors.value, ["app.kubernetes.io/name=memcached"]), ",")
4242
}
4343

‎modules/databases/kv/redis/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Handles discovery of kubernetes targets and exports them, this component does no
1414

1515
#### Arguments
1616

17-
| Name | Required | Default | Description |
18-
| :----------- | :------- | :----------------------------------------------------- | :-------------------------------------------------------------------------- |
19-
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20-
| `selectors` | _no_ | `["app.kubernetes.io/name=prometheus-redis-exporter"]` | The label selectors to use to find matching targets |
21-
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
17+
| Name | Required | Default | Description |
18+
| :---------------- | :------- | :----------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- |
19+
| `namespaces` | _no_ | `[]` | The namespaces to look for targets in, the default (`[]`) is all namespaces |
20+
| `field_selectors` | _no_ | `[]` | The [field selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/field-selectors/) to use to find matching targets |
21+
| `label_selectors` | _no_ | `["app.kubernetes.io/name=prometheus-redis-exporter"]` | The [label selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to use to find matching targets |
22+
| `port_name` | _no_ | `metrics` | The of the port to scrape metrics from |
2223

2324
#### Exports
2425

@@ -102,7 +103,7 @@ The following example will scrape all redis instances in cluster.
102103
import.git "redis" {
103104
repository = "https://github.com/grafana/flow-modules.git"
104105
revision = "main"
105-
path = "modules/databases/kv/redis/metrics.river"
106+
path = "modules/databases/kv/redis/metrics.alloy"
106107
pull_frequency = "15m"
107108
}
108109
@@ -138,7 +139,7 @@ The following example will scrape redis for metrics on the local machine.
138139
import.git "redis" {
139140
repository = "https://github.com/grafana/flow-modules.git"
140141
revision = "main"
141-
path = "modules/databases/kv/redis/metrics.river"
142+
path = "modules/databases/kv/redis/metrics.alloy"
142143
pull_frequency = "15m"
143144
}
144145

‎modules/databases/kv/redis/metrics.river ‎modules/databases/kv/redis/metrics.alloy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ declare "kubernetes" {
3737

3838
selectors {
3939
role = "pod"
40-
field = join(coalesce(argument.fieldselectors.value, []), ",")
40+
field = join(coalesce(argument.field_selectors.value, []), ",")
4141
label = join(coalesce(argument.label_selectors.value, ["app.kubernetes.io/name=prometheus-redis-exporter"]), ",")
4242
}
4343

0 commit comments

Comments
 (0)