fix: minor CR fixes

Signed-off-by: Martin Chodur <m.chodur@seznam.cz>
grafana · Jan 3, 2023 · 975295f · 975295f
1 parent 307b367
commit 975295f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/alertmanager/alertmanager.go b/pkg/alertmanager/alertmanager.go
@@ -309,7 +309,7 @@ func withTenantIDFunc(userID string) template.Option {
 	funcs := tmpltext.FuncMap{"tenantID": func() string { return userID }}
 	return func(text *tmpltext.Template, html *tmplhtml.Template) {
 		text.Funcs(funcs)
-		html.Funcs(tmplhtml.FuncMap(funcs))
+		html.Funcs(funcs)
 	}
 }
 

diff --git a/pkg/alertmanager/api.go b/pkg/alertmanager/api.go
@@ -256,7 +256,7 @@ func validateUserConfig(logger log.Logger, cfg alertspb.AlertConfigDesc, limits
 		templateFiles[i] = filepath.Join(userTempDir, t)
 	}
 
-	_, err = template.FromGlobs(templateFiles)
+	_, err = template.FromGlobs(templateFiles, withTenantIDFunc(user))
 	if err != nil {
 		return err
 	}