Skip to content

Fix problem with autodiscovery #314

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 5 commits into from
Oct 31, 2019
Merged

Fix problem with autodiscovery #314

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27d2a6b
Exeption current_database from select db names
sfalkon Oct 9, 2019
75a90a9
add first database as master
sfalkon Oct 10, 2019
95f7c00
fix: default metric is not loaded if set autodiscovery
sfalkon Oct 11, 2019
ed02507
Fix condition
sfalkon Oct 11, 2019
ea87806
Merge branch 'master' into add_master_db
wrouesnel Oct 31, 2019
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
14 changes: 9 additions & 5 deletions cmd/postgres_exporter/postgres_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ func loggableDSN(dsn string) string {
type Server struct {
db *sql.DB
labels prometheus.Labels
master bool

// Last version used to calculate metric map. If mismatch on scrape,
// then maps are recalculated.
Expand Down Expand Up @@ -789,7 +790,8 @@ func NewServer(dsn string, opts ...ServerOpt) (*Server, error) {
log.Infof("Established new database connection to %q.", fingerprint)

s := &Server{
db: db,
db: db,
master: false,
labels: prometheus.Labels{
serverLabelName: fingerprint,
},
Expand Down Expand Up @@ -830,7 +832,7 @@ func (s *Server) Scrape(ch chan<- prometheus.Metric, disableSettingsMetrics bool

var err error

if !disableSettingsMetrics {
if (!disableSettingsMetrics && !*autoDiscoverDatabases) || (!disableSettingsMetrics && *autoDiscoverDatabases && s.master) {
if err = querySettings(ch, s); err != nil {
err = fmt.Errorf("error retrieving settings: %s", err)
}
Expand Down Expand Up @@ -1100,7 +1102,7 @@ func newDesc(subsystem, name, help string, labels prometheus.Labels) *prometheus
}

func queryDatabases(server *Server) ([]string, error) {
rows, err := server.db.Query("SELECT datname FROM pg_database WHERE datallowconn = true AND datistemplate = false") // nolint: safesql
rows, err := server.db.Query("SELECT datname FROM pg_database WHERE datallowconn = true AND datistemplate = false AND datname != current_database()") // nolint: safesql
if err != nil {
return nil, fmt.Errorf("Error retrieving databases: %v", err)
}
Expand Down Expand Up @@ -1264,7 +1266,7 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
log.Infof("Semantic Version Changed on %q: %s -> %s", server, server.lastMapVersion, semanticVersion)
server.mappingMtx.Lock()

if e.disableDefaultMetrics {
if e.disableDefaultMetrics || (!e.disableDefaultMetrics && e.autoDiscoverDatabases && !server.master) {
server.metricMap = make(map[string]MetricMapNamespace)
server.queryOverrides = make(map[string]string)
} else {
Expand Down Expand Up @@ -1303,7 +1305,7 @@ func (e *Exporter) checkMapVersions(ch chan<- prometheus.Metric, server *Server)
versionDesc := prometheus.NewDesc(fmt.Sprintf("%s_%s", namespace, staticLabelName),
"Version string as reported by postgres", []string{"version", "short_version"}, server.labels)

if !e.disableDefaultMetrics {
if !e.disableDefaultMetrics && (server.master && e.autoDiscoverDatabases) {
ch <- prometheus.MustNewConstMetric(versionDesc,
prometheus.UntypedValue, 1, versionString, semanticVersion.String())
}
Expand Down Expand Up @@ -1368,6 +1370,8 @@ func (e *Exporter) discoverDatabaseDSNs() []string {
continue
}

server.master = true

databaseNames, err := queryDatabases(server)
if err != nil {
log.Errorf("Error querying databases (%s): %v", loggableDSN(dsn), err)
Expand Down