PMM-9374 fix supervisord for external VM.

percona · Aug 30, 2023 · 2f8fc85 · 2f8fc85
1 parent a38645d
commit 2f8fc85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/managed/services/supervisord/supervisord.go b/managed/services/supervisord/supervisord.go
@@ -579,7 +579,7 @@ func (s *Service) UpdateConfiguration(settings *models.Settings, ssoDetails *mod
 	}
 
 	for _, tmpl := range templates.Templates() {
-		if tmpl.Name() == "" {
+		if tmpl.Name() == "" || (tmpl.Name() == "victoriametrics" && s.vmParams.ExternalVM()) {
 			continue
 		}
 

diff --git a/managed/utils/envvars/parser.go b/managed/utils/envvars/parser.go
@@ -157,6 +157,12 @@ func ParseEnvVars(envs []string) (envSettings *models.ChangeSettingsParams, errs
 		case "PMM_PUBLIC_ADDRESS":
 			envSettings.PMMPublicAddress = v
 
+		case "PMM_VM_URL":
+			_, err := url.Parse(v)
+			if err != nil {
+				err = fmt.Errorf("invalid value %q for environment variable %q", v, k)
+			}
+
 		case "NO_PROXY", "HTTP_PROXY", "HTTPS_PROXY":
 			continue