Merge branch 'master' of https://github.com/amandahla/telegraf

2016-10-11 12:32:20 -03:00 · 2016-10-11 12:32:20 -03:00 · 8b94bc3ea0
parent 862f728635 f87db44828
commit 8b94bc3ea0
11 changed files with 315 additions and 157 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -35,6 +35,7 @@ continue sending logs to /var/log/telegraf/telegraf.log.
 - [#1813](https://github.com/influxdata/telegraf/pull/1813): Change default arguments for SNMP plugin.
 - [#1686](https://github.com/influxdata/telegraf/pull/1686): Mesos input plugin: very high-cardinality mesos-task metrics removed.
 - [#1838](https://github.com/influxdata/telegraf/pull/1838): Logging overhaul to centralize the logger & log levels, & provide a logfile config option.
+- [#1700](https://github.com/influxdata/telegraf/pull/1700): HAProxy plugin socket glob matching.

 ### Bugfixes

@ -56,6 +57,7 @@ continue sending logs to /var/log/telegraf/telegraf.log.
 - [#1835](https://github.com/influxdata/telegraf/issues/1835): Fix SNMP emitting empty fields.
 - [#1854](https://github.com/influxdata/telegraf/pull/1853): SQL Server waitstats truncation bug.
 - [#1810](https://github.com/influxdata/telegraf/issues/1810): Fix logparser common log format: numbers in ident.
+- [#1793](https://github.com/influxdata/telegraf/pull/1793): Fix JSON Serialization in OpenTSDB output.

 ## v1.0.1 [2016-09-26]

--- a/plugins/inputs/haproxy/README.md
+++ b/plugins/inputs/haproxy/README.md
@ -0,0 +1,37 @@
+# HAproxy Input Plugin
+
+[HAproxy](http://www.haproxy.org/) input plugin gathers metrics directly from any running HAproxy instance. It can do so by using CSV generated by HAproxy status page or from admin socket(s).
+
+### Configuration:
+
+```toml
+# SampleConfig
+[[inputs.haproxy]]
+  servers = ["http://1.2.3.4/haproxy?stats", "/var/run/haproxy*.sock"]
+```
+
+Server addresses need to explicitly start with 'http' if you wish to use HAproxy status page. Otherwise, address will be assumed to be an UNIX socket and protocol (if present) will be discarded.
+
+Following examples will all resolve to the same socket:
+```
+socket:/var/run/haproxy.sock
+unix:/var/run/haproxy.sock
+foo:/var/run/haproxy.sock
+/var/run/haproxy.sock
+```
+
+When using socket names, wildcard expansion is supported so plugin can gather stats from multiple sockets at once.
+
+If no servers are specified, then the default address of `http://127.0.0.1:1936/haproxy?stats` will be used.
+
+### Measurements & Fields:
+
+Plugin will gather measurements outlined in [HAproxy CSV format documentation](https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1).
+
+### Tags:
+
+- All measurements have the following tags:
+    - server - address of server data is gathered from
+    - proxy - proxy name as reported in `pxname`
+	- sv - service name as reported in `svname`
+
--- a/plugins/inputs/haproxy/haproxy.go
+++ b/plugins/inputs/haproxy/haproxy.go
@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@ -17,7 +18,7 @@ import (
 	"github.com/influxdata/telegraf/plugins/inputs"
 )

-//CSV format: https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#9.1
+//CSV format: https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1
 const (
 	HF_PXNAME         = 0  // 0. pxname [LFBS]: proxy name
 	HF_SVNAME         = 1  // 1. svname [LFBS]: service name (FRONTEND for frontend, BACKEND for backend, any name for server/listener)
@ -93,12 +94,15 @@ var sampleConfig = `
  ## An array of address to gather stats about. Specify an ip on hostname
  ## with optional port. ie localhost, 10.10.3.33:1936, etc.
  ## Make sure you specify the complete path to the stats endpoint
-  ## ie 10.10.3.33:1936/haproxy?stats
+  ## including the protocol, ie http://10.10.3.33:1936/haproxy?stats
  #
  ## If no servers are specified, then default to 127.0.0.1:1936/haproxy?stats
  servers = ["http://myhaproxy.com:1936/haproxy?stats"]
-  ## Or you can also use local socket
-  ## servers = ["socket:/run/haproxy/admin.sock"]
+  ##
+  ## You can also use local socket with standard wildcard globbing.
+  ## Server address not starting with 'http' will be treated as a possible
+  ## socket, so both examples below are valid.
+  ## servers = ["socket:/run/haproxy/admin.sock", "/run/haproxy/*.sock"]
 `

 func (r *haproxy) SampleConfig() string {
@ -116,10 +120,36 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 		return g.gatherServer("http://127.0.0.1:1936/haproxy?stats", acc)
 	}

+	endpoints := make([]string, 0, len(g.Servers))
+
+	for _, endpoint := range g.Servers {
+
+		if strings.HasPrefix(endpoint, "http") {
+			endpoints = append(endpoints, endpoint)
+			continue
+		}
+
+		socketPath := getSocketAddr(endpoint)
+
+		matches, err := filepath.Glob(socketPath)
+
+		if err != nil {
+			return err
+		}
+
+		if len(matches) == 0 {
+			endpoints = append(endpoints, socketPath)
+		} else {
+			for _, match := range matches {
+				endpoints = append(endpoints, match)
+			}
+		}
+	}
+
 	var wg sync.WaitGroup
-	errChan := errchan.New(len(g.Servers))
-	wg.Add(len(g.Servers))
-	for _, server := range g.Servers {
+	errChan := errchan.New(len(endpoints))
+	wg.Add(len(endpoints))
+	for _, server := range endpoints {
 		go func(serv string) {
 			defer wg.Done()
 			errChan.C <- g.gatherServer(serv, acc)
@ -131,14 +161,7 @@ func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 }

 func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) error {
-	var socketPath string
-	socketAddr := strings.Split(addr, ":")
-
-	if len(socketAddr) >= 2 {
-		socketPath = socketAddr[1]
-	} else {
-		socketPath = socketAddr[0]
-	}
+	socketPath := getSocketAddr(addr)

 	c, err := net.Dial("unix", socketPath)

@ -196,6 +219,16 @@ func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	return importCsvResult(res.Body, acc, u.Host)
 }

+func getSocketAddr(sock string) string {
+	socketAddr := strings.Split(sock, ":")
+
+	if len(socketAddr) >= 2 {
+		return socketAddr[1]
+	} else {
+		return socketAddr[0]
+	}
+}
+
 func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 	csv := csv.NewReader(r)
 	result, err := csv.ReadAll()
--- a/plugins/inputs/haproxy/haproxy_test.go
+++ b/plugins/inputs/haproxy/haproxy_test.go
@ -72,38 +72,7 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

-	fields := map[string]interface{}{
-		"active_servers":    uint64(1),
-		"backup_servers":    uint64(0),
-		"bin":               uint64(510913516),
-		"bout":              uint64(2193856571),
-		"check_duration":    uint64(10),
-		"cli_abort":         uint64(73),
-		"ctime":             uint64(2),
-		"downtime":          uint64(0),
-		"dresp":             uint64(0),
-		"econ":              uint64(0),
-		"eresp":             uint64(1),
-		"http_response.1xx": uint64(0),
-		"http_response.2xx": uint64(119534),
-		"http_response.3xx": uint64(48051),
-		"http_response.4xx": uint64(2345),
-		"http_response.5xx": uint64(1056),
-		"lbtot":             uint64(171013),
-		"qcur":              uint64(0),
-		"qmax":              uint64(0),
-		"qtime":             uint64(0),
-		"rate":              uint64(3),
-		"rate_max":          uint64(12),
-		"rtime":             uint64(312),
-		"scur":              uint64(1),
-		"smax":              uint64(32),
-		"srv_abort":         uint64(1),
-		"stot":              uint64(171014),
-		"ttime":             uint64(2341),
-		"wredis":            uint64(0),
-		"wretr":             uint64(1),
-	}
+	fields := HaproxyGetFieldValues()
 	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)

 	//Here, we should get error because we don't pass authentication data
@ -136,102 +105,58 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
 		"sv":     "host0",
 	}

-	fields := map[string]interface{}{
-		"active_servers":    uint64(1),
-		"backup_servers":    uint64(0),
-		"bin":               uint64(510913516),
-		"bout":              uint64(2193856571),
-		"check_duration":    uint64(10),
-		"cli_abort":         uint64(73),
-		"ctime":             uint64(2),
-		"downtime":          uint64(0),
-		"dresp":             uint64(0),
-		"econ":              uint64(0),
-		"eresp":             uint64(1),
-		"http_response.1xx": uint64(0),
-		"http_response.2xx": uint64(119534),
-		"http_response.3xx": uint64(48051),
-		"http_response.4xx": uint64(2345),
-		"http_response.5xx": uint64(1056),
-		"lbtot":             uint64(171013),
-		"qcur":              uint64(0),
-		"qmax":              uint64(0),
-		"qtime":             uint64(0),
-		"rate":              uint64(3),
-		"rate_max":          uint64(12),
-		"rtime":             uint64(312),
-		"scur":              uint64(1),
-		"smax":              uint64(32),
-		"srv_abort":         uint64(1),
-		"stot":              uint64(171014),
-		"ttime":             uint64(2341),
-		"wredis":            uint64(0),
-		"wretr":             uint64(1),
-	}
+	fields := HaproxyGetFieldValues()
 	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
 }

 func TestHaproxyGeneratesMetricsUsingSocket(t *testing.T) {
 	var randomNumber int64
-	binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
-	sock, err := net.Listen("unix", fmt.Sprintf("/tmp/test-haproxy%d.sock", randomNumber))
-	if err != nil {
-		t.Fatal("Cannot initialize socket ")
+	var sockets [5]net.Listener
+	_globmask := "/tmp/test-haproxy*.sock"
+	_badmask := "/tmp/test-fail-haproxy*.sock"
+
+	for i := 0; i < 5; i++ {
+		binary.Read(rand.Reader, binary.LittleEndian, &randomNumber)
+		sockname := fmt.Sprintf("/tmp/test-haproxy%d.sock", randomNumber)
+
+		sock, err := net.Listen("unix", sockname)
+		if err != nil {
+			t.Fatal("Cannot initialize socket ")
+		}
+
+		sockets[i] = sock
+		defer sock.Close()
+
+		s := statServer{}
+		go s.serverSocket(sock)
 	}

-	defer sock.Close()
-
-	s := statServer{}
-	go s.serverSocket(sock)
-
 	r := &haproxy{
-		Servers: []string{sock.Addr().String()},
+		Servers: []string{_globmask},
 	}

 	var acc testutil.Accumulator

-	err = r.Gather(&acc)
+	err := r.Gather(&acc)
 	require.NoError(t, err)

-	tags := map[string]string{
-		"proxy":  "be_app",
-		"server": sock.Addr().String(),
-		"sv":     "host0",
+	fields := HaproxyGetFieldValues()
+
+	for _, sock := range sockets {
+		tags := map[string]string{
+			"proxy":  "be_app",
+			"server": sock.Addr().String(),
+			"sv":     "host0",
+		}
+
+		acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
 	}

-	fields := map[string]interface{}{
-		"active_servers":    uint64(1),
-		"backup_servers":    uint64(0),
-		"bin":               uint64(510913516),
-		"bout":              uint64(2193856571),
-		"check_duration":    uint64(10),
-		"cli_abort":         uint64(73),
-		"ctime":             uint64(2),
-		"downtime":          uint64(0),
-		"dresp":             uint64(0),
-		"econ":              uint64(0),
-		"eresp":             uint64(1),
-		"http_response.1xx": uint64(0),
-		"http_response.2xx": uint64(119534),
-		"http_response.3xx": uint64(48051),
-		"http_response.4xx": uint64(2345),
-		"http_response.5xx": uint64(1056),
-		"lbtot":             uint64(171013),
-		"qcur":              uint64(0),
-		"qmax":              uint64(0),
-		"qtime":             uint64(0),
-		"rate":              uint64(3),
-		"rate_max":          uint64(12),
-		"rtime":             uint64(312),
-		"scur":              uint64(1),
-		"smax":              uint64(32),
-		"srv_abort":         uint64(1),
-		"stot":              uint64(171014),
-		"ttime":             uint64(2341),
-		"wredis":            uint64(0),
-		"wretr":             uint64(1),
-	}
-	acc.AssertContainsTaggedFields(t, "haproxy", fields, tags)
+	// This mask should not match any socket
+	r.Servers = []string{_badmask}
+
+	err = r.Gather(&acc)
+	require.Error(t, err)
 }

 //When not passing server config, we default to localhost
@ -246,6 +171,42 @@ func TestHaproxyDefaultGetFromLocalhost(t *testing.T) {
 	assert.Contains(t, err.Error(), "127.0.0.1:1936/haproxy?stats/;csv")
 }

+func HaproxyGetFieldValues() map[string]interface{} {
+	fields := map[string]interface{}{
+		"active_servers":    uint64(1),
+		"backup_servers":    uint64(0),
+		"bin":               uint64(510913516),
+		"bout":              uint64(2193856571),
+		"check_duration":    uint64(10),
+		"cli_abort":         uint64(73),
+		"ctime":             uint64(2),
+		"downtime":          uint64(0),
+		"dresp":             uint64(0),
+		"econ":              uint64(0),
+		"eresp":             uint64(1),
+		"http_response.1xx": uint64(0),
+		"http_response.2xx": uint64(119534),
+		"http_response.3xx": uint64(48051),
+		"http_response.4xx": uint64(2345),
+		"http_response.5xx": uint64(1056),
+		"lbtot":             uint64(171013),
+		"qcur":              uint64(0),
+		"qmax":              uint64(0),
+		"qtime":             uint64(0),
+		"rate":              uint64(3),
+		"rate_max":          uint64(12),
+		"rtime":             uint64(312),
+		"scur":              uint64(1),
+		"smax":              uint64(32),
+		"srv_abort":         uint64(1),
+		"stot":              uint64(171014),
+		"ttime":             uint64(2341),
+		"wredis":            uint64(0),
+		"wretr":             uint64(1),
+	}
+	return fields
+}
+
 const csvOutputSample = `
 # pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime,
 fe_app,FRONTEND,,81,288,713,2000,1094063,5557055817,24096715169,1102,80,95740,,,17,19,OPEN,,,,,,,,,2,16,113,13,114,,0,18,0,102,,,,0,1314093,537036,123452,11966,1360,,35,140,1987928,,,0,0,0,0,,,,,,,,
--- a/plugins/inputs/snmp/CONFIG-EXAMPLES.md
+++ b/plugins/inputs/snmp/CONFIG-EXAMPLES.md
@ -0,0 +1,65 @@
+Here are a few configuration examples for different use cases.
+
+### Switch/router interface metrics
+
+This setup will collect data on all interfaces from three different tables, `IF-MIB::ifTable`, `IF-MIB::ifXTable` and `EtherLike-MIB::dot3StatsTable`. It will also add the name from `IF-MIB::ifDescr` and use that as a tag. Depending on your needs and preferences you can easily use `IF-MIB::ifName` or `IF-MIB::ifAlias` instead or in addition. The values of these are typically:
+
+    IF-MIB::ifName = Gi0/0/0
+    IF-MIB::ifDescr = GigabitEthernet0/0/0
+    IF-MIB::ifAlias = ### LAN ###
+
+This configuration also collects the hostname from the device (`RFC1213-MIB::sysName.0`) and adds as a tag. So each metric will both have the configured host/IP as `agent_host` as well as the device self-reported hostname as `hostname` and the name of the host that has collected these metrics as `host`.
+
+Here is the configuration that you add to your `telegraf.conf`:
+
+```
+[[inputs.snmp]]
+  agents = [ "host.example.com" ]
+  version = 2
+  community = "public"
+
+  [[inputs.snmp.field]]
+    name = "hostname"
+    oid = "RFC1213-MIB::sysName.0"
+    is_tag = true
+
+  [[inputs.snmp.field]]
+    name = "uptime"
+    oid = "DISMAN-EXPRESSION-MIB::sysUpTimeInstance"
+
+  # IF-MIB::ifTable contains counters on input and output traffic as well as errors and discards.
+  [[inputs.snmp.table]]
+    name = "interface"
+    inherit_tags = [ "hostname" ]
+    oid = "IF-MIB::ifTable"
+
+    # Interface tag - used to identify interface in metrics database
+    [[inputs.snmp.table.field]]
+      name = "ifDescr"
+      oid = "IF-MIB::ifDescr"
+      is_tag = true
+
+  # IF-MIB::ifXTable contains newer High Capacity (HC) counters that do not overflow as fast for a few of the ifTable counters
+  [[inputs.snmp.table]]
+    name = "interface"
+    inherit_tags = [ "hostname" ]
+    oid = "IF-MIB::ifXTable"
+
+    # Interface tag - used to identify interface in metrics database
+    [[inputs.snmp.table.field]]
+      name = "ifDescr"
+      oid = "IF-MIB::ifDescr"
+      is_tag = true
+
+  # EtherLike-MIB::dot3StatsTable contains detailed ethernet-level information about what kind of errors have been logged on an interface (such as FCS error, frame too long, etc)
+  [[inputs.snmp.table]]
+    name = "interface"
+    inherit_tags = [ "hostname" ]
+    oid = "EtherLike-MIB::dot3StatsTable"
+
+    # Interface tag - used to identify interface in metrics database
+    [[inputs.snmp.table.field]]
+      name = "ifDescr"
+      oid = "IF-MIB::ifDescr"
+      is_tag = true
+```
--- a/plugins/inputs/snmp/DEBUGGING.md
+++ b/plugins/inputs/snmp/DEBUGGING.md
@ -0,0 +1,53 @@
+# Debugging & Testing SNMP Issues
+
+### Install net-snmp on your system:
+
+Mac:
+
+```
+brew install net-snmp
+```
+
+### Run an SNMP simulator docker image to get a full MIB on port 161:
+
+```
+docker run -d -p 161:161/udp xeemetric/snmp-simulator
+```
+
+### snmpget:
+
+snmpget corresponds to the inputs.snmp.field configuration.
+
+```bash
+$ # get an snmp field with fully-qualified MIB name.
+$ snmpget -v2c -c public localhost:161 system.sysUpTime.0
+DISMAN-EVENT-MIB::sysUpTimeInstance = Timeticks: (1643) 0:00:16.43
+
+$ # get an snmp field, outputting the numeric OID.
+$ snmpget -On -v2c -c public localhost:161 system.sysUpTime.0
+.1.3.6.1.2.1.1.3.0 = Timeticks: (1638) 0:00:16.38
+```
+
+### snmptranslate:
+
+snmptranslate can be used to translate an OID to a MIB name:
+
+```bash
+$ snmptranslate .1.3.6.1.2.1.1.3.0
+DISMAN-EVENT-MIB::sysUpTimeInstance
+```
+
+And to convert a partial MIB name to a fully qualified one:
+
+```bash
+$ snmptranslate -IR sysUpTime.0
+DISMAN-EVENT-MIB::sysUpTimeInstance
+```
+
+And to convert a MIB name to an OID:
+
+```bash
+$ snmptranslate -On -IR system.sysUpTime.0
+.1.3.6.1.2.1.1.3.0
+```
+
--- a/plugins/inputs/snmp/README.md
+++ b/plugins/inputs/snmp/README.md
@ -4,6 +4,8 @@ The SNMP input plugin gathers metrics from SNMP agents.

 ## Configuration:

+See additional SNMP plugin configuration examples [here](./CONFIG-EXAMPLES.md).
+
 ### Example:

 SNMP data:
@ -67,7 +69,7 @@ Resulting output:

 #### Configuration via MIB:

-This example uses the SNMP data above, but is configured via the MIB.  
+This example uses the SNMP data above, but is configured via the MIB.
 The example MIB file can be found in the `testdata` directory. See the [MIB lookups](#mib-lookups) section for more information.

 Telegraf config:
@ -95,58 +97,58 @@ Resulting output:

 ### Config parameters

-* `agents`: Default: `[]`  
+* `agents`: Default: `[]`
 List of SNMP agents to connect to in the form of `IP[:PORT]`. If `:PORT` is unspecified, it defaults to `161`.

-* `version`: Default: `2`  
+* `version`: Default: `2`
 SNMP protocol version to use.

-* `community`: Default: `"public"`  
+* `community`: Default: `"public"`
 SNMP community to use.

-* `max_repetitions`: Default: `50`  
+* `max_repetitions`: Default: `50`
 Maximum number of iterations for repeating variables.

-* `sec_name`:  
+* `sec_name`:
 Security name for authenticated SNMPv3 requests.

-* `auth_protocol`: Values: `"MD5"`,`"SHA"`,`""`. Default: `""`  
+* `auth_protocol`: Values: `"MD5"`,`"SHA"`,`""`. Default: `""`
 Authentication protocol for authenticated SNMPv3 requests.

-* `auth_password`:  
+* `auth_password`:
 Authentication password for authenticated SNMPv3 requests.

-* `sec_level`: Values: `"noAuthNoPriv"`,`"authNoPriv"`,`"authPriv"`. Default: `"noAuthNoPriv"`  
+* `sec_level`: Values: `"noAuthNoPriv"`,`"authNoPriv"`,`"authPriv"`. Default: `"noAuthNoPriv"`
 Security level used for SNMPv3 messages.

-* `context_name`:  
+* `context_name`:
 Context name used for SNMPv3 requests.

-* `priv_protocol`: Values: `"DES"`,`"AES"`,`""`. Default: `""`  
+* `priv_protocol`: Values: `"DES"`,`"AES"`,`""`. Default: `""`
 Privacy protocol used for encrypted SNMPv3 messages.

-* `priv_password`:  
+* `priv_password`:
 Privacy password used for encrypted SNMPv3 messages.


-* `name`:  
+* `name`:
 Output measurement name.

 #### Field parameters:
-* `oid`:  
+* `oid`:
 OID to get. May be a numeric or textual OID.

 * `oid_index_suffix`:
 The OID sub-identifier to strip off so that the index can be matched against other fields in the table.

-* `name`:  
+* `name`:
 Output field/tag name.
 If not specified, it defaults to the value of `oid`. If `oid` is numeric, an attempt to translate the numeric OID into a texual OID will be made.

-* `is_tag`:  
+* `is_tag`:
 Output this field as a tag.

-* `conversion`: Values: `"float(X)"`,`"float"`,`"int"`,`""`. Default: `""`  
+* `conversion`: Values: `"float(X)"`,`"float"`,`"int"`,`""`. Default: `""`
 Converts the value according to the given specification.

    - `float(X)`: Converts the input value into a float and divides by the Xth power of 10. Efficively just moves the decimal left X places. For example a value of `123` with `float(2)` will result in `1.23`.
@ -156,14 +158,14 @@ Converts the value according to the given specification.
    - `ipaddr`: Converts the value to an IP address.

 #### Table parameters:
-* `oid`:  
+* `oid`:
 Automatically populates the table's fields using data from the MIB.

-* `name`:  
+* `name`:
 Output measurement name.
 If not specified, it defaults to the value of `oid`.  If `oid` is numeric, an attempt to translate the numeric OID into a texual OID will be made.

-* `inherit_tags`:  
+* `inherit_tags`:
 Which tags to inherit from the top-level config and to use in the output of this table's measurement.

 ### MIB lookups
--- a/plugins/inputs/statsd/README.md
+++ b/plugins/inputs/statsd/README.md
@ -93,7 +93,6 @@ tags in a manner similar to the line-protocol, like this:
 users.current,service=payroll,region=us-west:32|g
 ```

-COMING SOON: there will be a way to specify multiple fields.
 <!-- TODO Second, you can specify multiple fields within a measurement:

 ```
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@ -2,6 +2,7 @@ package opentsdb

 import (
 	"fmt"
+	"log"
 	"net"
 	"net/url"
 	"sort"
@ -109,9 +110,12 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 		tags := cleanTags(m.Tags())

 		for fieldName, value := range m.Fields() {
-			metricValue, buildError := buildValue(value)
-			if buildError != nil {
-				fmt.Printf("OpenTSDB: %s\n", buildError.Error())
+			switch value.(type) {
+			case int64:
+			case uint64:
+			case float64:
+			default:
+				log.Printf("D! OpenTSDB does not support metric value: [%s] of type [%T].\n", value, value)
 				continue
 			}

@ -120,7 +124,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 					o.Prefix, m.Name(), fieldName)),
 				Tags:      tags,
 				Timestamp: now,
-				Value:     metricValue,
+				Value:     value,
 			}

 			if err := http.sendDataPoint(metric); err != nil {
@ -153,7 +157,7 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 		for fieldName, value := range m.Fields() {
 			metricValue, buildError := buildValue(value)
 			if buildError != nil {
-				fmt.Printf("OpenTSDB: %s\n", buildError.Error())
+				log.Printf("E! OpenTSDB: %s\n", buildError.Error())
 				continue
 			}

@ -161,9 +165,6 @@ func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
 				sanitizedChars.Replace(fmt.Sprintf("%s%s_%s", o.Prefix, m.Name(), fieldName)),
 				now, metricValue, tags)

-			if o.Debug {
-				fmt.Print(messageLine)
-			}
 			_, err := connection.Write([]byte(messageLine))
 			if err != nil {
 				return fmt.Errorf("OpenTSDB: Telnet writing error %s", err.Error())
--- a/plugins/outputs/opentsdb/opentsdb_http.go
+++ b/plugins/outputs/opentsdb/opentsdb_http.go
@ -16,7 +16,7 @@ import (
 type HttpMetric struct {
 	Metric    string            `json:"metric"`
 	Timestamp int64             `json:"timestamp"`
-	Value     string            `json:"value"`
+	Value     interface{}       `json:"value"`
 	Tags      map[string]string `json:"tags"`
 }

--- a/plugins/outputs/riemann/riemann.go
+++ b/plugins/outputs/riemann/riemann.go
@ -2,6 +2,7 @@ package riemann

 import (
 	"fmt"
+	"log"
 	"os"
 	"sort"
 	"strings"
@ -11,6 +12,8 @@ import (
 	"github.com/influxdata/telegraf/plugins/outputs"
 )

+const deprecationMsg = "I! WARNING: this Riemann output plugin will be deprecated in a future release, see https://github.com/influxdata/telegraf/issues/1878 for more details & discussion."
+
 type Riemann struct {
 	URL       string
 	Transport string
@ -29,6 +32,7 @@ var sampleConfig = `
 `

 func (r *Riemann) Connect() error {
+	log.Printf(deprecationMsg)
 	c, err := raidman.Dial(r.Transport, r.URL)

 	if err != nil {
@ -58,6 +62,7 @@ func (r *Riemann) Description() string {
 }

 func (r *Riemann) Write(metrics []telegraf.Metric) error {
+	log.Printf(deprecationMsg)
 	if len(metrics) == 0 {
 		return nil
 	}