mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-19 23:37:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

file sd: only glob on actual patterns

Browse source 
The previous implementation can be confusing. It will glob even regular
file paths, which means passing in a non-existing filepath will not
result in an error. This is counter-intuitive, as examplified in #12356.
As a result of this change, the following can be seen in logs:

```
ts=2023-09-23T17:53:57.332Z caller=file.go:352 level=error component="discovery manager scrape" discovery=file config=testFile msg="Error reading file" path=banana.yml err="open banana.yml: no such file or directory"
```

And the file SD error count is also incremented now as a consequence.
I've also documented this behaviour, as I believe the documentation
wasn't necessarily clear on the fact that pattern would be globbed.
Fixes #12356.

Signed-off-by: Mickael Carl <mcarl@apple.com>
This commit is contained in:
Mickael Carl 2023-09-23 19:10:13 +01:00
parent 86729d4d7b
commit 11503777a1
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
discovery/file/file.go
View file

@ -209,12 +209,16 @@ func NewDiscovery(conf *SDConfig, logger log.Logger) *Discovery {
func (d *Discovery) listFiles() []string {
var paths []string
for _, p := range d.paths {
files, err := filepath.Glob(p)
if err != nil {
level.Error(d.logger).Log("msg", "Error expanding glob", "glob", p, "err", err)
continue
if strings.ContainsAny(p, "^?*[") {
files, err := filepath.Glob(p)
if err != nil {
level.Error(d.logger).Log("msg", "Error expanding glob", "glob", p, "err", err)
continue
}
paths = append(paths, files...)
} else {
paths = append(paths, p)
}
paths = append(paths, files...)
}
return paths
}

5
docs/configuration/configuration.md
View file

@ -1578,8 +1578,9 @@ files:
[ refresh_interval: <duration> | default = 5m ]
```
Where `<filename_pattern>` may be a path ending in `.json`, `.yml` or `.yaml`. The last path segment
may contain a single `*` that matches any character sequence, e.g. `my/path/tg_*.json`.
Where `<filename_pattern>` may be a path ending in `.json`, `.yml` or `.yaml`.
If the pattern contains any of `?`, `*`, `^` or `[`, it will be treated as a
glob and expanded.
### `<gce_sd_config>`