Skip to content

Commit 8d4ef42

Browse files
authored
Merge branch 'main' into feat-otelcol-receiver-github
2 parents d1ef156 + 0f3bfe9 commit 8d4ef42

159 files changed

Lines changed: 1867 additions & 1237 deletions

File tree

Some content is hidden

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

docs/sources/reference/components/beyla/beyla.ebpf.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ The following formats are supported:
6565

6666
You can use the following blocks with `beyla.ebpf`:
6767

68+
{{< docs/alloy-config >}}
69+
6870
| Block | Description | Required |
6971
|------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|----------|
7072
| [`output`][output] | Configures where to send received telemetry data. | yes |
@@ -100,9 +102,6 @@ You can use the following blocks with `beyla.ebpf`:
100102
| `injector` > [`resources`][injector resources] | Configures resource attributes for the injected SDK. | no |
101103
| `injector` > [`sampler`][sampler] | Configures default trace sampling for injected SDKs. | no |
102104

103-
The > symbol indicates deeper levels of nesting.
104-
For example, `attributes` > `kubernetes` refers to a `kubernetes` block defined inside an `attributes` block.
105-
106105
[routes]: #routes
107106
[traces]: #traces
108107
[attributes]: #attributes
@@ -127,6 +126,8 @@ For example, `attributes` > `kubernetes` refers to a `kubernetes` block defined
127126
[injector export]: #export
128127
[injector resources]: #resources
129128

129+
{{< /docs/alloy-config >}}
130+
130131
### `output`
131132

132133
{{< badge text="Required" >}}

docs/sources/reference/components/database_observability/database_observability.mysql.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ The following collectors are configurable:
5454

5555
You can use the following blocks with `database_observability.mysql`:
5656

57+
{{< docs/alloy-config >}}
58+
5759
| Block | Description | Required |
5860
|--------------------------------------|---------------------------------------------------|----------|
5961
| [`cloud_provider`][cloud_provider] | Provide Cloud Provider information. | no |
@@ -68,9 +70,6 @@ You can use the following blocks with `database_observability.mysql`:
6870
| [`query_samples`][query_samples] | Configure the query samples collector. | no |
6971
| [`health_check`][health_check] | Configure the health check collector. | no |
7072

71-
The > symbol indicates deeper levels of nesting.
72-
For example, `cloud_provider` > `aws` refers to a `aws` block defined inside an `cloud_provider` block.
73-
7473
[cloud_provider]: #cloud_provider
7574
[aws]: #aws
7675
[azure]: #azure
@@ -83,6 +82,8 @@ For example, `cloud_provider` > `aws` refers to a `aws` block defined inside an
8382
[setup_actors]: #setup_actors
8483
[health_check]: #health_check
8584

85+
{{< /docs/alloy-config >}}
86+
8687
### `cloud_provider`
8788

8889
The `cloud_provider` block has no attributes.

docs/sources/reference/components/database_observability/database_observability.postgres.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ The following collectors are configurable:
6565

6666
You can use the following blocks with `database_observability.postgres`:
6767

68+
{{< docs/alloy-config >}}
69+
6870
| Block | Description | Required |
6971
|------------------------------------|---------------------------------------------------|----------|
7072
| [`cloud_provider`][cloud_provider] | Provide Cloud Provider information. | no |
@@ -76,9 +78,6 @@ You can use the following blocks with `database_observability.postgres`:
7678
| [`explain_plans`][explain_plans] | Configure the explain plans collector. | no |
7779
| [`health_check`][health_check] | Configure the health check collector. | no |
7880

79-
The > symbol indicates deeper levels of nesting.
80-
For example, `cloud_provider` > `aws` refers to a `aws` block defined inside an `cloud_provider` block.
81-
8281
[cloud_provider]: #cloud_provider
8382
[aws]: #aws
8483
[azure]: #azure
@@ -88,6 +87,8 @@ For example, `cloud_provider` > `aws` refers to a `aws` block defined inside an
8887
[explain_plans]: #explain_plans
8988
[health_check]: #health_check
9089

90+
{{< /docs/alloy-config >}}
91+
9192
### `cloud_provider`
9293

9394
The `cloud_provider` block has no attributes.

docs/sources/reference/components/discovery/discovery.azure.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,22 @@ You can use the following arguments with `discovery.azure`:
4747

4848
You can use the following blocks with `discovery.azure`:
4949

50+
{{< docs/alloy-config >}}
51+
5052
| Block | Description | Required |
5153
| -------------------------------------- | ------------------------------------------------ | -------- |
5254
| [`managed_identity`][managed_identity] | Managed Identity configuration for Azure API. | no |
5355
| [`oauth`][oauth] | OAuth 2.0 configuration for Azure API. | no |
5456
| [`tls_config`][tls_config] | TLS configuration for requests to the Azure API. | no |
5557

56-
You must specify exactly one of the `oauth` or `managed_identity` blocks.
57-
5858
[managed_identity]: #managed_identity
5959
[oauth]: #oauth
6060
[tls_config]: #tls_config
6161

62+
{{< /docs/alloy-config >}}
63+
64+
You must specify exactly one of the `oauth` or `managed_identity` blocks.
65+
6266
### `managed_identity`
6367

6468
The `managed_identity` block configures Managed Identity authentication for the Azure API.

docs/sources/reference/components/discovery/discovery.consul.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ At most, one of the following can be provided:
7171

7272
You can use the following blocks with `discovery.consul`:
7373

74+
{{< docs/alloy-config >}}
75+
7476
| Block | Description | Required |
7577
| ------------------------------------- | ---------------------------------------------------------- | -------- |
7678
| [`authorization`][authorization] | Configure generic authorization to the endpoint. | no |
@@ -79,14 +81,13 @@ You can use the following blocks with `discovery.consul`:
7981
| `oauth2` > [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
8082
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
8183

82-
The > symbol indicates deeper levels of nesting.
83-
For example, `oauth2` > `tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
84-
8584
[authorization]: #authorization
8685
[basic_auth]: #basic_auth
8786
[oauth2]: #oauth2
8887
[tls_config]: #tls_config
8988

89+
{{< /docs/alloy-config >}}
90+
9091
### `authorization`
9192

9293
The `authorization` block configures generic authorization to the endpoint.

docs/sources/reference/components/discovery/discovery.consulagent.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,16 @@ You can use the following arguments with `discovery.consulagent`:
4747

4848
You can use the following block with `discovery.consulagent`:
4949

50+
{{< docs/alloy-config >}}
51+
5052
| Block | Description | Required |
5153
| -------------------------- | ------------------------------------------------------ | -------- |
5254
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
5355

5456
[tls_config]: #tls_config
5557

58+
{{< /docs/alloy-config >}}
59+
5660
### `tls_config`
5761

5862
The `tls_config` block configures TLS settings for connecting to the endpoint.

docs/sources/reference/components/discovery/discovery.docker.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ At most, one of the following can be provided:
6161

6262
You can use the following blocks with `discovery.docker`:
6363

64+
{{< docs/alloy-config >}}
65+
6466
| Block | Description | Required |
6567
| ------------------------------------- | ---------------------------------------------------------- | -------- |
6668
| [`authorization`][authorization] | Configure generic authorization to the endpoint. | no |
@@ -70,15 +72,14 @@ You can use the following blocks with `discovery.docker`:
7072
| `oauth2` > [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
7173
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
7274

73-
The > symbol indicates deeper levels of nesting.
74-
For example, `oauth2` > `tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
75-
7675
[filter]: #filter
7776
[basic_auth]: #basic_auth
7877
[authorization]: #authorization
7978
[oauth2]: #oauth2
8079
[tls_config]: #tls_config
8180

81+
{{< /docs/alloy-config >}}
82+
8283
### `authorization`
8384

8485
The `authorization` block configures generic authorization to the endpoint.

docs/sources/reference/components/discovery/discovery.dockerswarm.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ At most, one of the following can be provided:
5959

6060
You can use the following blocks with `discovery.dockerswarm`:
6161

62+
{{< docs/alloy-config >}}
63+
6264
| Block | Description | Required |
6365
| ------------------------------------- | ---------------------------------------------------------------------------------- | -------- |
6466
| [`authorization`][authorization] | Configure generic authorization to the endpoint. | no |
@@ -68,15 +70,14 @@ You can use the following blocks with `discovery.dockerswarm`:
6870
| `oauth2` > [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
6971
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
7072

71-
The `>` symbol indicates deeper levels of nesting.
72-
For example, `oauth2 > tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
73-
7473
[filter]: #filter
7574
[basic_auth]: #basic_auth
7675
[authorization]: #authorization
7776
[oauth2]: #oauth2
7877
[tls_config]: #tls_config
7978

79+
{{< /docs/alloy-config >}}
80+
8081
### `authorization`
8182

8283
The `authorization` block configures generic authorization to the endpoint.

docs/sources/reference/components/discovery/discovery.ec2.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ At most, one of the following can be provided:
6262

6363
You can use the following blocks with `discovery.ec2`:
6464

65+
{{< docs/alloy-config >}}
66+
6567
| Block | Description | Required |
6668
| ------------------------------------- | ---------------------------------------------------------- | -------- |
6769
| [`authorization`][authorization] | Configure generic authorization to the endpoint. | no |
@@ -71,15 +73,14 @@ You can use the following blocks with `discovery.ec2`:
7173
| `oauth2` > [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
7274
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
7375

74-
The > symbol indicates deeper levels of nesting.
75-
For example, `oauth2` > `tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
76-
7776
[authorization]: #authorization
7877
[basic_auth]: #basic_auth
7978
[filter]: #filter
8079
[oauth2]: #oauth2
8180
[tls_config]: #tls_config
8281

82+
{{< /docs/alloy-config >}}
83+
8384
### `authorization`
8485

8586
The `authorization` block configures generic authorization to the endpoint.

docs/sources/reference/components/discovery/discovery.eureka.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ At most, one of the following can be provided:
5858

5959
You can use the following blocks with `discovery.eureka`:
6060

61+
{{< docs/alloy-config >}}
62+
6163
| Block | Description | Required |
6264
| ------------------------------------- | ---------------------------------------------------------- | -------- |
6365
| [`authorization`][authorization] | Configure generic authorization to the endpoint. | no |
@@ -66,14 +68,13 @@ You can use the following blocks with `discovery.eureka`:
6668
| `oauth2` > [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
6769
| [`tls_config`][tls_config] | Configure TLS settings for connecting to the endpoint. | no |
6870

69-
The > symbol indicates deeper levels of nesting.
70-
For example, `oauth2` > `tls_config` refers to a `tls_config` block defined inside an `oauth2` block.
71-
7271
[authorization]: #authorization
7372
[basic_auth]: #basic_auth
7473
[oauth2]: #oauth2
7574
[tls_config]: #tls_config
7675

76+
{{< /docs/alloy-config >}}
77+
7778
### `authorization`
7879

7980
The `authorization` block configures generic authorization to the endpoint.

0 commit comments

Comments
 (0)