Expose all metrics via /metrics endpoint

treydock · Jan 30, 2020 · f8de78e · f8de78e
1 parent 751b8d8
commit f8de78e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 # GPFS Prometheus exporter
 
 The GPFS exporter collects metrics from the GPFS filesystem.
-The exporter supports the `/metrics` endpoint with data about the exporter and the `/gpfs` endpoint used to collect GPFS metrics.
+The exporter supports the `/metrics` endpoint to gather GPFS metrics an metrics about the exporter.
 
 ## Collectors
 

diff --git a/cmd/gpfs_exporter/main.go b/cmd/gpfs_exporter/main.go
@@ -12,7 +12,8 @@ import (
 )
 
 var (
- listenAddr = kingpin.Flag("web.listen-address", "Address to listen on for web interface and telemetry.").Default(":9303").String()
+ listenAddr = kingpin.Flag("web.listen-address", "Address to listen on for web interface and telemetry.").Default(":9303").String()
+ disableExporterMetrics = kingpin.Flag("web.disable-exporter-metrics", "Exclude metrics about the exporter (promhttp_*, process_*, go_*)").Default("false").Bool()
 )
 
 func gpfsHandler() http.HandlerFunc {
@@ -27,8 +28,13 @@ func gpfsHandler() http.HandlerFunc {
  registry.MustRegister(collector)
  }
 
+ gatherers := prometheus.Gatherers{registry}
+ if !*disableExporterMetrics {
+ gatherers = append(gatherers, prometheus.DefaultGatherer)
+ }
+
  // Delegate http serving to Prometheus client library, which will call collector.Collect.
- h := promhttp.HandlerFor(registry, promhttp.HandlerOpts{})
+ h := promhttp.HandlerFor(gatherers, promhttp.HandlerOpts{})
  h.ServeHTTP(w, r)
  }
 }
@@ -43,16 +49,13 @@ func main() {
  log.Infoln("Build context", version.BuildContext())
  log.Infof("Starting Server: %s", *listenAddr)
 
- http.Handle("/metrics", promhttp.Handler())
- http.Handle("/gpfs", gpfsHandler())
+ http.Handle("/metrics", gpfsHandler())
  http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
  w.Write([]byte(`<html>
  <head><title>GPFS Exporter</title></head>
  <body>
- <h1>Metrics Exporter</h1>
+ <h1>GPFS Metrics Exporter</h1>
  <p><a href='/metrics'>Metrics</a></p>
- <h1>GPFS Exporter</h1>
- <p><a href='/gpfs'>GPFS Metrics</a></p>
  </body>
  </html>`))
  })