public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose enterprise-commit in server version output (#75897)

Browse Source 
* Expose enterprise-commit in server version output

* Define a DefaultCommitValue constant
This commit is contained in:
Horst Gutmann
2023-10-04 14:51:35 +02:00
committed by GitHub
parent 6274e5b45e
commit 9813d17e93
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/grafana-server/commands/cli.go
+6 -1
View File
@@ -14,6 +14,7 @@ import (
"github.com/urfave/cli/v2"
"github.com/grafana/grafana/pkg/api"
gcli "github.com/grafana/grafana/pkg/cmd/grafana-cli/commands"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/process"
"github.com/grafana/grafana/pkg/server"
@@ -52,7 +53,11 @@ func ServerCommand(version, commit, enterpriseCommit, buildBranch, buildstamp st
func RunServer(opts ServerOptions) error {
if Version || VerboseVersion {
fmt.Printf("Version %s (commit: %s, branch: %s)\n", opts.Version, opts.Commit, opts.BuildBranch)
if opts.EnterpriseCommit != gcli.DefaultCommitValue && opts.EnterpriseCommit != "" {
fmt.Printf("Version %s (commit: %s, branch: %s, enterprise-commit: %s)\n", opts.Version, opts.Commit, opts.BuildBranch, opts.EnterpriseCommit)
} else {
fmt.Printf("Version %s (commit: %s, branch: %s)\n", opts.Version, opts.Commit, opts.BuildBranch)
}
if VerboseVersion {
fmt.Println("Dependencies:")
if info, ok := debug.ReadBuildInfo(); ok {