-
Notifications
You must be signed in to change notification settings - Fork 9
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 upstream prometheus/prometheus at c10186e
#623
Conversation
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
Arthur Silva Sens seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
I had no conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Remember to merge with merge commit.
* 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>
Relevant
Not relevant
release-2.52
back to main prometheus/prometheus#14039