diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go index 6357e55cc1..0c64b19736 100644 --- a/cmd/promtool/main.go +++ b/cmd/promtool/main.go @@ -476,13 +476,15 @@ type rulesLintConfig struct { } func newRulesLintConfig(stringVal string, fatal, ignoreUnknownFields bool, nameValidationScheme model.ValidationScheme) rulesLintConfig { - items := strings.Split(stringVal, ",") ls := rulesLintConfig{ fatal: fatal, ignoreUnknownFields: ignoreUnknownFields, nameValidationScheme: nameValidationScheme, } - for _, setting := range items { + if stringVal == "" { + return ls + } + for _, setting := range strings.Split(stringVal, ",") { switch setting { case lintOptionAll: ls.all = true @@ -534,9 +536,7 @@ func newConfigLintConfig(optionsStr string, fatal, ignoreUnknownFields bool, nam rulesOptions = nil } - if len(rulesOptions) > 0 { - c.rulesLintConfig = newRulesLintConfig(strings.Join(rulesOptions, ","), fatal, ignoreUnknownFields, nameValidationScheme) - } + c.rulesLintConfig = newRulesLintConfig(strings.Join(rulesOptions, ","), fatal, ignoreUnknownFields, nameValidationScheme) return c } diff --git a/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml b/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml index 0c85d13f31..fe21d21707 100644 --- a/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml +++ b/cmd/promtool/testdata/prometheus-config.lint.too_long_scrape_interval.yml @@ -1,3 +1,5 @@ scrape_configs: - job_name: too_long_scrape_interval_test scrape_interval: 10m +rule_files: + - prometheus-config.rules.good.yml diff --git a/cmd/promtool/testdata/prometheus-config.rules.good.yml b/cmd/promtool/testdata/prometheus-config.rules.good.yml new file mode 100644 index 0000000000..4529a3ec86 --- /dev/null +++ b/cmd/promtool/testdata/prometheus-config.rules.good.yml @@ -0,0 +1,3 @@ +groups: + - name: rules + rules: []