PMM-11632 rds_exporter ignores DisableEnhancedMetrics (#91)

percona · May 9, 2023 · 4834cf3 · 4834cf3
1 parent 25de313
commit 4834cf3
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/enhanced/collector.go b/enhanced/collector.go
@@ -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
 			}
@@ -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()