Fixed watch mode

cmd/pint/ci.go

@@ -105,6 +105,10 @@ func actionCI(c *cli.Context) error {
 	gen := config.NewPrometheusGenerator(meta.cfg, metricsRegistry)
 	defer gen.Stop()
 
+	if err = gen.GenerateStatic(); err != nil {
+		return err
+	}
+
 	slog.Debug("Generated all Prometheus servers", slog.Int("count", gen.Count()))
 
 	summary, err := checkRules(ctx, meta.workers, gen, meta.cfg, entries)

cmd/pint/lint.go

@@ -65,6 +65,10 @@ func actionLint(c *cli.Context) error {
 	gen := config.NewPrometheusGenerator(meta.cfg, metricsRegistry)
 	defer gen.Stop()
 
+	if err = gen.GenerateStatic(); err != nil {
+		return err
+	}
+
 	summary, err := checkRules(ctx, meta.workers, gen, meta.cfg, entries)
 	if err != nil {
 		return err

cmd/pint/scan.go

@@ -56,7 +56,7 @@ func tryDecodingYamlError(err error) (l int, s string) {
 
 func checkRules(ctx context.Context, workers int, gen *config.PrometheusGenerator, cfg config.Config, entries []discovery.Entry) (summary reporter.Summary, err error) {
 	if len(entries) > 0 {
-		if err = gen.Generate(ctx); err != nil {
+		if err = gen.GenerateDynamic(ctx); err != nil {
 			return summary, err
 		}
 		slog.Debug("Generated all Prometheus servers", slog.Int("count", gen.Count()))

cmd/pint/watch.go

@@ -151,6 +151,9 @@ func actionWatch(c *cli.Context) error {
 	interval := c.Duration(intervalFlag)
 
 	gen := config.NewPrometheusGenerator(meta.cfg, metricsRegistry)
+	if err = gen.GenerateStatic(); err != nil {
+		return err
+	}
 
 	// start timer to run every $interval
 	ack := make(chan bool, 1)

docs/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.48.2
+
+### Fixed
+
+- Fixed `pint watch` to correctly work with `discovery`.
+
 ## v0.48.1
 
 - Prometheus `template` under `discovery` block can now template

internal/config/config_test.go

@@ -47,7 +47,7 @@ prometheus "prom" {
 
 	gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())
 	defer gen.Stop()
-	require.NoError(t, gen.Generate(context.Background()))
+	require.NoError(t, gen.GenerateStatic())
 
 	require.Empty(t, cfg.Checks.Disabled)
 
@@ -68,7 +68,7 @@ func TestDisableOnlineChecksWithoutPrometheus(t *testing.T) {
 
 	gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())
 	defer gen.Stop()
-	require.NoError(t, gen.Generate(context.Background()))
+	require.NoError(t, gen.GenerateStatic())
 
 	require.Empty(t, cfg.Checks.Disabled)
 
@@ -94,7 +94,7 @@ prometheus "prom" {
 
 	gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())
 	defer gen.Stop()
-	require.NoError(t, gen.Generate(context.Background()))
+	require.NoError(t, gen.GenerateStatic())
 
 	require.Empty(t, cfg.Checks.Disabled)
 
@@ -121,7 +121,7 @@ func TestSetDisabledChecks(t *testing.T) {
 
 	gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())
 	defer gen.Stop()
-	require.NoError(t, gen.Generate(context.Background()))
+	require.NoError(t, gen.GenerateStatic())
 
 	require.Empty(t, cfg.Checks.Disabled)
 
@@ -1549,7 +1549,7 @@ rule {
 
 			gen := config.NewPrometheusGenerator(cfg, prometheus.NewRegistry())
 			defer gen.Stop()
-			require.NoError(t, gen.Generate(ctx))
+			require.NoError(t, gen.GenerateStatic())
 
 			checks := cfg.GetChecksForRule(ctx, gen, tc.path, tc.rule, tc.disabledChecks)
 			checkNames := make([]string, 0, len(checks))

internal/config/prometheus.go

@@ -230,14 +230,17 @@ func (pg *PrometheusGenerator) addServer(server *promapi.FailoverGroup) error {
 	return nil
 }
 
-func (pg *PrometheusGenerator) Generate(ctx context.Context) (err error) {
+func (pg *PrometheusGenerator) GenerateStatic() (err error) {
 	for _, pc := range pg.cfg.Prometheus {
 		err = pg.addServer(newFailoverGroup(pc))
 		if err != nil {
 			return err
 		}
 	}
+	return nil
+}
 
+func (pg *PrometheusGenerator) GenerateDynamic(ctx context.Context) (err error) {
 	if pg.cfg.Discovery != nil {
 		servers, err := pg.cfg.Discovery.Discover(ctx)
 		if err != nil {