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

Merge release-2.5 to main #3607

Merged
merged 24 commits into from
Dec 1, 2022
Merged

Merge release-2.5 to main #3607

merged 24 commits into from
Dec 1, 2022

Conversation

replay
Copy link
Contributor

@replay replay commented Dec 1, 2022

In this PR I'm merging the release-2.5 branch to main branch. Please remember to merge it using merge commit.

pracucci and others added 24 commits November 28, 2022 22:04
Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
)

* Improve networking dashboards to work with read-write deployment mode

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Fixed panel title

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
…ilities (#3531)

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
#3518)

* Hide TSDB block ranges period config from doc and mark it experimental

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Remove CLI flag mention from Helm migration doc

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
This doesn't accurately count the dropped samples. For example
if a single metric with multiple samples is faulty, we get a single error
rather than an error per sample.

But I believe its the best best-effort measurement.

Before we used to do `DatapointCount() - samplesInMap()`

The problem is the following:
1. target_info is a synthetic metric added in Prometheus, so the final samples could higher.
2. A single histogram datapoint in OTLP corresponds to many samples in Prometheus.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
…or release (#3550)

* fix up changelog in preparation for release

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* remove non-user-facing line

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* reclassify some docs enhancements as bugfix

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* add new release section in changelog

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* apply PR feedback

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* fixes according to PR feedback

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit ce49b04)

Co-authored-by: Marco Pracucci <marco@pracucci.com>
…yment mode (#3574)

* Improve networking panels to work with read write deployment mode (#3519)

* Improve networking dashboards to work with read-write deployment mode

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Fixed panel title

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit 5064c64)

* add an empty space

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Revert "add an empty space"

This reverts commit 8136c97.

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Mauro Stettler <mauro.stettler@gmail.com>
…ilities (#3531) (#3578)

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit b0a390b)

Co-authored-by: Marco Pracucci <marco@pracucci.com>
#3518) (#3575)

* Hide TSDB block ranges period config from doc and mark it experimental

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Remove CLI flag mention from Helm migration doc

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit 56b6e35)

Co-authored-by: Marco Pracucci <marco@pracucci.com>
This doesn't accurately count the dropped samples. For example
if a single metric with multiple samples is faulty, we get a single error
rather than an error per sample.

But I believe its the best best-effort measurement.

Before we used to do `DatapointCount() - samplesInMap()`

The problem is the following:
1. target_info is a synthetic metric added in Prometheus, so the final samples could higher.
2. A single histogram datapoint in OTLP corresponds to many samples in Prometheus.

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>
(cherry picked from commit 2ad7eb4)

Co-authored-by: Goutham Veeramachaneni <gouthamve@gmail.com>
* update screenshots (#3553)

(cherry picked from commit e2fa561)

* empty space

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Revert "empty space"

This reverts commit c8616a8.

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Co-authored-by: Mauro Stettler <mauro.stettler@gmail.com>
… preparation for release (#3579)

* add missing entries and release section to changelog in preparation for release (#3550)

* fix up changelog in preparation for release

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* remove non-user-facing line

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* reclassify some docs enhancements as bugfix

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* add new release section in changelog

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* apply PR feedback

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* fixes according to PR feedback

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
(cherry picked from commit a61ea75)

* empty line

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Revert "empty line"

This reverts commit 6610a9d.

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
* mark version in changelog as rc (#3572)

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
(cherry picked from commit 0f29293)

* empty line

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Revert "empty line"

This reverts commit 25fc74b.

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
* update version to 2.5.0-rc.0

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* empty line

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>

* Revert "empty line"

This reverts commit 2ef9237.

Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
@pstibrany
Copy link
Member

Surprised to see 0 diff. No changelog update to reflect rc.0 release?

@replay
Copy link
Contributor Author

replay commented Dec 1, 2022

No changelog update to reflect rc.0 release?

No, because main already has the rc.0 in the changelog: https://github.com/grafana/mimir/blob/main/CHANGELOG.md

Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thanks. Please remember to merge with merge commit, not by squashing.

@replay replay merged commit 7576f30 into main Dec 1, 2022
@replay replay deleted the merge-release-2.5-to-main branch December 1, 2022 18:18
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.

5 participants