PMM-12155 Use new option name for node_exporter

managed/services/agents/agents.go

@@ -122,7 +122,7 @@ func pathsBase(agentVersion *version.Parsed, tdpLeft, tdpRight string) string {
 }
 
 // ensureAuthParams updates agent start parameters to contain prometheus webconfig.
-func ensureAuthParams(exporter *models.Agent, params *agentpb.SetStateRequest_AgentProcess, agentVersion *version.Parsed, minAuthVersion *version.Parsed) error {
+func ensureAuthParams(exporter *models.Agent, params *agentpb.SetStateRequest_AgentProcess, agentVersion *version.Parsed, minAuthVersion *version.Parsed, useNewTlsConfig bool) error {
 	if agentVersion.Less(minAuthVersion) {
 		params.Env = append(params.Env, fmt.Sprintf("HTTP_AUTH=pmm:%s", exporter.GetAgentPassword()))
 	} else {
@@ -136,7 +136,11 @@ func ensureAuthParams(exporter *models.Agent, params *agentpb.SetStateRequest_Ag
 		}
 		params.TextFiles["webConfigPlaceholder"] = wcf
 		// see https://github.com/prometheus/exporter-toolkit/tree/v0.1.0/https
-		params.Args = append(params.Args, "--web.config="+params.TemplateLeftDelim+" .TextFiles.webConfigPlaceholder "+params.TemplateRightDelim)
+		if useNewTlsConfig {
+			params.Args = append(params.Args, "--web.config.file="+params.TemplateLeftDelim+" .TextFiles.webConfigPlaceholder "+params.TemplateRightDelim)
+		} else {
+			params.Args = append(params.Args, "--web.config="+params.TemplateLeftDelim+" .TextFiles.webConfigPlaceholder "+params.TemplateRightDelim)
+		}
 	}
 
 	return nil

managed/services/agents/mongodb.go

@@ -106,7 +106,7 @@ func mongodbExporterConfig(service *models.Service, exporter *models.Agent, reda
 		res.RedactWords = redactWords(exporter)
 	}
 
-	if err := ensureAuthParams(exporter, res, pmmAgentVersion, v2_27_99); err != nil {
+	if err := ensureAuthParams(exporter, res, pmmAgentVersion, v2_27_99, false); err != nil {
 		return nil, err
 	}
 

managed/services/agents/node.go

@@ -30,7 +30,10 @@ import (
 // The node exporter prior 2.28 use exporter_shared and gets basic auth config from env.
 // Starting with pmm 2.28, the exporter uses Prometheus Web Toolkit and needs a config file
 // with the basic auth users.
-var v2_27_99 = version.MustParse("2.27.99")
+var (
+	v2_27_99 = version.MustParse("2.27.99")
+	v1_5_0   = version.MustParse("1.5.0")
+)
 
 func nodeExporterConfig(node *models.Node, exporter *models.Agent, agentVersion *version.Parsed) (*agentpb.SetStateRequest_AgentProcess, error) {
 	tdp := models.TemplateDelimsPair(
@@ -140,9 +143,18 @@ func nodeExporterConfig(node *models.Node, exporter *models.Agent, agentVersion
 		Args:               args,
 	}
 
-	if err := ensureAuthParams(exporter, params, agentVersion, v2_27_99); err != nil {
+	if err := ensureAuthParams(exporter, params, agentVersion, v2_27_99, isNewTlsConfigSupported(exporter)); err != nil {
 		return nil, err
 	}
 
 	return params, nil
 }
+
+func isNewTlsConfigSupported(exporter *models.Agent) bool {
+	if agentVersion, err := version.Parse(pointer.GetString(exporter.Version)); err == nil {
+		if !agentVersion.Less(v1_5_0) {
+			return true
+		}
+	}
+	return false
+}

managed/services/agents/postgresql.go

@@ -96,7 +96,7 @@ func postgresExporterConfig(service *models.Service, exporter *models.Agent, red
 		res.RedactWords = redactWords(exporter)
 	}
 
-	if err := ensureAuthParams(exporter, res, pmmAgentVersion, postgresExporterWebConfigVersion); err != nil {
+	if err := ensureAuthParams(exporter, res, pmmAgentVersion, postgresExporterWebConfigVersion, false); err != nil {
 		return nil, err
 	}