PMM-13001 Fix for PGSM switch in case of older versions. (#2899) (#2902)

* PMM-13001 Fix. * PMM-13001 Fix test. * PMM-13001 Change descriptor.
percona · Mar 18, 2024 · 39e2b52 · 39e2b52
1 parent 9a87836
commit 39e2b52
Show file tree

Hide file tree

Showing 8 changed files with 437 additions and 433 deletions.
diff --git a/agent/serviceinfobroker/service_info_broker.go b/agent/serviceinfobroker/service_info_broker.go
@@ -237,7 +237,7 @@ func (sib *ServiceInfoBroker) getPostgreSQLInfo(ctx context.Context, dsn string,
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		res.Error = err.Error()
 	}
-	res.PgsmVersion = pgsmVersion
+	res.PgsmVersion = &pgsmVersion
 
 	return &res
 }

diff --git a/agent/serviceinfobroker/service_info_broker_test.go b/agent/serviceinfobroker/service_info_broker_test.go
@@ -260,7 +260,7 @@ func TestServiceInfoBroker(t *testing.T) {
 		}, 0)
 		require.NotNil(t, resp)
 		assert.Equal(t, []string{"postgres", "pmm-agent"}, resp.DatabaseList)
-		assert.Equal(t, "", resp.PgsmVersion)
+		assert.Equal(t, "", *resp.PgsmVersion)
 	})
 
 	t.Run("MongoDBWithSSL", func(t *testing.T) {

diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go
diff --git a/api/agentpb/agent.pb.validate.go b/api/agentpb/agent.pb.validate.go
diff --git a/api/agentpb/agent.proto b/api/agentpb/agent.proto
@@ -475,7 +475,7 @@ message ServiceInfoResponse {
   // A list of PostgreSQL databases.
   repeated string database_list = 4;
   // A version of pg_stat_monitor, empty if unavailable.
-  string pgsm_version = 5;
+  optional string pgsm_version = 5;
 }
 
 // JobStatusRequest is a ServerMessage asking pmm-agent for job status.

diff --git a/descriptor.bin b/descriptor.bin
diff --git a/managed/models/agent_model.go b/managed/models/agent_model.go
@@ -124,13 +124,13 @@ func (c *AzureOptions) Scan(src interface{}) error { return jsonScan(c, src) }
 
 // PostgreSQLOptions represents structure for special PostgreSQL options.
 type PostgreSQLOptions struct {
-	SSLCa                  string `json:"ssl_ca"`
-	SSLCert                string `json:"ssl_cert"`
-	SSLKey                 string `json:"ssl_key"`
-	AutoDiscoveryLimit     int32  `json:"auto_discovery_limit"`
-	DatabaseCount          int32  `json:"database_count"`
-	PGSMVersion            string `json:"pgsm_version"`
-	MaxExporterConnections int32  `json:"max_exporter_connections"`
+	SSLCa                  string  `json:"ssl_ca"`
+	SSLCert                string  `json:"ssl_cert"`
+	SSLKey                 string  `json:"ssl_key"`
+	AutoDiscoveryLimit     int32   `json:"auto_discovery_limit"`
+	DatabaseCount          int32   `json:"database_count"`
+	PGSMVersion            *string `json:"pgsm_version"`
+	MaxExporterConnections int32   `json:"max_exporter_connections"`
 }
 
 // Value implements database/sql/driver.Valuer interface. Should be defined on the value.

diff --git a/managed/services/management/postgresql.go b/managed/services/management/postgresql.go
@@ -114,7 +114,7 @@ func (s *PostgreSQLService) Add(ctx context.Context, req *managementpb.AddPostgr
 			}
 
 			// In case of not available PGSM extension it is switch to PGSS.
-			if req.QanPostgresqlPgstatmonitorAgent && row.PostgreSQLOptions.PGSMVersion == "" {
+			if req.QanPostgresqlPgstatmonitorAgent && row.PostgreSQLOptions.PGSMVersion != nil && *row.PostgreSQLOptions.PGSMVersion == "" {
 				res.Warning = "Could not to detect the pg_stat_monitor extension on your system. Falling back to the pg_stat_statements."
 				req.QanPostgresqlPgstatementsAgent = true
 				req.QanPostgresqlPgstatmonitorAgent = false