dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not try Uint parsing in redis plugin 

this is just a waste of cpu cycles, since telegraf converts all uints to
int64 anyways.
This commit is contained in:
Cameron Sparr 2016-12-20 23:21:40 +00:00
parent 2f521a87d4
commit 1cc763e514
2 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/inputs/redis/redis.go
View File

@ -158,7 +158,7 @@ func gatherInfoOutput(
tags map[string]string, tags map[string]string,
) error { ) error {
var section string var section string
var keyspace_hits, keyspace_misses uint64 = 0, 0 var keyspace_hits, keyspace_misses int64
scanner := bufio.NewScanner(rdr) scanner := bufio.NewScanner(rdr)
fields := make(map[string]interface{}) fields := make(map[string]interface{})
@ -210,8 +210,8 @@ func gatherInfoOutput(
val := strings.TrimSpace(parts[1]) val := strings.TrimSpace(parts[1])
// Try parsing as a uint // Try parsing as int
if ival, err := strconv.ParseUint(val, 10, 64); err == nil { if ival, err := strconv.ParseInt(val, 10, 64); err == nil {
switch name { switch name {
case "keyspace_hits": case "keyspace_hits":
keyspace_hits = ival keyspace_hits = ival
@ -219,18 +219,12 @@ func gatherInfoOutput(
keyspace_misses = ival keyspace_misses = ival
case "rdb_last_save_time": case "rdb_last_save_time":
// influxdb can't calculate this, so we have to do it // influxdb can't calculate this, so we have to do it
fields["rdb_last_save_time_elapsed"] = uint64(time.Now().Unix()) - ival fields["rdb_last_save_time_elapsed"] = time.Now().Unix() - ival
} }
fields[metric] = ival fields[metric] = ival
continue continue
} }
// Try parsing as an int
if ival, err := strconv.ParseInt(val, 10, 64); err == nil {
fields[metric] = ival
continue
}
// Try parsing as a float // Try parsing as a float
if fval, err := strconv.ParseFloat(val, 64); err == nil { if fval, err := strconv.ParseFloat(val, 64); err == nil {
fields[metric] = fval fields[metric] = fval
@ -275,7 +269,7 @@ func gatherKeyspaceLine(
dbparts := strings.Split(line, ",") dbparts := strings.Split(line, ",")
for _, dbp := range dbparts { for _, dbp := range dbparts {
kv := strings.Split(dbp, "=") kv := strings.Split(dbp, "=")
ival, err := strconv.ParseUint(kv[1], 10, 64) ival, err := strconv.ParseInt(kv[1], 10, 64)
if err == nil { if err == nil {
fields[kv[0]] = ival fields[kv[0]] = ival
} }

84
plugins/inputs/redis/redis_test.go
View File

@ -39,53 +39,53 @@ func TestRedis_ParseMetrics(t *testing.T) {
tags = map[string]string{"host": "redis.net", "replication_role": "master"} tags = map[string]string{"host": "redis.net", "replication_role": "master"}
fields := map[string]interface{}{ fields := map[string]interface{}{
"uptime": uint64(238), "uptime": int64(238),
"lru_clock": uint64(2364819), "lru_clock": int64(2364819),
"clients": uint64(1), "clients": int64(1),
"client_longest_output_list": uint64(0), "client_longest_output_list": int64(0),
"client_biggest_input_buf": uint64(0), "client_biggest_input_buf": int64(0),
"blocked_clients": uint64(0), "blocked_clients": int64(0),
"used_memory": uint64(1003936), "used_memory": int64(1003936),
"used_memory_rss": uint64(811008), "used_memory_rss": int64(811008),
"used_memory_peak": uint64(1003936), "used_memory_peak": int64(1003936),
"used_memory_lua": uint64(33792), "used_memory_lua": int64(33792),
"mem_fragmentation_ratio": float64(0.81), "mem_fragmentation_ratio": float64(0.81),
"loading": uint64(0), "loading": int64(0),
"rdb_changes_since_last_save": uint64(0), "rdb_changes_since_last_save": int64(0),
"rdb_bgsave_in_progress": uint64(0), "rdb_bgsave_in_progress": int64(0),
"rdb_last_save_time": uint64(1428427941), "rdb_last_save_time": int64(1428427941),
"rdb_last_bgsave_status": "ok", "rdb_last_bgsave_status": "ok",
"rdb_last_bgsave_time_sec": int64(-1), "rdb_last_bgsave_time_sec": int64(-1),
"rdb_current_bgsave_time_sec": int64(-1), "rdb_current_bgsave_time_sec": int64(-1),
"aof_enabled": uint64(0), "aof_enabled": int64(0),
"aof_rewrite_in_progress": uint64(0), "aof_rewrite_in_progress": int64(0),
"aof_rewrite_scheduled": uint64(0), "aof_rewrite_scheduled": int64(0),
"aof_last_rewrite_time_sec": int64(-1), "aof_last_rewrite_time_sec": int64(-1),
"aof_current_rewrite_time_sec": int64(-1), "aof_current_rewrite_time_sec": int64(-1),
"aof_last_bgrewrite_status": "ok", "aof_last_bgrewrite_status": "ok",
"aof_last_write_status": "ok", "aof_last_write_status": "ok",
"total_connections_received": uint64(2), "total_connections_received": int64(2),
"total_commands_processed": uint64(1), "total_commands_processed": int64(1),
"instantaneous_ops_per_sec": uint64(0), "instantaneous_ops_per_sec": int64(0),
"instantaneous_input_kbps": float64(876.16), "instantaneous_input_kbps": float64(876.16),
"instantaneous_output_kbps": float64(3010.23), "instantaneous_output_kbps": float64(3010.23),
"rejected_connections": uint64(0), "rejected_connections": int64(0),
"sync_full": uint64(0), "sync_full": int64(0),
"sync_partial_ok": uint64(0), "sync_partial_ok": int64(0),
"sync_partial_err": uint64(0), "sync_partial_err": int64(0),
"expired_keys": uint64(0), "expired_keys": int64(0),
"evicted_keys": uint64(0), "evicted_keys": int64(0),
"keyspace_hits": uint64(1), "keyspace_hits": int64(1),
"keyspace_misses": uint64(1), "keyspace_misses": int64(1),
"pubsub_channels": uint64(0), "pubsub_channels": int64(0),
"pubsub_patterns": uint64(0), "pubsub_patterns": int64(0),
"latest_fork_usec": uint64(0), "latest_fork_usec": int64(0),
"connected_slaves": uint64(0), "connected_slaves": int64(0),
"master_repl_offset": uint64(0), "master_repl_offset": int64(0),
"repl_backlog_active": uint64(0), "repl_backlog_active": int64(0),
"repl_backlog_size": uint64(1048576), "repl_backlog_size": int64(1048576),
"repl_backlog_first_byte_offset": uint64(0), "repl_backlog_first_byte_offset": int64(0),
"repl_backlog_histlen": uint64(0), "repl_backlog_histlen": int64(0),
"used_cpu_sys": float64(0.14), "used_cpu_sys": float64(0.14),
"used_cpu_user": float64(0.05), "used_cpu_user": float64(0.05),
"used_cpu_sys_children": float64(0.00), "used_cpu_sys_children": float64(0.00),
@ -102,15 +102,15 @@ func TestRedis_ParseMetrics(t *testing.T) {
} }
} }
assert.InDelta(t, assert.InDelta(t,
uint64(time.Now().Unix())-fields["rdb_last_save_time"].(uint64), time.Now().Unix()-fields["rdb_last_save_time"].(int64),
fields["rdb_last_save_time_elapsed"].(uint64), fields["rdb_last_save_time_elapsed"].(int64),
2) // allow for 2 seconds worth of offset 2) // allow for 2 seconds worth of offset
keyspaceTags := map[string]string{"host": "redis.net", "replication_role": "master", "database": "db0"} keyspaceTags := map[string]string{"host": "redis.net", "replication_role": "master", "database": "db0"}
keyspaceFields := map[string]interface{}{ keyspaceFields := map[string]interface{}{
"avg_ttl": uint64(0), "avg_ttl": int64(0),
"expires": uint64(0), "expires": int64(0),
"keys": uint64(2), "keys": int64(2),
} }
acc.AssertContainsTaggedFields(t, "redis", fields, tags) acc.AssertContainsTaggedFields(t, "redis", fields, tags)
acc.AssertContainsTaggedFields(t, "redis_keyspace", keyspaceFields, keyspaceTags) acc.AssertContainsTaggedFields(t, "redis_keyspace", keyspaceFields, keyspaceTags)