PMM-12153 rename tls params

percona · Mar 7, 2025 · 59fe7a1 · 59fe7a1
1 parent 10794b2
commit 59fe7a1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/managed/models/agent_model.go b/managed/models/agent_model.go
@@ -823,6 +823,7 @@ const webConfigTemplate = `basic_auth_users:
 
 // BuildWebConfigFile builds prometheus-compatible basic auth configuration.
 func (s *Agent) BuildWebConfigFile() (string, error) {
+	// If not provided by the user, it is the `agent_id`.
 	password := s.GetAgentPassword()
 	salt := getPasswordSalt(s)
 

diff --git a/managed/services/agents/mysql.go b/managed/services/agents/mysql.go
@@ -117,21 +117,33 @@ func mysqldExporterConfig(
 
 	files := exporter.Files()
 	if files != nil {
-		// // Newer versions of exporter expect these to be provided in `my.cnf` file
-		// if pmmAgentVersion.Less(v3_2_0) {
-		for k := range files {
-			switch k {
-			case "tlsCa":
-				args = append(args, "--mysql.ssl-ca-file="+tdp.Left+" .TextFiles.tlsCa "+tdp.Right)
-			case "tlsCert":
-				args = append(args, "--mysql.ssl-cert-file="+tdp.Left+" .TextFiles.tlsCert "+tdp.Right)
-			case "tlsKey":
-				args = append(args, "--mysql.ssl-key-file="+tdp.Left+" .TextFiles.tlsKey "+tdp.Right)
-			default:
-				continue
+		if pmmAgentVersion.Less(v3_2_0) {
+			for k := range files {
+				switch k {
+				case "tlsCa":
+					args = append(args, "--mysql.ssl-ca-file="+tdp.Left+" .TextFiles.tlsCa "+tdp.Right)
+				case "tlsCert":
+					args = append(args, "--mysql.ssl-cert-file="+tdp.Left+" .TextFiles.tlsCert "+tdp.Right)
+				case "tlsKey":
+					args = append(args, "--mysql.ssl-key-file="+tdp.Left+" .TextFiles.tlsKey "+tdp.Right)
+				default:
+					continue
+				}
+			}
+		} else {
+			for k := range files {
+				switch k {
+				case "tlsCa":
+					args = append(args, "--tls.ssl-ca="+tdp.Left+" .TextFiles.tlsCa "+tdp.Right)
+				case "tlsCert":
+					args = append(args, "--tls.ssl-cert="+tdp.Left+" .TextFiles.tlsCert "+tdp.Right)
+				case "tlsKey":
+					args = append(args, "--tls.ssl-key="+tdp.Left+" .TextFiles.tlsKey "+tdp.Right)
+				default:
+					continue
+				}
 			}
 		}
-		// }
 
 		if exporter.TLSSkipVerify {
 			if pmmAgentVersion.Less(v3_2_0) {