Refactoring

percona · Feb 22, 2024 · 6069842 · 6069842
1 parent 633a9b2
commit 6069842
Show file tree

Hide file tree

Showing 9 changed files with 1,073 additions and 1,073 deletions.
diff --git a/api-tests/inventory/agents_postgres_exporter_test.go b/api-tests/inventory/agents_postgres_exporter_test.go
@@ -64,6 +64,7 @@ func TestPostgresExporter(t *testing.T) {
 			},
 
 			SkipConnectionCheck: true,
+			MaxConnections:      10,
 		})
 		agentID := PostgresExporter.PostgresExporter.AgentID
 		defer pmmapitests.RemoveAgents(t, agentID)
@@ -83,7 +84,8 @@ func TestPostgresExporter(t *testing.T) {
 					CustomLabels: map[string]string{
 						"custom_label_postgres_exporter": "postgres_exporter",
 					},
-					Status: &AgentStatusUnknown,
+					Status:         &AgentStatusUnknown,
+					MaxConnections: 10,
 				},
 			},
 		}, getAgentRes)

diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go
diff --git a/api/inventorypb/agents.pb.validate.go b/api/inventorypb/agents.pb.validate.go
diff --git a/api/inventorypb/agents.proto b/api/inventorypb/agents.proto
@@ -855,7 +855,7 @@ message AddPostgresExporterRequest {
   // Optionally expose the exporter process on all public interfaces
   bool expose_exporter = 17;
   // Maximum number of connections from exporter to the database instance.
-  int32 max_exporter_connections = 18;
+  int32 max_connections = 18;
 }
 
 message AddPostgresExporterResponse {

diff --git a/api/inventorypb/json/client/agents/add_postgres_exporter_responses.go b/api/inventorypb/json/client/agents/add_postgres_exporter_responses.go
diff --git a/api/inventorypb/json/inventorypb.json b/api/inventorypb/json/inventorypb.json
@@ -1400,7 +1400,7 @@
                   ],
                   "x-order": 14
                 },
-                "max_exporter_connections": {
+                "max_connections": {
                   "description": "Maximum number of connections from exporter to the database instance.",
                   "type": "integer",
                   "format": "int32",

diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
@@ -5606,7 +5606,7 @@
                   "title": "Optionally expose the exporter process on all public interfaces",
                   "x-order": 16
                 },
-                "max_exporter_connections": {
+                "max_connections": {
                   "description": "Maximum number of connections from exporter to the database instance.",
                   "type": "integer",
                   "format": "int32",

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -2762,7 +2762,7 @@
                   "title": "Optionally expose the exporter process on all public interfaces",
                   "x-order": 16
                 },
-                "max_exporter_connections": {
+                "max_connections": {
                   "description": "Maximum number of connections from exporter to the database instance.",
                   "type": "integer",
                   "format": "int32",

diff --git a/managed/models/agent_helpers.go b/managed/models/agent_helpers.go
@@ -59,7 +59,7 @@ type PostgreSQLOptionsParams interface {
 // PostgreSQLExtendedOptionsParams contains extended parameters for PostgreSQL exporter.
 type PostgreSQLExtendedOptionsParams interface {
 	GetAutoDiscoveryLimit() int32
-	GetMaxExporterConnections() int32
+	GetMaxConnections() int32
 }
 
 // PostgreSQLOptionsFromRequest creates PostgreSQLOptions object from request.
@@ -74,7 +74,7 @@ func PostgreSQLOptionsFromRequest(params PostgreSQLOptionsParams) *PostgreSQLOpt
 	// PostgreSQL exporter has these parameters but they are not needed for QAN agent.
 	if extendedOptions, ok := params.(PostgreSQLExtendedOptionsParams); ok && extendedOptions != nil {
 		res.AutoDiscoveryLimit = extendedOptions.GetAutoDiscoveryLimit()
-		res.MaxExporterConnections = extendedOptions.GetMaxExporterConnections() // TODO: is it a right place for this?
+		res.MaxExporterConnections = extendedOptions.GetMaxConnections() // TODO: is it a right place for this?
 	}
 
 	return res