From bc223094598e0a79959b6cfaec3fbacb8b62d526 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 13 Sep 2016 08:45:06 +0100
Subject: [PATCH] Add commit & branch to Makefile

---
 Makefile                 | 11 +++++++----
 cmd/telegraf/telegraf.go |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0a3be166b..3b4ecfa1d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 VERSION := $(shell sh -c 'git describe --always --tags')
+BRANCH := $(shell sh -c 'git rev-parse --abbrev-ref HEAD')
+COMMIT := $(shell sh -c 'git rev-parse HEAD')
 ifdef GOBIN
 PATH := $(GOBIN):$(PATH)
 else
@@ -13,17 +15,18 @@ windows: prepare-windows build-windows
 
 # Only run the build (no dependency grabbing)
 build:
-	go install -ldflags "-X main.version=$(VERSION)" ./...
+	go install -ldflags \
+		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" ./...
 
 build-windows:
 	GOOS=windows GOARCH=amd64 go build -o telegraf.exe -ldflags \
-		"-X main.version=$(VERSION)" \
+		"-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
 		./cmd/telegraf/telegraf.go
 
 build-for-docker:
 	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o telegraf -ldflags \
-					"-s -X main.version=$(VERSION)" \
-					./cmd/telegraf/telegraf.go
+		"-s -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)" \
+		./cmd/telegraf/telegraf.go
 
 # run package script
 package:
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 009be85ee..022280d6b 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -170,8 +170,7 @@ func reloadLoop(stop chan struct{}, s service.Service) {
 			}
 			return
 		case *fVersion:
-			v := fmt.Sprintf("Telegraf - version %s", version)
-			fmt.Println(v)
+			fmt.Printf("Telegraf v%s (git: %s %s)\n", version, branch, commit)
 			return
 		case *fSampleConfig:
 			config.PrintSampleConfig(inputFilters, outputFilters)