File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 66 "maps"
77 "os"
88 "path/filepath"
9+ "strings"
910 "sync"
1011
1112 "gopkg.in/yaml.v3"
@@ -64,13 +65,16 @@ func (fmr *fileMetricReader) getMetrics() (metrics *Metrics, err error) {
6465 }
6566 switch mode := fi .Mode (); {
6667 case mode .IsDir ():
67- var matches []string
68- if matches , err = filepath . Glob ( filepath . Join ( fmr .path , "*.y*ml" ) ); err != nil {
68+ var entries []os. DirEntry
69+ if entries , err = os . ReadDir ( fmr .path ); err != nil {
6970 return nil , err
7071 }
71- for _ , path := range matches {
72+ for _ , entry := range entries {
73+ if ext := strings .ToLower (filepath .Ext (entry .Name ())); ext != ".yaml" && ext != ".yml" {
74+ continue
75+ }
7276 var m * Metrics
73- if m , err = fmr .loadMetricsFromFile (path ); err != nil {
77+ if m , err = fmr .loadMetricsFromFile (filepath . Join ( fmr . path , entry . Name ()) ); err != nil {
7478 return nil , err
7579 }
7680 maps .Copy (metrics .PresetDefs , m .PresetDefs )
Original file line number Diff line number Diff line change @@ -103,13 +103,16 @@ func (fcr *fileSourcesReaderWriter) getSources() (dbs Sources, err error) {
103103 }
104104 switch mode := fi .Mode (); {
105105 case mode .IsDir ():
106- var matches []string
107- if matches , err = filepath . Glob ( filepath . Join ( fcr .path , "*.y*ml" ) ); err != nil {
108- return
106+ var entries []os. DirEntry
107+ if entries , err = os . ReadDir ( fcr .path ); err != nil {
108+ return nil , err
109109 }
110- for _ , path := range matches {
110+ for _ , entry := range entries {
111+ if ext := strings .ToLower (filepath .Ext (entry .Name ())); ext != ".yaml" && ext != ".yml" {
112+ continue
113+ }
111114 var mdbs Sources
112- if mdbs , err = fcr .loadSourcesFromFile (path ); err != nil {
115+ if mdbs , err = fcr .loadSourcesFromFile (filepath . Join ( fcr . path , entry . Name ()) ); err != nil {
113116 return
114117 }
115118 dbs = append (dbs , mdbs ... )
You can’t perform that action at this time.
0 commit comments