RepoMirrors/postgres_exporter
1
0
Fork 0
mirror of https://github.com/prometheus-community/postgres_exporter synced 2025-04-28 14:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up autoDiscoverDatabases in the new collector

Browse Source 
Signed-off-by: Joe Adams <github@joeadams.io>
This commit is contained in:
Joe Adams 2022-02-25 08:11:22 -05:00
parent 27d23d02ef
commit 9704b9fb2e
No known key found for this signature in database
GPG Key ID: 2A21CFFDE8B588C6
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/postgres_exporter/main.go
View File

@ -119,7 +119,6 @@ func main() {
logger, logger,
dsn, dsn,
[]string{}, []string{},
collector.WithAutoDiscoverDatabases(*autoDiscoverDatabases),
) )
if err != nil { if err != nil {
level.Error(logger).Log("msg", "Failed to create PostgresCollector", "err", err.Error()) level.Error(logger).Log("msg", "Failed to create PostgresCollector", "err", err.Error())

17
collector/collector.go
View File

@ -87,10 +87,6 @@ type PostgresCollector struct {
logger log.Logger logger log.Logger
servers map[string]*server servers map[string]*server
// autoDiscoverDatabases will cause the collector to query the database
// to find other servers and also scrape them.
autoDiscoverDatabases bool
} }
type Option func(*PostgresCollector) error type Option func(*PostgresCollector) error
@ -146,12 +142,6 @@ func NewPostgresCollector(logger log.Logger, dsns []string, filters []string, op
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Manually provided servers are always classified as "primary"
s.isPrimary = true
// TODO(@sysadmind): We need to discover the downstream servers and add them here.
// if p.autoDiscoverDatabases {
// }
servers[dsn] = s servers[dsn] = s
} }
@ -161,13 +151,6 @@ func NewPostgresCollector(logger log.Logger, dsns []string, filters []string, op
return p, nil return p, nil
} }
func WithAutoDiscoverDatabases(discover bool) Option {
return func(p *PostgresCollector) error {
p.autoDiscoverDatabases = discover
return nil
}
}
// Describe implements the prometheus.Collector interface. // Describe implements the prometheus.Collector interface.
func (p PostgresCollector) Describe(ch chan<- *prometheus.Desc) { func (p PostgresCollector) Describe(ch chan<- *prometheus.Desc) {
ch <- scrapeDurationDesc ch <- scrapeDurationDesc

1
collector/server.go
View File

@ -25,7 +25,6 @@ type server struct {
dsn string dsn string
name string name string
db *sql.DB db *sql.DB
isPrimary bool // Certain queries are only run on the primary server
} }
func makeServer(dsn string) (*server, error) { func makeServer(dsn string) (*server, error) {