diff --git a/CHANGELOG.md b/CHANGELOG.md index 237183a85..9b79b64dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v0.10.4 [unreleased] + +### Features +- [#727](https://github.com/influxdata/telegraf/pull/727): riak input, thanks @jcoene! + +### Bugfixes + ## v0.10.3 [2016-02-18] ### Release Notes diff --git a/plugins/inputs/riak/README.md b/plugins/inputs/riak/README.md index 3aa39ae09..07f2eb09d 100644 --- a/plugins/inputs/riak/README.md +++ b/plugins/inputs/riak/README.md @@ -66,11 +66,11 @@ Measurements of time (such as node_get_fsm_time_mean) are measured in nanosecond All measurements have the following tags: - server (the host:port of the given server address, ex. `127.0.0.1:8087`) -- nodename (the internal node name received, ex. `riak@127.0.0.1` ) +- nodename (the internal node name received, ex. `riak@127.0.0.1`) ### Example Output: ``` $ ./telegraf -config telegraf.conf -input-filter riak -test > riak,nodename=riak@127.0.0.1,server=localhost:8098 cpu_avg1=31i,cpu_avg15=69i,cpu_avg5=51i,memory_code=11563738i,memory_ets=5925872i,memory_processes=30236069i,memory_system=93074971i,memory_total=123311040i,node_get_fsm_objsize_100=0i,node_get_fsm_objsize_95=0i,node_get_fsm_objsize_99=0i,node_get_fsm_objsize_mean=0i,node_get_fsm_objsize_median=0i,node_get_fsm_siblings_100=0i,node_get_fsm_siblings_95=0i,node_get_fsm_siblings_99=0i,node_get_fsm_siblings_mean=0i,node_get_fsm_siblings_median=0i,node_get_fsm_time_100=0i,node_get_fsm_time_95=0i,node_get_fsm_time_99=0i,node_get_fsm_time_mean=0i,node_get_fsm_time_median=0i,node_gets=0i,node_gets_total=19i,node_put_fsm_time_100=0i,node_put_fsm_time_95=0i,node_put_fsm_time_99=0i,node_put_fsm_time_mean=0i,node_put_fsm_time_median=0i,node_puts=0i,node_puts_total=0i,pbc_active=0i,pbc_connects=0i,pbc_connects_total=20i,vnode_gets=0i,vnode_gets_total=57i,vnode_index_reads=0i,vnode_index_reads_total=0i,vnode_index_writes=0i,vnode_index_writes_total=0i,vnode_puts=0i,vnode_puts_total=0i 1455913392622482332 -```gt \ No newline at end of file +``` \ No newline at end of file diff --git a/plugins/inputs/riak/riak_test.go b/plugins/inputs/riak/riak_test.go index f92a98973..49da4e7ea 100644 --- a/plugins/inputs/riak/riak_test.go +++ b/plugins/inputs/riak/riak_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/influxdata/telegraf/testutil" - "github.com/stretchr/testify/require" )