Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-01-19 23:09:18 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

lib/promscrape: improve logging for scrape_config_files parse errors

Browse Source 
Log the actual file path, which led to the parse error.

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1789
This commit is contained in:
Aliaksandr Valialkin 2021-11-08 13:33:29 +02:00
parent 3419ac1d36
commit fd596945e7
No known key found for this signature in database
GPG Key ID: A72BEC6CD3D0DED1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/promscrape/config.go
View File

@ -262,7 +262,7 @@ func loadScrapeConfigFiles(baseDir string, scrapeConfigFiles []string) ([]Scrape
if strings.Contains(filePath, "*") { if strings.Contains(filePath, "*") {
ps, err := filepath.Glob(filePath) ps, err := filepath.Glob(filePath)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("invalid pattern %q in `scrape_config_files`: %w", filePath, err) return nil, nil, fmt.Errorf("invalid pattern %q: %w", filePath, err)
} }
sort.Strings(ps) sort.Strings(ps)
paths = ps paths = ps
@ -270,12 +270,12 @@ func loadScrapeConfigFiles(baseDir string, scrapeConfigFiles []string) ([]Scrape
for _, path := range paths { for _, path := range paths {
data, err := ioutil.ReadFile(path) data, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("cannot load %q from `scrape_config_files`: %w", filePath, err) return nil, nil, fmt.Errorf("cannot load %q: %w", path, err)
} }
data = envtemplate.Replace(data) data = envtemplate.Replace(data)
var scs []ScrapeConfig var scs []ScrapeConfig
if err = yaml.UnmarshalStrict(data, &scs); err != nil { if err = yaml.UnmarshalStrict(data, &scs); err != nil {
return nil, nil, fmt.Errorf("cannot parse %q from `scrape_config_files`: %w", filePath, err) return nil, nil, fmt.Errorf("cannot parse %q: %w", path, err)
} }
scrapeConfigs = append(scrapeConfigs, scs...) scrapeConfigs = append(scrapeConfigs, scs...)
scsData = append(scsData, '\n') scsData = append(scsData, '\n')