diff --git a/cmd/karma/tests/testscript/log_full_config_env.txt b/cmd/karma/tests/testscript/log_full_config_env.txt index 8fb2d2e39..629ffc44d 100644 --- a/cmd/karma/tests/testscript/log_full_config_env.txt +++ b/cmd/karma/tests/testscript/log_full_config_env.txt @@ -61,6 +61,8 @@ env UI_THEME=dark env UI_MINIMALGROUPWIDTH=300 env UI_ALERTSPERGROUP=2 env UI_COLLAPSEGROUPS=expanded +env UI_MULTIGRIDLABEL=cluster +env UI_MULTIGRIDSORTREVERSE=true karma.bin-should-work --check-config ! stdout . @@ -184,5 +186,7 @@ level=info msg=" theme: dark" level=info msg=" minimalGroupWidth: 300" level=info msg=" alertsPerGroup: 2" level=info msg=" collapseGroups: expanded" +level=info msg=" multiGridLabel: cluster" +level=info msg=" multiGridSortReverse: true" level=info msg="[ro] Configured Alertmanager source at http://localhost:9093 (proxied: false, readonly: true)" level=info msg="Configuration is valid" diff --git a/cmd/karma/tests/testscript/log_full_config_file.txt b/cmd/karma/tests/testscript/log_full_config_file.txt index a3ca391e7..a4eac3642 100644 --- a/cmd/karma/tests/testscript/log_full_config_file.txt +++ b/cmd/karma/tests/testscript/log_full_config_file.txt @@ -147,6 +147,8 @@ ui: minimalGroupWidth: 420 alertsPerGroup: 5 collapseGroups: collapsedOnMobile + multiGridLabel: severity + multiGridSortReverse: true -- ca.pem -- -----BEGIN CERTIFICATE----- @@ -425,6 +427,8 @@ level=info msg=" theme: auto" level=info msg=" minimalGroupWidth: 420" level=info msg=" alertsPerGroup: 5" level=info msg=" collapseGroups: collapsedOnMobile" +level=info msg=" multiGridLabel: severity" +level=info msg=" multiGridSortReverse: true" level=info msg="[ha1] Configured Alertmanager source at http://localhost:9093 (proxied: true, readonly: false)" level=info msg="[ha2] Configured Alertmanager source at http://localhost:9094 (proxied: false, readonly: true)" level=info msg="[local] Configured Alertmanager source at http://localhost:9095 (proxied: true, readonly: false)" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index aa8fb4d99..95f68f236 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -123,6 +123,8 @@ ui: minimalGroupWidth: 420 alertsPerGroup: 5 collapseGroups: collapsedOnMobile + multiGridLabel: "" + multiGridSortReverse: false ` configDump, err := yaml.Marshal(Config) diff --git a/internal/config/models.go b/internal/config/models.go index 9f23988a7..f8b96891d 100644 --- a/internal/config/models.go +++ b/internal/config/models.go @@ -155,12 +155,14 @@ type configSchema struct { } } `yaml:"silenceForm" koanf:"silenceForm"` UI struct { - Refresh time.Duration - HideFiltersWhenIdle bool `yaml:"hideFiltersWhenIdle" koanf:"hideFiltersWhenIdle"` - ColorTitlebar bool `yaml:"colorTitlebar" koanf:"colorTitlebar"` - Theme string `yaml:"theme" koanf:"theme"` - MinimalGroupWidth int `yaml:"minimalGroupWidth" koanf:"minimalGroupWidth"` - AlertsPerGroup int `yaml:"alertsPerGroup" koanf:"alertsPerGroup"` - CollapseGroups string `yaml:"collapseGroups" koanf:"collapseGroups"` + Refresh time.Duration + HideFiltersWhenIdle bool `yaml:"hideFiltersWhenIdle" koanf:"hideFiltersWhenIdle"` + ColorTitlebar bool `yaml:"colorTitlebar" koanf:"colorTitlebar"` + Theme string `yaml:"theme" koanf:"theme"` + MinimalGroupWidth int `yaml:"minimalGroupWidth" koanf:"minimalGroupWidth"` + AlertsPerGroup int `yaml:"alertsPerGroup" koanf:"alertsPerGroup"` + CollapseGroups string `yaml:"collapseGroups" koanf:"collapseGroups"` + MultiGridLabel string `yaml:"multiGridLabel" koanf:"multiGridLabel"` + MultiGridSortReverse bool `yaml:"multiGridSortReverse" koanf:"multiGridSortReverse"` } }