From 9fcf35378620b6a82fcaf53d3463f8f675730234 Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Fri, 8 Nov 2024 17:53:02 +0300 Subject: [PATCH] PMM-12013 Fix scrapeconfig generation for rds exporter. (#3293) --- api/swagger/swagger-dev.json | 3 ++- api/swagger/swagger.json | 3 ++- managed/services/management/rds.go | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json index 267c48147b..209f528470 100644 --- 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 index 2d5d164b06..6e35d2a7a3 100644 --- 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 index 1bb6afbda1..a7ce3035e8 100644 --- 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