Skip to content

Dropping support Prometheus 1.x rule format on configdb #4826

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

Merged
merged 2 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
- `-flusher.wal-dir`, `-flusher.concurrent-flushes`, `-flusher.flush-op-timeout`
* [CHANGE] Remove support for alertmanager and ruler legacy store configuration. Before upgrading, you need to convert your configuration to use the `alertmanager-storage` and `ruler-storage` configuration on the version that you're already running, then upgrade.
* [CHANGE] Disables TSDB isolation. #4825
* [CHANGE] Drops support Prometheus 1.x rule format on configdb. #4826
* [ENHANCEMENT] Querier/Ruler: Retry store-gateway in case of unexpected failure, instead of failing the query. #4532
* [ENHANCEMENT] Ring: DoBatch prioritize 4xx errors when failing. #4783
* [ENHANCEMENT] Cortex now built with Go 1.18. #4829
Expand Down
4 changes: 2 additions & 2 deletions pkg/configs/api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func Test_SetConfig_ValidatesAlertmanagerConfig(t *testing.T) {

userID := makeUserID()
for i, test := range amCfgValidationTests {
cfg := userconfig.Config{AlertmanagerConfig: test.config}
cfg := userconfig.Config{AlertmanagerConfig: test.config, RulesConfig: userconfig.RulesConfig{FormatVersion: userconfig.RuleFormatV2}}
resp := requestAsUser(t, userID, "POST", "/api/prom/configs/alertmanager", "", readerFromConfig(t, cfg))

if !test.shouldFail {
Expand Down Expand Up @@ -322,7 +322,7 @@ func Test_SetConfig_ValidatesAlertmanagerConfig_WithEmailEnabled(t *testing.T) {
defer cleanup(t)

userID := makeUserID()
cfg := userconfig.Config{AlertmanagerConfig: config}
cfg := userconfig.Config{AlertmanagerConfig: config, RulesConfig: userconfig.RulesConfig{FormatVersion: userconfig.RuleFormatV2}}
resp := requestAsUser(t, userID, "POST", "/api/prom/configs/alertmanager", "", readerFromConfig(t, cfg))

assert.Equal(t, http.StatusNoContent, resp.Code)
Expand Down
2 changes: 1 addition & 1 deletion pkg/configs/api/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func makeConfig() userconfig.Config {

receivers:
- name: noop`),
RulesConfig: userconfig.RulesConfig{},
RulesConfig: userconfig.RulesConfig{FormatVersion: userconfig.RuleFormatV2},
}
}

Expand Down
340 changes: 0 additions & 340 deletions pkg/configs/legacy_promql/ast.go

This file was deleted.

Loading