-
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
Commits on Apr 24, 2024
-
Merge pull request #13986 from prometheus/main
promtool: Fix panic on extended tsdb analyze (#13976)
Configuration menu - View commit details
-
Copy full SHA for 2950521 - Browse repository at this point
Copy the full SHA 2950521View commit details -
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
Arthur Silva Sens committedApr 24, 2024 Configuration menu - View commit details
-
Copy full SHA for 9195d51 - Browse repository at this point
Copy the full SHA 9195d51View commit details
Commits on Apr 29, 2024
-
tests: API: simplify check of error response
Since we already use require.JSONEq in similar cases. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 2c4a363 - Browse repository at this point
Copy the full SHA 2c4a363View commit details -
tests: API: Use jsoniter when encoding
So that tests use the same encoding as the api. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 5a339ba - Browse repository at this point
Copy the full SHA 5a339baView commit details -
tests: API: Let nil expected response mean skip check
When we want to check just the json encoding. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for c8aed6b - Browse repository at this point
Copy the full SHA c8aed6bView commit details -
refactor: API: be explicit that we marshal empty objects
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 66a1c3d - Browse repository at this point
Copy the full SHA 66a1c3dView commit details -
refactor: API: separate typed and unsafe marshalling
The typed versions are used when we call from one marshaller to another. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for e0a00f4 - Browse repository at this point
Copy the full SHA e0a00f4View commit details -
test: API: check empty responses
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 00247b5 - Browse repository at this point
Copy the full SHA 00247b5View commit details -
bugfix: API: encode empty Vector/Matrix as []
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>
Configuration menu - View commit details
-
Copy full SHA for 5c8ffaa - Browse repository at this point
Copy the full SHA 5c8ffaaView commit details -
Merge pull request #13997 from bboreham/api-marshalling
bugfix: API: encode empty Vector/Matrix as [] not null
Configuration menu - View commit details
-
Copy full SHA for 3d42466 - Browse repository at this point
Copy the full SHA 3d42466View commit details
Commits on Apr 30, 2024
-
Merge pull request #13969 from prometheus/prepare-v2.52
Prepare v2.52.0-rc.0 release
Configuration menu - View commit details
-
Copy full SHA for f170a01 - Browse repository at this point
Copy the full SHA f170a01View commit details
Commits on May 1, 2024
-
Update promu to the latest release. Signed-off-by: SuperQ <superq@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for f09cf2d - Browse repository at this point
Copy the full SHA f09cf2dView commit details
Commits on May 2, 2024
-
Merge remote-tracking branch 'origin/main' into resolve-conflicts-2.52
Arthur Silva Sens committedMay 2, 2024 Configuration menu - View commit details
-
Copy full SHA for 650f4d7 - Browse repository at this point
Copy the full SHA 650f4d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73f42fe - Browse repository at this point
Copy the full SHA 73f42feView commit details -
Merge pull request #14039 from prometheus/resolve-conflicts-2.52
Merge `release-2.52` back to main
Configuration menu - View commit details
-
Copy full SHA for 94c81bb - Browse repository at this point
Copy the full SHA 94c81bbView commit details
Commits on May 3, 2024
-
removed formateoverview section (#13994)
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>
Configuration menu - View commit details
-
Copy full SHA for d2caf51 - Browse repository at this point
Copy the full SHA d2caf51View commit details -
BUGFIX: Mark the rule's restoration process as completed always (#14048)
* 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>
Configuration menu - View commit details
-
Copy full SHA for c10186e - Browse repository at this point
Copy the full SHA c10186eView commit details -
Merge remote-tracking branch 'upstream/main' into gotjosh/update-mimi…
…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
Configuration menu - View commit details
-
Copy full SHA for 530e146 - Browse repository at this point
Copy the full SHA 530e146View commit details