Merge upstream prometheus/prometheus at c10186e
#623
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
promtool: Fix panic on extended tsdb analyze (#13976)
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
Since we already use require.JSONEq in similar cases. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
So that tests use the same encoding as the api. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
When we want to check just the json encoding. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
The typed versions are used when we call from one marshaller to another. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
If the underlying data is `nil` the default encoding will render `"null"` which is not accepted by (some) Prometheus client libraries. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
bugfix: API: encode empty Vector/Matrix as [] not null
Prepare v2.52.0-rc.0 release
Update promu to the latest release. Signed-off-by: SuperQ <superq@gmail.com>
Merge `release-2.52` back to main
docs: Remove outdated information about remote-read API --------- Signed-off-by: kushagra Shukla <kushalshukla110@gmail.com> Signed-off-by: Kushal shukla <85934954+kushalShukla-web@users.noreply.github.com> Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com> Co-authored-by: Arthur Silva Sens <arthur.sens@coralogix.com>
* BUGFIX: Mark the rule's restoration process as completed always In prometheus/prometheus#13980 I introduced a change to reduce the number of queries executed when we restore alert statuses. With this, the querying semantics changed as we now need to go through all series before we enter the alert restoration loop and I missed the fact that exiting early when there are no rules to restore would lead to an incomplete restoration. An alert being restored is used as a proxy for "we're now ready to write `ALERTS/ALERTS_FOR_SERIES` metrics" so as a result we weren't writing the series if we didn't restore anything the first time around. --------- Signed-off-by: gotjosh <josue.abreu@gmail.com>
…r-prometheus-c10186e * upstream/main: BUGFIX: Mark the rule's restoration process as completed always (#14048) removed formateoverview section (#13994) Update promu bugfix: API: encode empty Vector/Matrix as [] test: API: check empty responses refactor: API: separate typed and unsafe marshalling refactor: API: be explicit that we marshal empty objects tests: API: Let nil expected response mean skip check tests: API: Use jsoniter when encoding tests: API: simplify check of error response Prepare v2.52 release
|
|
|
I had no conflicts. |
pracucci
approved these changes
May 3, 2024
4 tasks
gotjosh
added a commit
to grafana/mimir
that referenced
this pull request
May 3, 2024
* Update Mimir Prometheus to `ee1b0be` The whole list of changes is included as part of Mimir Prometheus PR in grafana/mimir-prometheus#622, grafana/mimir-prometheus#623 and grafana/mimir-prometheus#625 Two relevant pieces: Introduces a way to speed-up ruler recovery and a bugfix for the query API and matrix values. Signed-off-by: gotjosh <josue.abreu@gmail.com> --------- Signed-off-by: gotjosh <josue.abreu@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relevant
Not relevant
release-2.52back to main prometheus/prometheus#14039