PMM-12290 Fix. (percona#2756)

vishwas-sharma2480 · Jan 17, 2024 · 4fcbc88 · 4fcbc88
1 parent 4aa0e4c
commit 4fcbc88
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 94 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
@@ -5167,6 +5167,11 @@
                   "type": "boolean",
                   "x-order": 24
                 },
+                "disable_comments_parsing": {
+                  "description": "Disable parsing comments from queries and showing them in QAN.",
+                  "type": "boolean",
+                  "x-order": 31
+                },
                 "disable_enhanced_metrics": {
                   "description": "Disable enhanced 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
@@ -116,6 +116,8 @@ message AddRDSRequest {
   string database = 30;
   // Limit of databases for auto-discovery.
   int32 auto_discovery_limit = 31;
+  // Disable parsing comments from queries and showing them in QAN.
+  bool disable_comments_parsing = 32;
 }
 
 message AddRDSResponse {

diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
@@ -29129,6 +29129,11 @@
                   "type": "integer",
                   "format": "int32",
                   "x-order": 30
+                },
+                "disable_comments_parsing": {
+                  "description": "Disable parsing comments from queries and showing them in QAN.",
+                  "type": "boolean",
+                  "x-order": 31
                 }
               }
             }

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -20312,6 +20312,11 @@
                   "type": "integer",
                   "format": "int32",
                   "x-order": 30
+                },
+                "disable_comments_parsing": {
+                  "description": "Disable parsing comments from queries and showing them in QAN.",
+                  "type": "boolean",
+                  "x-order": 31
                 }
               }
             }

diff --git a/managed/services/management/rds.go b/managed/services/management/rds.go
@@ -368,13 +368,14 @@ func (s *RDSService) AddRDS(ctx context.Context, req *managementpb.AddRDSRequest
 			// add MySQL PerfSchema QAN Agent
 			if req.QanMysqlPerfschema {
 				qanAgent, err := models.CreateAgent(tx.Querier, models.QANMySQLPerfSchemaAgentType, &models.CreateAgentParams{
-					PMMAgentID:            models.PMMServerAgentID,
-					ServiceID:             service.ServiceID,
-					Username:              req.Username,
-					Password:              req.Password,
-					TLS:                   req.Tls,
-					TLSSkipVerify:         req.TlsSkipVerify,
-					QueryExamplesDisabled: req.DisableQueryExamples,
+					PMMAgentID:              models.PMMServerAgentID,
+					ServiceID:               service.ServiceID,
+					Username:                req.Username,
+					Password:                req.Password,
+					TLS:                     req.Tls,
+					TLSSkipVerify:           req.TlsSkipVerify,
+					QueryExamplesDisabled:   req.DisableQueryExamples,
+					CommentsParsingDisabled: req.DisableCommentsParsing,
 				})
 				if err != nil {
 					return err
@@ -446,16 +447,17 @@ func (s *RDSService) AddRDS(ctx context.Context, req *managementpb.AddRDSRequest
 				}
 			}
 
-			// add MySQL PerfSchema QAN Agent
+			// add PostgreSQL Pgstatements QAN Agent
 			if req.QanPostgresqlPgstatements {
 				qanAgent, err := models.CreateAgent(tx.Querier, models.QANPostgreSQLPgStatementsAgentType, &models.CreateAgentParams{
-					PMMAgentID:            models.PMMServerAgentID,
-					ServiceID:             service.ServiceID,
-					Username:              req.Username,
-					Password:              req.Password,
-					TLS:                   req.Tls,
-					TLSSkipVerify:         req.TlsSkipVerify,
-					QueryExamplesDisabled: req.DisableQueryExamples,
+					PMMAgentID:              models.PMMServerAgentID,
+					ServiceID:               service.ServiceID,
+					Username:                req.Username,
+					Password:                req.Password,
+					TLS:                     req.Tls,
+					TLSSkipVerify:           req.TlsSkipVerify,
+					QueryExamplesDisabled:   req.DisableQueryExamples,
+					CommentsParsingDisabled: req.DisableCommentsParsing,
 				})
 				if err != nil {
 					return err