From cfd6036bc0057b44f6c9df3d30c2b398af6b3a76 Mon Sep 17 00:00:00 2001 From: Phil Frost Date: Thu, 18 Oct 2018 11:08:55 -0400 Subject: [PATCH] Exclude pg_settings_* on --disable-default-metrics When using --disable-default-metrics, I expect postgres_exporter to provide _no_ metrics besides those explicitly requested with --extend.query-path. See https://github.com/wrouesnel/postgres_exporter/issues/168#issuecomment-427337723 --- cmd/postgres_exporter/postgres_exporter.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/postgres_exporter/postgres_exporter.go b/cmd/postgres_exporter/postgres_exporter.go index 2e8edb2c4..db14d09c0 100644 --- a/cmd/postgres_exporter/postgres_exporter.go +++ b/cmd/postgres_exporter/postgres_exporter.go @@ -1085,9 +1085,12 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) { // Lock the exporter maps e.mappingMtx.RLock() defer e.mappingMtx.RUnlock() - if err := querySettings(ch, db); err != nil { - log.Infof("Error retrieving settings: %s", err) - e.error.Set(1) + + if !e.disableDefaultMetrics { + if err := querySettings(ch, db); err != nil { + log.Infof("Error retrieving settings: %s", err) + e.error.Set(1) + } } errMap := queryNamespaceMappings(ch, db, e.metricMap, e.queryOverrides)