Skip to content

Feat/config section #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 17, 2025
Merged

Feat/config section #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02a766e
expose puppet file locations as commandline arguments
UiP9AV6Y Jan 24, 2024
76fa165
Merge remote-tracking branch 'UiP9AV6Y/feature_cli_file_args' into fe…
giacomd Nov 17, 2025
d8899ac
feat: add parameter to define which section of the puppet config file…
giacomd Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 30 additions & 11 deletions puppet-agent-exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ import (
"golang.org/x/term"
)

type config struct {
listenAddress string
telemetryPath string
puppetReportFile string
puppetConfigFile string
puppetConfigSection string
}

func setupLogger() func() {
var logger *zap.Logger
var err error
Expand Down Expand Up @@ -78,22 +86,25 @@ 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,
ConfigSection: cfg.puppetConfigSection,
})
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() {
Expand Down Expand Up @@ -125,10 +136,18 @@ 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.Flag("puppet.config-section", "Stanza to consider in the Puppet configuration.").
Default("main").StringVar(&cfg.puppetConfigSection)
kingpin.HelpFlag.Short('h')
kingpin.Parse()

Expand All @@ -138,7 +157,7 @@ func main() {
ctx, onExit := setupInterruptContext()
defer onExit()

if ok := run(ctx, *listenAddress, *telemetryPath); !ok {
if ok := run(ctx, &cfg); !ok {
os.Exit(1)
}
}
17 changes: 13 additions & 4 deletions puppetconfig/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ var configDesc = prometheus.NewDesc(
)

type Collector struct {
Logger Logger
ConfigPath string
Logger Logger
ConfigPath string
ConfigSection string
}

func (c Collector) Describe(ch chan<- *prometheus.Desc) {
Expand All @@ -41,8 +42,9 @@ func (c Collector) Collect(ch chan<- prometheus.Metric) {
c.Logger.Errorw("puppet_open_config_failed", "err", err)
return
}
server := config.Section("main").Key("server").String()
environment := config.Section("main").Key("environment").String()
section := c.configSection()
server := config.Section(section).Key("server").String()
environment := config.Section(section).Key("environment").String()
ch <- prometheus.MustNewConstMetric(configDesc, prometheus.GaugeValue, 1, server, environment)
}

Expand All @@ -53,6 +55,13 @@ func (c Collector) configPath() string {
return "/etc/puppetlabs/puppet/puppet.conf"
}

func (c Collector) configSection() string {
if c.ConfigSection != "" {
return c.ConfigSection
}
return "main"
}

type Logger interface {
Errorw(msg string, keysAndValues ...interface{})
Panicw(msg string, keysAndValues ...interface{})
Expand Down