Skip to content

Move storage.tsdb.retention.size out of experimental #8728#9004

Merged
roidelapluie merged 3 commits intoprometheus:mainfrom
goelankitt:storage-retention-size-experimental
Jun 29, 2021
Merged

Move storage.tsdb.retention.size out of experimental #8728#9004
roidelapluie merged 3 commits intoprometheus:mainfrom
goelankitt:storage-retention-size-experimental

Conversation

@goelankitt
Copy link
Contributor

@goelankitt goelankitt commented Jun 28, 2021

Fixes #8728

@goelankitt
Copy link
Contributor Author

@roidelapluie Are any other changes required?

@cstyan
Copy link
Member

cstyan commented Jun 28, 2021

The DCO is missing: https://github.com/probot/dco#how-it-works

You can commit --amend probably.

Signed-off-by: Ankit Goel <ankit.goel@deliveryhero.com>
@goelankitt goelankitt force-pushed the storage-retention-size-experimental branch from 7e5b400 to 85dbc24 Compare June 29, 2021 13:02
Signed-off-by: Ankit Goel <ankit.goel@deliveryhero.com>
@goelankitt goelankitt force-pushed the storage-retention-size-experimental branch from de155d0 to e0dda52 Compare June 29, 2021 13:07
@goelankitt
Copy link
Contributor Author

@cstyan Fixed it :)

CHANGELOG.md Outdated
@@ -1,5 +1,6 @@
## 2.28.0 / 2021-06-21

* [CHANGE] Move storage.tsdb.retention.size out of experimental #8728
Copy link
Member

Choose a reason for hiding this comment

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

Please do not modify the changelog, especially since 2.28 has been released already.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed this change :)

Signed-off-by: Ankit Goel <ankit.goel@deliveryhero.com>
@roidelapluie
Copy link
Member

Thank you! Welcome to the community :)

@roidelapluie roidelapluie merged commit d437cee into prometheus:main Jun 29, 2021
SetValue(&newFlagRetentionDuration)

a.Flag("storage.tsdb.retention.size", "[EXPERIMENTAL] Maximum number of bytes that can be stored for blocks. A unit is required, supported units: B, KB, MB, GB, TB, PB, EB. Ex: \"512MB\". This flag is experimental and can be changed in future releases.").
a.Flag("storage.tsdb.retention.size", "Maximum number of bytes that can be stored for blocks. A unit is required, supported units: B, KB, MB, GB, TB, PB, EB. Ex: \"512MB\". This flag is experimental and can be changed in future releases.").
Copy link
Contributor

Choose a reason for hiding this comment

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

Although the [EXPERIMENTAL] tag at the front has gone, the end of the text still says:

This flag is experimental and can be changed in future releases.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks: #9140

roidelapluie pushed a commit to roidelapluie/prometheus that referenced this pull request Aug 2, 2021
Followup of prometheus#9004

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
juliusv pushed a commit that referenced this pull request Aug 12, 2021
* PromQL: Fix start and end keywords masking label and metric names

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>

* Add in additional tests for metrics and/or labels called start/end.

Signed-off-by: Clayton Peters <clayton.peters@man.com>

* *: Cut 2.29.0-rc.0

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>

* VERSION: bump to 2.29.0-rc.0

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>

* Remove experimental wording on size-based retention

Followup of #9004

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Fix PR reference in changelog

Signed-off-by: George Brighton <george@gebn.co.uk>

* Describe EC2 availability zone IDs at most once per refresh (#9142)

Signed-off-by: George Brighton <george@gebn.co.uk>

* Describe EC2 availability zones at most once per SD load

Closes #9142.

Signed-off-by: George Brighton <george@gebn.co.uk>

* Incorporate feedback

Signed-off-by: George Brighton <george@gebn.co.uk>

* Integrate feedback

Signed-off-by: George Brighton <george@gebn.co.uk>

* Add a compatibility note for macOS users.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* *: Cut v2.29.0-rc.1

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>

* Fix `kuma_sd` targetgroup reporting (#9157)

* Bundle all xDS targets into a single group

Signed-off-by: austin ce <austin.cawley@gmail.com>

* *: cut v2.29.0-rc.2

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>

* Rename links

Signed-off-by: Levi Harrison <git@leviharrison.dev>

* bump codemirror-promql to 0.17.0

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

* *: cut v2.29.0

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>

* tsdb: align atomically accessed int64 (#9192)

This prevents a panic in 32-bit archs:
https://pkg.go.dev/sync/atomic#pkg-note-BUG

Fixed #9190

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

* Release 2.29.1 (#9193)

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>

Co-authored-by: Clayton Peters <clayton.peters@man.com>
Co-authored-by: Frederic Branczyk <fbranczyk@gmail.com>
Co-authored-by: George Brighton <george@gebn.co.uk>
Co-authored-by: Austin Cawley-Edwards <austin.cawley@gmail.com>
Co-authored-by: Levi Harrison <git@leviharrison.dev>
Co-authored-by: Augustin Husson <husson.augustin@gmail.com>
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.

Proposal: Move storage.tsdb.retention.size out of experimental mode.

4 participants