Conversation
e0d9502 to
cac28d3
Compare
Signed-off-by: gotjosh <josue.abreu@gmail.com>
cac28d3 to
a0d920f
Compare
| uptime: time.Now(), | ||
| peer: peer, | ||
| logger: l, | ||
| m: metrics.NewAlerts("v1", r), |
There was a problem hiding this comment.
Technically, we can remove this distinction now but it would be a rather critical breaking change - I would rather not risk it.
There was a problem hiding this comment.
nvm, I made it permament.
Signed-off-by: gotjosh <josue.abreu@gmail.com>
|
@simonpasquier I think this ready for review - this is currently blocking the progress on #3567 as making API v1 compatible with that work is a large endeavour for something we don't need. Would appreciate a speedy review - I think the changes to the deprecation router are good enough to let users know that something that we deprecated back in 0.18 is now gone. |
grobinson-grafana
left a comment
There was a problem hiding this comment.
Tested and LGTM! ❤️
api/v1_deprecation_router.go
Outdated
| Error string `json:"error"` | ||
| }{ | ||
| "deprecated", | ||
| "The Alertmanager v1 API was deprecated in version 0.16.0 and entirely removed since version 0.28.0 - please use the equivalent route in the v2 API", |
There was a problem hiding this comment.
Small nit, feel free to ignore 😄
| "The Alertmanager v1 API was deprecated in version 0.16.0 and entirely removed since version 0.28.0 - please use the equivalent route in the v2 API", | |
| "The Alertmanager v1 API was deprecated in version 0.16.0 and is removed as of version 0.28.0 - please use the equivalent route in the v2 API", |
| } | ||
|
|
||
| w.Header().Set("Content-Type", "application/json") | ||
| w.WriteHeader(410) |
api/v1_deprecation_router.go
Outdated
| w.WriteHeader(410) | ||
|
|
||
| // We don't care about errors for this route. | ||
| b, _ := json.Marshal(resp) |
There was a problem hiding this comment.
You don't need to change this, but you can also use:
if err := json.NewEncoder(w).Encode(resp); err != nil {
level.Error(dr.logger).Log("msg", "failed to write response", "err", err)
}|
Looks great in general, but you are so deep into the weeds here that I don't feel qualified to evaluate the details. :) |
Signed-off-by: gotjosh <josue.abreu@gmail.com>
93c6ea4 to
0cf6797
Compare
|
Thanks @beorn7 - With the amount of context you have, you'll always be overqualified to review anything we throw at you. |
|
Should we follow up with a change on prometheus to now allow configuring v1 endpoints anymore? |
Yes please Alan! Would you be happy to open a PR for that? |
* [CHANGE] Deprecate and remove api/v1/ #2970 * [CHANGE] Remove unused feature flags #3676 * [CHANGE] Newlines in smtp password file are now ignored #3681 * [CHANGE] Change compat metrics to counters #3686 * [CHANGE] Do not register compat metrics in amtool #3713 * [CHANGE] Remove metrics from compat package #3714 * [CHANGE] Mark muted alerts #3793 * [FEATURE] Add metric for inhibit rules #3681 * [FEATURE] Support UTF-8 label matchers #3453, #3507, #3523, #3483, #3567, #3568, #3569, #3571, #3595, #3604, #3619, #3658, #3659, #3662, #3668, 3572 * [FEATURE] Add counter to track alerts dropped outside of time_intervals #3565 * [FEATURE] Add date and tz functions to templates #3812 * [FEATURE] Add limits for silences #3852 * [FEATURE] Add time helpers for templates #3863 * [FEATURE] Add auto GOMAXPROCS #3837 * [FEATURE] Add auto GOMEMLIMIT #3895 * [FEATURE] Add Jira receiver integration #3590 * [ENHANCEMENT] Add the receiver name to notification metrics #3045 * [ENHANCEMENT] Add the route ID to uuid #3372 * [ENHANCEMENT] Add duration to the notify success message #3559 * [ENHANCEMENT] Implement webhook_url_file for discord and msteams #3555 * [ENHANCEMENT] Add debug logs for muted alerts #3558 * [ENHANCEMENT] API: Allow the Silences API to use their own 400 response #3610 * [ENHANCEMENT] Add summary to msteams notification #3616 * [ENHANCEMENT] Add context reasons to notifications failed counter #3631 * [ENHANCEMENT] Add optional native histogram support to latency metrics #3737 * [ENHANCEMENT] Enable setting ThreadId for Telegram notifications #3638 * [ENHANCEMENT] Allow webex roomID from template #3801 * [BUGFIX] Add missing integrations to notify metrics #3480 * [BUGFIX] Add missing ttl in pushhover #3474 * [BUGFIX] Fix scheme required for webhook url in amtool #3409 * [BUGFIX] Remove duplicate integration from metrics #3516 * [BUGFIX] Reflect Discord's max length message limits #3597 * [BUGFIX] Fix nil error in warn logs about incompatible matchers #3683 * [BUGFIX] Fix a small number of inconsistencies in compat package logging #3718 * [BUGFIX] Fix log line in featurecontrol #3719 * [BUGFIX] Fix panic in acceptance tests #3592 * [BUGFIX] Fix flaky test TestClusterJoinAndReconnect/TestTLSConnection #3722 * [BUGFIX] Fix crash on errors when url_file is used #3800 * [BUGFIX] Fix race condition in dispatch.go #3826 * [BUGFIX] Fix race conditions in the memory alerts store #3648 * [BUGFIX] Hide config.SecretURL when the URL is incorrect. #3887 * [BUGFIX] Fix invalid silence causes incomplete updates #3898 * [BUGFIX] Fix leaking of Silences matcherCache entries #3930 * [BUGFIX] Close SMTP submission correctly to handle errors #4006 Signed-off-by: SuperQ <superq@gmail.com>
* Deprecate and remove api/v1/ Signed-off-by: gotjosh <josue.abreu@gmail.com> --------- Signed-off-by: gotjosh <josue.abreu@gmail.com>
This is intentionally incomplete and is open mostly as a guideline to see what breaks.
The description will be updated once the work is finished and serves as a checklist to give visibility of a plan for reviewers.
fixes #2469
The steps to take are:
/api/v1/alertsto behave like/api/v2/alerts.api/v1Edit:
api/v1/*redirect to the/api/v2I opted for adding a deprecation notice in JSON to all of the v1 routes. On top of that, each time a v1 route is called it'll log a warning letting the operator know that something is not going right.