Merge branch 'main' into PMM-12151-12273-explain

percona · Jul 18, 2023 · 32fc0c2 · 32fc0c2
2 parents bb295da + 60c5767
commit 32fc0c2
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 79 deletions.
diff --git a/api/managementpb/json/client/rds/add_rds_responses.go b/api/managementpb/json/client/rds/add_rds_responses.go
diff --git a/api/managementpb/json/managementpb.json b/api/managementpb/json/managementpb.json
@@ -5063,6 +5063,11 @@
                   },
                   "x-order": 18
                 },
+                "database": {
+                  "description": "Database name.",
+                  "type": "string",
+                  "x-order": 29
+                },
                 "disable_basic_metrics": {
                   "description": "Disable basic metrics.",
                   "type": "boolean",

diff --git a/api/managementpb/rds.pb.go b/api/managementpb/rds.pb.go
diff --git a/api/managementpb/rds.pb.validate.go b/api/managementpb/rds.pb.validate.go
diff --git a/api/managementpb/rds.proto b/api/managementpb/rds.proto
@@ -112,6 +112,8 @@ message AddRDSRequest {
   bool qan_postgresql_pgstatements = 28;
   // Custom password for exporter endpoint /metrics.
   string agent_password = 29;
+  // Database name.
+  string database = 30;
 }
 
 message AddRDSResponse {

diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
@@ -28100,6 +28100,11 @@
                   "description": "Custom password for exporter endpoint /metrics.",
                   "type": "string",
                   "x-order": 28
+                },
+                "database": {
+                  "description": "Database name.",
+                  "type": "string",
+                  "x-order": 29
                 }
               }
             }

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -19269,6 +19269,11 @@
                   "description": "Custom password for exporter endpoint /metrics.",
                   "type": "string",
                   "x-order": 28
+                },
+                "database": {
+                  "description": "Database name.",
+                  "type": "string",
+                  "x-order": 29
                 }
               }
             }

diff --git a/managed/services/management/rds.go b/managed/services/management/rds.go
@@ -387,6 +387,7 @@ func (s *RDSService) AddRDS(ctx context.Context, req *managementpb.AddRDSRequest
 				CustomLabels:   req.CustomLabels,
 				Address:        &req.Address,
 				Port:           pointer.ToUint16(uint16(req.Port)),
+				Database:       req.Database,
 			})
 			if err != nil {
 				return err