Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Prometheus v2.54.1 #1574

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ Main (unreleased)

- Support TLS client settings for clustering (@tiagorossig)

- Upgrading to Prometheus v2.54.1. (@ptodev)
- `discovery.docker` has a new `match_first_network` attribute for matching the first network
if the container has multiple networks defined, thus avoiding collecting duplicate targets.
- `discovery.ec2`, `discovery.kubernetes`, `discovery.openstack`, and `discovery.ovhcloud`
add extra `__meta_` labels.
- `prometheus.remote_write` supports Azure OAuth and Azure SDK authentication.
- `discovery.linode` has a new `region` attribute, as well as extra `__meta_` labels.

v1.4.2
-----------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Name | Type | Description
`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
`match_first_network` | `bool` | Match the first network if the container has multiple networks defined, thus avoiding collecting duplicate targets. | `true` | 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ Each target includes the following labels:
* `__meta_ec2_ipv6_addresses`: Comma-separated list of IPv6 addresses assigned to the instance's network interfaces, if present.
* `__meta_ec2_owner_id`: The ID of the AWS account that owns the EC2 instance.
* `__meta_ec2_platform`: The Operating System platform, set to 'windows' on Windows servers, absent otherwise.
* `__meta_ec2_primary_ipv6_addresses`: Comma separated list of the Primary IPv6 addresses of the instance, if present. The list is ordered based on the position of each corresponding network interface in the attachment order.
* `__meta_ec2_primary_subnet_id`: The subnet ID of the primary network interface, if available.
* `__meta_ec2_private_dns_name`: The private DNS name of the instance, if available.
* `__meta_ec2_private_ip`: The private IP address of the instance, if present.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ The following labels are included for discovered endpoint slices:
* `__meta_kubernetes_endpointslice_endpoint_conditions_ready`: Set to `true` or `false` for the referenced endpoint's ready state.
* `__meta_kubernetes_endpointslice_endpoint_topology_kubernetes_io_hostname`: Name of the node hosting the referenced endpoint.
* `__meta_kubernetes_endpointslice_endpoint_topology_present_kubernetes_io_hostname`: `true` if the referenced object has a `kubernetes.io/hostname` annotation.
* `__meta_kubernetes_endpointslice_endpoint_hostname`: Hostname of the referenced endpoint.
* `__meta_kubernetes_endpointslice_endpoint_node_name`: Name of the Node hosting the referenced endpoint.
* `__meta_kubernetes_endpointslice_endpoint_zone`: Zone the referenced endpoint exists in (only available when using the `discovery.k8s.io/v1` API group).
* `__meta_kubernetes_endpointslice_port`: Port of the referenced endpoint.
* `__meta_kubernetes_endpointslice_port_name`: Named port of the referenced endpoint.
* `__meta_kubernetes_endpointslice_port_protocol`: Protocol of the referenced endpoint.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Name | Type | Description
`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
`region` | `string` | A region to filter on. | `""` | 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
Expand Down Expand Up @@ -106,18 +107,23 @@ The following meta labels are available on targets and can be used by the discov
* `__meta_linode_private_ipv4`: the private IPv4 of the Linode instance
* `__meta_linode_public_ipv4`: the public IPv4 of the Linode instance
* `__meta_linode_public_ipv6`: the public IPv6 of the Linode instance
* `__meta_linode_private_ipv4_rdns`: the reverse DNS for the first private IPv4 of the linode instance
* `__meta_linode_public_ipv4_rdns`: the reverse DNS for the first public IPv4 of the linode instance
* `__meta_linode_public_ipv6_rdns`: the reverse DNS for the first public IPv6 of the linode instance
* `__meta_linode_region`: the region of the Linode instance
* `__meta_linode_type`: the type of the Linode instance
* `__meta_linode_status`: the status of the Linode instance
* `__meta_linode_tags`: a list of tags of the Linode instance joined by the tag separator
* `__meta_linode_group`: the display group a Linode instance is a member of
* `__meta_linode_gpus`: the number of GPU's of the linode instance
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* `__meta_linode_gpus`: the number of GPU's of the linode instance
* `__meta_linode_gpus`: the number of GPUs of the linode instance

* `__meta_linode_hypervisor`: the virtualization software powering the Linode instance
* `__meta_linode_backups`: the backup service status of the Linode instance
* `__meta_linode_specs_disk_bytes`: the amount of storage space the Linode instance has access to
* `__meta_linode_specs_memory_bytes`: the amount of RAM the Linode instance has access to
* `__meta_linode_specs_vcpus`: the number of VCPUS this Linode has access to
* `__meta_linode_specs_transfer_bytes`: the amount of network transfer the Linode instance is allotted each month
* `__meta_linode_extra_ips`: a list of all extra IPv4 addresses assigned to the Linode instance joined by the tag separator
* `__meta_linode_ipv6_ranges`: a list of IPv6 ranges with mask assigned to the linode instance joined by the tag separator

## Component health

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ instance. The target address defaults to the private IP address of the network
interface.

* `__meta_openstack_address_pool`: the pool of the private IP.
* `__meta_openstack_instance_flavor`: the flavor of the OpenStack instance.
* `__meta_openstack_instance_flavor`: the flavor name of the OpenStack instance, or the flavor ID if the flavor name isn't available.
* `__meta_openstack_instance_id`: the OpenStack instance ID.
* `__meta_openstack_instance_image`: the ID of the image the OpenStack instance is using.
* `__meta_openstack_instance_name`: the OpenStack instance name.
* `__meta_openstack_instance_status`: the status of the OpenStack instance.
* `__meta_openstack_private_ip`: the private IP of the OpenStack instance.
* `__meta_openstack_project_id`: the project (tenant) owning this instance.
* `__meta_openstack_public_ip`: the public IP of the OpenStack instance.
* `__meta_openstack_tag_<tagkey>`: each tag value of the instance.
* `__meta_openstack_tag_<key>`: each metadata item of the instance, with any unsupported characters converted to an underscore.
* `__meta_openstack_user_id`: the user account owning the tenant.

## Component health
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Multiple meta labels are available on `targets` and can be used by the `discover
* `__meta_ovhcloud_dedicated_server_ipv6`: the IPv6 of the server.
* `__meta_ovhcloud_dedicated_server_link_speed`: the link speed of the server.
* `__meta_ovhcloud_dedicated_server_name`: the name of the server.
* `__meta_ovhcloud_dedicated_server_no_intervention`: whether datacenter intervention is disabled for the server.
* `__meta_ovhcloud_dedicated_server_os`: the operating system of the server.
* `__meta_ovhcloud_dedicated_server_rack`: the rack of the server.
* `__meta_ovhcloud_dedicated_server_reverse`: the reverse DNS name of the server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ The component starts a new syslog listener for each of the given `config`
blocks and fans out incoming entries to the list of receivers in `forward_to`.

Multiple `loki.source.syslog` components can be specified by giving them different labels.
[RFC5424]: https://www.rfc-editor.org/rfc/rfc5424
[RFC3164]: https://www.rfc-editor.org/rfc/rfc3164
Comment on lines +20 to +21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These aren't necessary if they are defined inline... or we remove the inline links on lines 13 and 14 and replace the (URL) with [].


## Usage

Expand Down Expand Up @@ -76,7 +78,7 @@ Name | Type | Description
-------------------------|---------------|-------------------------------------------------------------------------------|-----------|---------
`address` | `string` | The `<host:port>` address to listen to for syslog messages. | | yes
`protocol` | `string` | The protocol to listen to for syslog messages. Must be either `tcp` or `udp`. | `tcp` | no
`idle_timeout` | `duration` | The idle timeout for tcp connections. | `"120s" ` | no
`idle_timeout` | `duration` | The idle timeout for tcp connections. | `"120s"` | no
`label_structured_data` | `bool` | Whether to translate syslog structured data to loki labels. | `false` | no
`labels` | `map(string)` | The labels to associate with each received syslog record. | `{}` | no
`use_incoming_timestamp` | `bool` | Whether to set the timestamp to the incoming syslog record timestamp. | `false` | no
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ endpoint > oauth2 > tls_config | [tls_config][] | Configure TLS settings for con
endpoint > sigv4 | [sigv4][] | Configure AWS Signature Verification 4 for authenticating to the endpoint. | no
endpoint > azuread | [azuread][] | Configure AzureAD for authenticating to the endpoint. | no
endpoint > azuread > managed_identity | [managed_identity][] | Configure Azure user-assigned managed identity. | yes
endpoint > azuread > oauth | [oauth][] | Configure Azure OAuth. | yes
endpoint > azuread > sdk | [sdk][] | Configure Azure SDK authentication. | yes
endpoint > tls_config | [tls_config][] | Configure TLS settings for connecting to the endpoint. | no
endpoint > queue_config | [queue_config][] | Configuration for how metrics are batched before sending. | no
endpoint > metadata_config | [metadata_config][] | Configuration for how metric metadata is sent. | no
Expand All @@ -72,6 +74,8 @@ basic_auth` refers to a `basic_auth` block defined inside an
[sigv4]: #sigv4-block
[azuread]: #azuread-block
[managed_identity]: #managed_identity-block
[oauth]: #oauth-block
[sdk]: #sdk-block
[tls_config]: #tls_config-block
[queue_config]: #queue_config-block
[metadata_config]: #metadata_config-block
Expand Down Expand Up @@ -149,7 +153,15 @@ metrics fails.

### managed_identity block

{{< docs/shared lookup="reference/components/managed_identity-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
{{< docs/shared lookup="reference/components/azure-managed_identity-block.md" source="alloy" version="<ALLOY_VERSION>" >}}

### oauth block

{{< docs/shared lookup="reference/components/azure-oauth-block.md" source="alloy" version="<ALLOY_VERSION>" >}}

### sdk block

{{< docs/shared lookup="reference/components/azure-sdk-block.md" source="alloy" version="<ALLOY_VERSION>" >}}

### tls_config block

Expand Down
11 changes: 11 additions & 0 deletions docs/sources/shared/reference/components/azure-oauth-block.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
canonical: https://grafana.com/docs/alloy/latest/shared/reference/components/azuread-oauth-block/
description: Shared content, oauth block
headless: true
---

Name | Type | Description | Default | Required
----------------|----------|-------------------------------------------------------------------------------------------------|---------|---------
`client_id` | `string` | The client ID of the Azure Active Directory application that is being used to authenticate. | | yes
`client_secret` | `secret` | The client secret of the Azure Active Directory application that is being used to authenticate. | | yes
`tenant_id` | `string` | The tenant ID of the Azure Active Directory application that is being used to authenticate. | | yes
13 changes: 13 additions & 0 deletions docs/sources/shared/reference/components/azuread-sdk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
canonical: https://grafana.com/docs/alloy/latest/shared/reference/components/azuread-sdk-block/
description: Shared content, sdk block
headless: true
---

This block configures [Azure SDK authentication][sdk-auth].

Name | Type | Description | Default | Required
------------|----------|---------------------------------------------------------------------------------------------|---------|---------
`tenant_id` | `string` | The tenant ID of the Azure Active Directory application that is being used to authenticate. | | yes

[sdk-auth]: https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
Loading
Loading