PMM-12013 Fix scrapeconfig generation for rds exporter. (#3293)

percona · Nov 8, 2024 · 9fcf353 · 9fcf353
1 parent 8cb6278
commit 9fcf353
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
@@ -5185,7 +5185,8 @@
               "AGENT_TYPE_QAN_POSTGRESQL_PGSTATMONITOR_AGENT",
               "AGENT_TYPE_EXTERNAL_EXPORTER",
               "AGENT_TYPE_RDS_EXPORTER",
-              "AGENT_TYPE_AZURE_DATABASE_EXPORTER"
+              "AGENT_TYPE_AZURE_DATABASE_EXPORTER",
+              "AGENT_TYPE_NOMAD_AGENT"
             ],
             "type": "string",
             "default": "AGENT_TYPE_UNSPECIFIED",

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -4227,7 +4227,8 @@
               "AGENT_TYPE_QAN_POSTGRESQL_PGSTATMONITOR_AGENT",
               "AGENT_TYPE_EXTERNAL_EXPORTER",
               "AGENT_TYPE_RDS_EXPORTER",
-              "AGENT_TYPE_AZURE_DATABASE_EXPORTER"
+              "AGENT_TYPE_AZURE_DATABASE_EXPORTER",
+              "AGENT_TYPE_NOMAD_AGENT"
             ],
             "type": "string",
             "default": "AGENT_TYPE_UNSPECIFIED",

diff --git a/managed/services/management/rds.go b/managed/services/management/rds.go
@@ -280,6 +280,7 @@ func (s *ManagementService) addRDS(ctx context.Context, req *managementv1.AddRDS
 				AWSSecretKey:               req.AwsSecretKey,
 				RDSBasicMetricsDisabled:    req.DisableBasicMetrics,
 				RDSEnhancedMetricsDisabled: req.DisableEnhancedMetrics,
+				PushMetrics:                isPushMode(metricsMode),
 			})
 			if err != nil {
 				return err