Skip to content

PMM-11632 rds_exporter ignores DisableEnhancedMetrics #91

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 1 commit into from
May 9, 2023
Merged

PMM-11632 rds_exporter ignores DisableEnhancedMetrics #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions enhanced/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ func NewCollector(sessions *sessions.Sessions, logger log.Logger) *Collector {
}

for session, instances := range sessions.AllSessions() {
s := newScraper(session, instances, logger)
enabledInstances := getEnabledInstances(instances)
s := newScraper(session, enabledInstances, logger)

interval := maxInterval
for _, instance := range instances {
for _, instance := range enabledInstances {
if instance.EnhancedMonitoringInterval > 0 && instance.EnhancedMonitoringInterval < interval {
interval = instance.EnhancedMonitoringInterval
}
Expand All @@ -66,6 +67,18 @@ func NewCollector(sessions *sessions.Sessions, logger log.Logger) *Collector {
return c
}

func getEnabledInstances(instances []sessions.Instance) []sessions.Instance {
enabledInstances := make([]sessions.Instance, 0, len(instances))
for _, instance := range instances {
if instance.DisableEnhancedMetrics {
continue
}
enabledInstances = append(enabledInstances, instance)
}

return enabledInstances
}

// setMetrics saves latest scraped metrics.
func (c *Collector) setMetrics(m map[string][]prometheus.Metric) {
c.rw.Lock()
Expand Down