From 2d38937d575b6470d56d44832575e68b9a2c4e23 Mon Sep 17 00:00:00 2001
From: Miki <mikif70@gmail.com>
Date: Mon, 8 Feb 2016 17:58:20 +0100
Subject: [PATCH] write domain name only in tags

---
 plugins/inputs/dovecot/README.md  |  6 +++---
 plugins/inputs/dovecot/dovecot.go | 17 ++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/dovecot/README.md b/plugins/inputs/dovecot/README.md
index 2da58e652..98ed40e91 100644
--- a/plugins/inputs/dovecot/README.md
+++ b/plugins/inputs/dovecot/README.md
@@ -11,9 +11,9 @@ domains. You can read Dovecot's documentation
 [[inputs.dovecot]]
   # Dovecot Endpoint
   #   To use TCP, set endpoint = "ip:port"
-  server = ["127.0.0.1:24242"]
+  servers = ["127.0.0.1:24242"]
   # Only collect metrics for these domains, collect all if empty
-  domains_names = []
+  domains = []
 
 ```
 
@@ -42,4 +42,4 @@ domains. You can read Dovecot's documentation
 	mail_lookup_attr       int64
 	mail_read_count        int64
 	mail_read_bytes        int64
-	mail_cache_hits        int64
\ No newline at end of file
+	mail_cache_hits        int64
diff --git a/plugins/inputs/dovecot/dovecot.go b/plugins/inputs/dovecot/dovecot.go
index 0d4606b3a..6d283d5e7 100644
--- a/plugins/inputs/dovecot/dovecot.go
+++ b/plugins/inputs/dovecot/dovecot.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -23,8 +24,7 @@ func (d *Dovecot) Description() string {
 }
 
 var sampleConfig = `
-  #  specify dovecot servers via a url matching:
-  #  address:port
+  #  specify dovecot servers via an address:port list
   #  e.g.
   #    localhost:24242
   #
@@ -39,7 +39,7 @@ func (d *Dovecot) SampleConfig() string { return sampleConfig }
 const defaultPort = "24242"
 
 // Reads stats from all configured servers.
-func (d *Dovecot) Gather(acc inputs.Accumulator) error {
+func (d *Dovecot) Gather(acc telegraf.Accumulator) error {
 
 	if len(d.Servers) == 0 {
 		d.Servers = append(d.Servers, "127.0.0.1:24242")
@@ -68,7 +68,7 @@ func (d *Dovecot) Gather(acc inputs.Accumulator) error {
 	return outerr
 }
 
-func (d *Dovecot) gatherServer(addr string, acc inputs.Accumulator, doms map[string]bool) error {
+func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, doms map[string]bool) error {
 	_, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return fmt.Errorf("Error: %s on url %s\n", err, addr)
@@ -90,7 +90,7 @@ func (d *Dovecot) gatherServer(addr string, acc inputs.Accumulator, doms map[str
 	return gatherStats(&buf, acc, doms, host)
 }
 
-func gatherStats(buf *bytes.Buffer, acc inputs.Accumulator, doms map[string]bool, host string) error {
+func gatherStats(buf *bytes.Buffer, acc telegraf.Accumulator, doms map[string]bool, host string) error {
 
 	lines := strings.Split(buf.String(), "\n")
 	head := strings.Split(lines[0], "\t")
@@ -107,10 +107,10 @@ func gatherStats(buf *bytes.Buffer, acc inputs.Accumulator, doms map[string]bool
 		}
 		tags := map[string]string{"server": host, "domain": val[0]}
 		for n := range val {
-			fmt.Println(n, head[n], val[n])
 			switch head[n] {
 			case "domain":
-				fields[head[n]] = val[n]
+				continue
+				//				fields[head[n]] = val[n]
 			case "user_cpu", "sys_cpu", "clock_time":
 				fields[head[n]] = secParser(val[n])
 			case "reset_timestamp", "last_update":
@@ -150,7 +150,6 @@ func splitSec(tm string) (sec int64, msec int64) {
 func timeParser(tm string) time.Time {
 
 	sec, msec := splitSec(tm)
-	fmt.Println("time: ", sec, msec)
 	return time.Unix(sec, msec)
 }
 
@@ -161,7 +160,7 @@ func secParser(tm string) float64 {
 }
 
 func init() {
-	inputs.Add("dovecot", func() inputs.Input {
+	inputs.Add("dovecot", func() telegraf.Input {
 		return &Dovecot{}
 	})
 }