Skip to content

Merge release 2.29 in main#9196

Merged
juliusv merged 33 commits intoprometheus:mainfrom
roidelapluie:merge-229
Aug 12, 2021
Merged

Merge release 2.29 in main#9196
juliusv merged 33 commits intoprometheus:mainfrom
roidelapluie:merge-229

Conversation

@roidelapluie
Copy link
Member

No description provided.

claytonpeters and others added 30 commits July 27, 2021 10:54
This commit fixes an issue with the "at modifier" that introduced two
new keywords: `start` and `end`. In grouping options and in metric
names, these keywords took precedence over metric or label names, so
that those metrics and labels could no longer be referenced.

Signed-off-by: Clayton Peters <clayton.peters@man.com>
Signed-off-by: Clayton Peters <clayton.peters@man.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Followup of prometheus#9004

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: George Brighton <george@gebn.co.uk>
Closes prometheus#9142.

Signed-off-by: George Brighton <george@gebn.co.uk>
Signed-off-by: George Brighton <george@gebn.co.uk>
Remove experimental wording on size-based retention
Signed-off-by: George Brighton <george@gebn.co.uk>
Describe EC2 availability zone IDs at most once per refresh (prometheus#9142)
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Add a compatibility note for macOS users.
…d-fix

PromQL: Fix start and end keywords masking label and metric names
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
* Bundle all xDS targets into a single group

Signed-off-by: austin ce <austin.cawley@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Signed-off-by: Levi Harrison <git@leviharrison.dev>
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
Julien Pivotto added 2 commits August 11, 2021 16:11
This prevents a panic in 32-bit archs:
https://pkg.go.dev/sync/atomic#pkg-note-BUG

Fixed prometheus#9190

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
@juliusv
Copy link
Member

juliusv commented Aug 12, 2021

👍

@juliusv juliusv merged commit cab96a0 into prometheus:main Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants