From b6f81b538adc373559a777456c9d55c568728916 Mon Sep 17 00:00:00 2001
From: Gunnar <gunnar+github@gunnar.me>
Date: Tue, 13 Sep 2016 00:41:02 -0700
Subject: [PATCH] Add commit to Telegraf version string (#1756)
---
cmd/telegraf/telegraf.go | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index f19b127a..009be85e 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -52,6 +52,16 @@ var (
branch string
)
+func init() {
+ // If commit or branch are not set, make that clear.
+ if commit == "" {
+ commit = "unknown"
+ }
+ if branch == "" {
+ branch = "unknown"
+ }
+}
+
const usage = `Telegraf, The plugin-driven server agent for collecting and reporting metrics.
Usage:
@@ -137,8 +147,7 @@ func reloadLoop(stop chan struct{}, s service.Service) {
if len(args) > 0 {
switch args[0] {
case "version":
- v := fmt.Sprintf("Telegraf - version %s", version)
- fmt.Println(v)
+ fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
return
case "config":
config.PrintSampleConfig(inputFilters, outputFilters)
--
GitLab