Merge pull request #2511 from prometheus/fix-go-build

Only truncate buildVersion if it's set
pull/2515/head
Fabian Reinartz 8 years ago committed by GitHub
commit 0958c83d5d

@ -425,7 +425,7 @@ func tmplFuncs(consolesPath string, opts *Options) template_text.FuncMap {
}, },
"consolesPath": func() string { return consolesPath }, "consolesPath": func() string { return consolesPath },
"pathPrefix": func() string { return opts.ExternalURL.Path }, "pathPrefix": func() string { return opts.ExternalURL.Path },
"buildVersion": func() string { return opts.Version.Revision[:7] }, "buildVersion": func() string { return opts.Version.Revision },
"stripLabels": func(lset model.LabelSet, labels ...model.LabelName) model.LabelSet { "stripLabels": func(lset model.LabelSet, labels ...model.LabelName) model.LabelSet {
for _, ln := range labels { for _, ln := range labels {
delete(lset, ln) delete(lset, ln)

Loading…
Cancel
Save