Fix: riak with read_repairs available

closes #1399
influxdata · Jun 22, 2016 · 25848c5 · 25848c5
1 parent 3098564
commit 25848c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ### Bugfixes
 
+- [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin.
+- [#1399](https://github.com/influxdata/telegraf/issues/1399): Add `read_repairs` statistics to riak plugin.
+
 ## v1.0 beta 2 [2016-06-21]
 
 ### Features
@@ -21,7 +24,6 @@
 - [#1335](https://github.com/influxdata/telegraf/issues/1335): Fix overall ping timeout to be calculated based on per-ping timeout.
 - [#1374](https://github.com/influxdata/telegraf/pull/1374): Change "default" retention policy to "".
 - [#1377](https://github.com/influxdata/telegraf/issues/1377): Graphite output mangling '%' character.
-- [#1384](https://github.com/influxdata/telegraf/pull/1384): Fix datarace in apache input plugin.
 
 ## v1.0 beta 1 [2016-06-07]
 

diff --git a/plugins/inputs/riak/README.md b/plugins/inputs/riak/README.md
@@ -58,6 +58,8 @@ Riak provides one measurement named "riak", with the following fields:
 - vnode_index_writes_total
 - vnode_puts
 - vnode_puts_total
+- read_repairs
+- read_repairs_total
 
 Measurements of time (such as node_get_fsm_time_mean) are measured in nanoseconds.
 
@@ -72,5 +74,5 @@ All measurements have the following tags:
 
 ```
 $ ./telegraf -config telegraf.conf -input-filter riak -test
-> riak,[email protected],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
-```
+> riak,[email protected],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,read_repair=0i,read_repairs_total=0i 1455913392622482332
+```
diff --git a/plugins/inputs/riak/riak.go b/plugins/inputs/riak/riak.go
@@ -75,6 +75,8 @@ type riakStats struct {
 	VnodeIndexWritesTotal    int64  `json:"vnode_index_writes_total"`
 	VnodePuts                int64  `json:"vnode_puts"`
 	VnodePutsTotal           int64  `json:"vnode_puts_total"`
+	ReadRepairs              int64  `json:"read_repairs"`
+	ReadRepairsTotal         int64  `json:"read_repairs_total"`
 }
 
 // A sample configuration to only gather stats from localhost, default port.
@@ -187,6 +189,8 @@ func (r *Riak) gatherServer(s string, acc telegraf.Accumulator) error {
 		"vnode_index_writes_total":     stats.VnodeIndexWritesTotal,
 		"vnode_puts":                   stats.VnodePuts,
 		"vnode_puts_total":             stats.VnodePutsTotal,
+		"read_repairs":                 stats.ReadRepairs,
+		"read_repairs_total":           stats.ReadRepairsTotal,
 	}
 
 	// Accumulate the tags and values

diff --git a/plugins/inputs/riak/riak_test.go b/plugins/inputs/riak/riak_test.go
@@ -66,6 +66,8 @@ func TestRiak(t *testing.T) {
 		"node_put_fsm_time_99":         int64(84422),
 		"node_put_fsm_time_mean":       int64(10832),
 		"node_put_fsm_time_median":     int64(4085),
+		"read_repairs":                 int64(2),
+		"read_repairs_total":           int64(7918375),
 		"node_puts":                    int64(1155),
 		"node_puts_total":              int64(444895769),
 		"pbc_active":                   int64(360),