fix(filesystem): only watch for files with the .yaml extension

fixes #726

Author: BradErz

filesystem.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/bufbuild/connect-go"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
@@ -170,7 +171,12 @@ func cmdFilesystem(logger log.Logger, reg *prometheus.Registry, promClient api.C
 				case <-ctx.Done():
 					return nil
 				case f := <-files:
-					level.Debug(logger).Log("msg", "reading", "file", f)
+					// We only care about watching for files with the .yaml extension
+					if filepath.Ext(f) != ".yaml" {
+						continue
+					}
+
+					level.Debug(logger).Log("msg", "processing", "file", f)
 					reconcilesTotal.Inc()
 
 					err := writeRuleFile(logger, f, prometheusFolder, genericRules, false)

filesystem_test.go

@@ -10,16 +10,16 @@ import (
 )
 
 func TestMatchObjectives(t *testing.T) {
-	o1 := slo.Objective{Labels: labels.FromStrings("foo", "bar")}
-	o2 := slo.Objective{Labels: labels.FromStrings("foo", "bar", "ying", "yang")}
-	o3 := slo.Objective{Labels: labels.FromStrings("foo", "bar", "yes", "no")}
-	o4 := slo.Objective{Labels: labels.FromStrings("foo", "baz")}
+	obj1 := slo.Objective{Labels: labels.FromStrings("foo", "bar")}
+	obj2 := slo.Objective{Labels: labels.FromStrings("foo", "bar", "ying", "yang")}
+	obj3 := slo.Objective{Labels: labels.FromStrings("foo", "bar", "yes", "no")}
+	obj4 := slo.Objective{Labels: labels.FromStrings("foo", "baz")}
 
 	objectives := Objectives{objectives: map[string]slo.Objective{}}
-	objectives.Set(o1)
-	objectives.Set(o2)
-	objectives.Set(o3)
-	objectives.Set(o4)
+	objectives.Set(obj1)
+	objectives.Set(obj2)
+	objectives.Set(obj3)
+	objectives.Set(obj4)
 
 	matches := objectives.Match([]*labels.Matcher{
 		labels.MustNewMatcher(labels.MatchEqual, "foo", "foo"),
@@ -30,29 +30,29 @@ func TestMatchObjectives(t *testing.T) {
 		labels.MustNewMatcher(labels.MatchEqual, "foo", "bar"),
 	})
 	require.Len(t, matches, 3)
-	require.Contains(t, matches, o1)
-	require.Contains(t, matches, o2)
-	require.Contains(t, matches, o3)
+	require.Contains(t, matches, obj1)
+	require.Contains(t, matches, obj2)
+	require.Contains(t, matches, obj3)
 
 	matches = objectives.Match([]*labels.Matcher{
 		labels.MustNewMatcher(labels.MatchEqual, "foo", "baz"),
 	})
 	require.Len(t, matches, 1)
-	require.Contains(t, matches, o4)
+	require.Contains(t, matches, obj4)
 
 	matches = objectives.Match([]*labels.Matcher{
 		labels.MustNewMatcher(labels.MatchEqual, "foo", "bar"),
 		labels.MustNewMatcher(labels.MatchEqual, "ying", "yang"),
 	})
 	require.Len(t, matches, 1)
-	require.Contains(t, matches, o2)
+	require.Contains(t, matches, obj2)
 
 	matches = objectives.Match([]*labels.Matcher{
 		labels.MustNewMatcher(labels.MatchRegexp, "foo", "ba."),
 	})
 	require.Len(t, matches, 4)
-	require.Contains(t, matches, o1)
-	require.Contains(t, matches, o2)
-	require.Contains(t, matches, o3)
-	require.Contains(t, matches, o4)
+	require.Contains(t, matches, obj1)
+	require.Contains(t, matches, obj2)
+	require.Contains(t, matches, obj3)
+	require.Contains(t, matches, obj4)
 }

main.go

@@ -61,7 +61,7 @@ var CLI struct {
 		PrometheusBasicAuthPassword promconfig.Secret `default:"" help:"The HTTP basic authentication password"`
 	} `cmd:"" help:"Runs Pyrra's API and UI."`
 	Filesystem struct {
-		ConfigFiles      string   `default:"/etc/pyrra/*.yaml" help:"The folder where Pyrra finds the config files to use."`
+		ConfigFiles      string   `default:"/etc/pyrra/*.yaml" help:"The folder where Pyrra finds the config files to use. Any non yaml files will be ignored."`
 		PrometheusURL    *url.URL `default:"http://localhost:9090" help:"The URL to the Prometheus to query."`
 		PrometheusFolder string   `default:"/etc/prometheus/pyrra/" help:"The folder where Pyrra writes the generates Prometheus rules and alerts."`
 		GenericRules     bool     `default:"false" help:"Enabled generic recording rules generation to make it easier for tools like Grafana."`