expose puppet file locations as commandline arguments

UiP9AV6Y · UiP9AV6Y · commit b734a7327493 · 2024-02-15T19:21:39.000+01:00
the location of the run report changed with puppet7. the debian
package patches puppet to look for the configuration file under
/etc/puppet and the report is stored under /var/cache/puppet.
other OS packages might use different paths as well. this change
exposes the already present file locations to be adjusted via
commandline arguments. the default values remain the same.

Signed-off-by: Gordon Bleux &lt;33967640+UiP9AV6Y@users.noreply.github.com&gt;
diff --git a/puppet-agent-exporter.go b/puppet-agent-exporter.go
@@ -31,6 +31,13 @@ import (
 	"golang.org/x/term"
 )
 
+type config struct {
+	listenAddress    string
+	telemetryPath    string
+	puppetReportFile string
+	puppetConfigFile string
+}
+
 func setupLogger() func() {
 	var logger *zap.Logger
 	var err error
@@ -78,22 +85,24 @@ var rootTemplate = template.Must(template.New("/").Parse(`<html>
 </html>
 `))
 
-func run(ctx context.Context, listenAddress, telemetryPath string) (ok bool) {
+func run(ctx context.Context, cfg *config) (ok bool) {
 	lgr := zap.S()
 
 	prometheus.DefaultRegisterer.MustRegister(puppetconfig.Collector{
-		Logger: lgr,
+		Logger:     lgr,
+		ConfigPath: cfg.puppetConfigFile,
 	})
 	prometheus.DefaultRegisterer.MustRegister(puppetreport.Collector{
-		Logger: lgr,
+		Logger:     lgr,
+		ReportPath: cfg.puppetReportFile,
 	})
 
 	mux := http.NewServeMux()
-	mux.Handle(telemetryPath, promhttp.Handler())
+	mux.Handle(cfg.telemetryPath, promhttp.Handler())
 	mux.HandleFunc("/", func(writer http.ResponseWriter, request *http.Request) {
-		_ = rootTemplate.Execute(writer, telemetryPath)
+		_ = rootTemplate.Execute(writer, cfg.telemetryPath)
 	})
-	server := &http.Server{Addr: listenAddress, Handler: mux}
+	server := &http.Server{Addr: cfg.listenAddress, Handler: mux}
 
 	resultCh := make(chan bool)
 	go func() {
@@ -125,10 +134,16 @@ func run(ctx context.Context, listenAddress, telemetryPath string) (ok bool) {
 
 func main() {
 	// Flag definitions copied from github.com/prometheus/node_exporter
-	var (
-		listenAddress = kingpin.Flag("web.listen-address", "Address on which to expose metrics and web interface.").Default(":9819").String()
-		telemetryPath = kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").Default("/metrics").String()
-	)
+	var cfg config
+
+	kingpin.Flag("web.listen-address", "Address on which to expose metrics and web interface.").
+		Default(":9819").StringVar(&cfg.listenAddress)
+	kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").
+		Default("/metrics").StringVar(&cfg.telemetryPath)
+	kingpin.Flag("puppet.report-file", "Path to the Puppet run report.").
+		Default("/opt/puppetlabs/puppet/cache/state/last_run_report.yaml").StringVar(&cfg.puppetReportFile)
+	kingpin.Flag("puppet.config-file", "Path to the Puppet configuration.").
+		Default("/etc/puppetlabs/puppet/puppet.conf").StringVar(&cfg.puppetConfigFile)
 	kingpin.HelpFlag.Short('h')
 	kingpin.Parse()
 
@@ -138,7 +153,7 @@ func main() {
 	ctx, onExit := setupInterruptContext()
 	defer onExit()
 
-	if ok := run(ctx, *listenAddress, *telemetryPath); !ok {
+	if ok := run(ctx, &cfg); !ok {
 		os.Exit(1)
 	}
 }
