From f60c090e4cf58b39923ae6bd1ee8e4b9d8f067d2 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 15 Jan 2016 12:25:56 -0700
Subject: [PATCH] Add a quiet mode to telegraf

closes #514
---
 README.md                 |  4 +++-
 agent.go                  | 27 +++++++++++++++++----------
 cmd/telegraf/telegraf.go  |  8 ++++++++
 internal/config/config.go |  9 +++++++--
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 31a7590fb..6b723787e 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ if you don't have it already. You also must build with golang version 1.4+.
 
 ```console
 $ telegraf -help
-Telegraf, The plugin-driven server agent for reporting metrics into InfluxDB
+Telegraf, The plugin-driven server agent for collecting and reporting metrics.
 
 Usage:
 
@@ -100,6 +100,8 @@ The flags are:
   -input-filter      filter the input plugins to enable, separator is :
   -output-filter     filter the output plugins to enable, separator is :
   -usage             print usage for a plugin, ie, 'telegraf -usage mysql'
+  -debug             print metrics as they're generated to stdout
+  -quiet             run in quiet mode
   -version           print the version to stdout
 
 Examples:
diff --git a/agent.go b/agent.go
index 1af2a1f7c..0c5d58db5 100644
--- a/agent.go
+++ b/agent.go
@@ -121,8 +121,10 @@ func (a *Agent) gatherParallel(pointChan chan *client.Point) error {
 	wg.Wait()
 
 	elapsed := time.Since(start)
-	log.Printf("Gathered metrics, (%s interval), from %d inputs in %s\n",
-		a.Config.Agent.Interval.Duration, counter, elapsed)
+	if !a.Config.Agent.Quiet {
+		log.Printf("Gathered metrics, (%s interval), from %d inputs in %s\n",
+			a.Config.Agent.Interval.Duration, counter, elapsed)
+	}
 	return nil
 }
 
@@ -149,8 +151,10 @@ func (a *Agent) gatherSeparate(
 		}
 
 		elapsed := time.Since(start)
-		log.Printf("Gathered metrics, (separate %s interval), from %s in %s\n",
-			input.Config.Interval, input.Name, elapsed)
+		if !a.Config.Agent.Quiet {
+			log.Printf("Gathered metrics, (separate %s interval), from %s in %s\n",
+				input.Config.Interval, input.Name, elapsed)
+		}
 
 		if outerr != nil {
 			return outerr
@@ -235,8 +239,10 @@ func (a *Agent) writeOutput(
 		if err == nil {
 			// Write successful
 			elapsed := time.Since(start)
-			log.Printf("Flushed %d metrics to output %s in %s\n",
-				len(filtered), ro.Name, elapsed)
+			if !a.Config.Agent.Quiet {
+				log.Printf("Flushed %d metrics to output %s in %s\n",
+					len(filtered), ro.Name, elapsed)
+			}
 			return
 		}
 
@@ -327,12 +333,13 @@ func jitterInterval(ininterval, injitter time.Duration) time.Duration {
 func (a *Agent) Run(shutdown chan struct{}) error {
 	var wg sync.WaitGroup
 
-	a.Config.Agent.FlushInterval.Duration = jitterInterval(a.Config.Agent.FlushInterval.Duration,
+	a.Config.Agent.FlushInterval.Duration = jitterInterval(
+		a.Config.Agent.FlushInterval.Duration,
 		a.Config.Agent.FlushJitter.Duration)
 
-	log.Printf("Agent Config: Interval:%s, Debug:%#v, Hostname:%#v, "+
-		"Flush Interval:%s\n",
-		a.Config.Agent.Interval.Duration, a.Config.Agent.Debug,
+	log.Printf("Agent Config: Interval:%s, Debug:%#v, Quiet:%#v, Hostname:%#v, "+
+		"Flush Interval:%s \n",
+		a.Config.Agent.Interval.Duration, a.Config.Agent.Debug, a.Config.Agent.Quiet,
 		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval.Duration)
 
 	// channel shared between all input threads for accumulating points
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index 21e89ce04..a2b5161be 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -16,6 +16,8 @@ import (
 
 var fDebug = flag.Bool("debug", false,
 	"show metrics as they're generated to stdout")
+var fQuiet = flag.Bool("quiet", false,
+	"run in quiet mode")
 var fTest = flag.Bool("test", false, "gather metrics, print them out, and exit")
 var fConfig = flag.String("config", "", "configuration file to load")
 var fConfigDirectory = flag.String("config-directory", "",
@@ -57,6 +59,8 @@ The flags are:
   -input-filter      filter the input plugins to enable, separator is :
   -output-filter     filter the output plugins to enable, separator is :
   -usage             print usage for a plugin, ie, 'telegraf -usage mysql'
+  -debug             print metrics as they're generated to stdout
+  -quiet             run in quiet mode
   -version           print the version to stdout
 
 Examples:
@@ -173,6 +177,10 @@ func main() {
 		ag.Config.Agent.Debug = true
 	}
 
+	if *fQuiet {
+		ag.Config.Agent.Quiet = true
+	}
+
 	if *fTest {
 		err = ag.Test()
 		if err != nil {
diff --git a/internal/config/config.go b/internal/config/config.go
index 6c3d17750..ca4972b69 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -76,8 +76,11 @@ type AgentConfig struct {
 	UTC       bool `toml:"utc"`
 	Precision string
 
-	// Option for running in debug mode
-	Debug    bool
+	// Debug is the option for running in debug mode
+	Debug bool
+
+	// Quiet is the option for running in quiet mode
+	Quiet    bool
 	Hostname string
 }
 
@@ -279,6 +282,8 @@ var header = `# Telegraf configuration
 
   # Run telegraf in debug mode
   debug = false
+  # Run telegraf in quiet mode
+  quiet = false
   # Override default hostname, if empty use os.Hostname()
   hostname = ""