From 12789a4621a5505298cc79f53a946204cfd702f3 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Fri, 6 Mar 2020 20:18:28 +0200 Subject: [PATCH] app/vmagent: do not allow non-supported fields in `-remoteWrite.relabelConfig` and `file_sd_configs` This should reduce possible confusion like in the https://github.com/VictoriaMetrics/VictoriaMetrics/issues/363 --- lib/promrelabel/config.go | 2 +- lib/promscrape/config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/promrelabel/config.go b/lib/promrelabel/config.go index f0df2073be..3555cb55b4 100644 --- a/lib/promrelabel/config.go +++ b/lib/promrelabel/config.go @@ -28,7 +28,7 @@ func LoadRelabelConfigs(path string) ([]ParsedRelabelConfig, error) { return nil, fmt.Errorf("cannot read `relabel_configs` from %q: %s", path, err) } var rcs []RelabelConfig - if err := yaml.Unmarshal(data, &rcs); err != nil { + if err := yaml.UnmarshalStrict(data, &rcs); err != nil { return nil, fmt.Errorf("cannot unmarshal `relabel_configs` from %q: %s", path, err) } return ParseRelabelConfigs(nil, rcs) diff --git a/lib/promscrape/config.go b/lib/promscrape/config.go index 77249cb7aa..36a28c8967 100644 --- a/lib/promscrape/config.go +++ b/lib/promscrape/config.go @@ -102,7 +102,7 @@ func loadStaticConfigs(path string) ([]StaticConfig, error) { return nil, fmt.Errorf("cannot read `static_configs` from %q: %s", path, err) } var stcs []StaticConfig - if err := yaml.Unmarshal(data, &stcs); err != nil { + if err := yaml.UnmarshalStrict(data, &stcs); err != nil { return nil, fmt.Errorf("cannot unmarshal `static_configs` from %q: %s", path, err) } return stcs, nil