Update exporter-toolkit

Update to the latest exporter-toolkit * Enables multi-listener and systemd socket activation. * Bump Go to 1.19. * Remove `PG_EXPORTER_WEB_LISTEN_ADDRESS` env var because this is now a repeatable flag. Signed-off-by: SuperQ <superq@gmail.com>

Author: SuperQ

.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
  # This must match .promu.yml.
  golang:
  docker:
- - image: cimg/go:1.18
+ - image: cimg/go:1.19
 
 jobs:
  test:
@@ -22,7 +22,7 @@ jobs:
 
  integration:
  docker:
- - image: cimg/go:1.18
+ - image: cimg/go:1.19
  - image: << parameters.postgres_image >>
  environment:
  POSTGRES_DB: circle_test

.promu.yml

@@ -1,6 +1,6 @@
 go:
  # This must match .circle/config.yml.
- version: 1.18
+ version: 1.19
 repository:
  path: github.com/prometheus-community/postgres_exporter
 build:

README.md

@@ -152,9 +152,6 @@ The following environment variables configure the exporter:
 * `DATA_SOURCE_PASS_FILE`
  The same as above but reads the password from a file.
 
-* `PG_EXPORTER_WEB_LISTEN_ADDRESS`
- Address to listen on for web interface and telemetry. Default is `:9187`.
-
 * `PG_EXPORTER_WEB_TELEMETRY_PATH`
  Path under which to expose metrics. Default is `/metrics`.
 

cmd/postgres_exporter/main.go

@@ -27,7 +27,7 @@ import (
 "github.com/prometheus/common/promlog/flag"
 "github.com/prometheus/common/version"
 "github.com/prometheus/exporter-toolkit/web"
-webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag"
+"github.com/prometheus/exporter-toolkit/web/kingpinflag"
 "gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -37,8 +37,7 @@ var (
 }
 
 configFile = kingpin.Flag("config.file", "Postgres exporter configuration file.").Default("postgres_exporter.yml").String()
-listenAddress = kingpin.Flag("web.listen-address", "Address to listen on for web interface and telemetry.").Default(":9187").Envar("PG_EXPORTER_WEB_LISTEN_ADDRESS").String()
-webConfig = webflag.AddFlags(kingpin.CommandLine)
+webConfig = kingpinflag.AddFlags(kingpin.CommandLine, ":9187")
 metricPath = kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").Default("/metrics").Envar("PG_EXPORTER_WEB_TELEMETRY_PATH").String()
 disableDefaultMetrics = kingpin.Flag("disable-default-metrics", "Do not include default metrics.").Default("false").Envar("PG_EXPORTER_DISABLE_DEFAULT_METRICS").Bool()
 disableSettingsMetrics = kingpin.Flag("disable-settings-metrics", "Do not include pg_settings metrics.").Default("false").Envar("PG_EXPORTER_DISABLE_SETTINGS_METRICS").Bool()
@@ -146,9 +145,8 @@ func main() {
 
 http.HandleFunc("/probe", handleProbe(logger))
 
-level.Info(logger).Log("msg", "Listening on address", "address", *listenAddress)
-srv := &http.Server{Addr: *listenAddress}
-if err := web.ListenAndServe(srv, *webConfig, logger); err != nil {
+srv := &http.Server{}
+if err := web.ListenAndServe(srv, webConfig, logger); err != nil {
 level.Error(logger).Log("msg", "Error running HTTP server", "err", err)
 os.Exit(1)
 }

go.mod

@@ -9,7 +9,7 @@ require (
 github.com/prometheus/client_golang v1.13.0
 github.com/prometheus/client_model v0.2.0
 github.com/prometheus/common v0.37.0
-github.com/prometheus/exporter-toolkit v0.7.1
+github.com/prometheus/exporter-toolkit v0.8.2
 gopkg.in/alecthomas/kingpin.v2 v2.2.6
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 gopkg.in/yaml.v2 v2.4.0
@@ -18,23 +18,24 @@ require (
 
 require (
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
+github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 github.com/beorn7/perks v1.0.1 // indirect
 github.com/cespare/xxhash/v2 v2.1.2 // indirect
+github.com/coreos/go-systemd/v22 v22.4.0 // indirect
 github.com/go-logfmt/logfmt v0.5.1 // indirect
 github.com/golang/protobuf v1.5.2 // indirect
 github.com/jpillora/backoff v1.0.0 // indirect
 github.com/kr/pretty v0.2.1 // indirect
 github.com/kr/text v0.1.0 // indirect
 github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-github.com/pkg/errors v0.9.1 // indirect
 github.com/prometheus/procfs v0.8.0 // indirect
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
+golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
+golang.org/x/sync v0.1.0 // indirect
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 golang.org/x/text v0.3.7 // indirect
-google.golang.org/appengine v1.6.6 // indirect
+google.golang.org/appengine v1.6.7 // indirect
 google.golang.org/protobuf v1.28.1 // indirect
 )