From 60e0a839f25f5203f8f8fbd71bcede25fcfe53a1 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Tue, 25 Jul 2017 17:07:43 -0700
Subject: [PATCH] Add redis_version field to redis input (#3054)

---
 plugins/inputs/redis/README.md     | 1 +
 plugins/inputs/redis/redis.go      | 2 +-
 plugins/inputs/redis/redis_test.go | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index b9d216779..263923d4a 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -30,6 +30,7 @@ Additionally the plugin also calculates the hit/miss ratio (keyspace\_hitrate) a
     **Server**
     - uptime(int, seconds)
     - lru_clock(int, number)
+    - redis_version(string)
 
     **Clients**
     - clients(int, number)
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index cb976cada..7f6143340 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -184,7 +184,7 @@ func gatherInfoOutput(
 		name := string(parts[0])
 
 		if section == "Server" {
-			if name != "lru_clock" && name != "uptime_in_seconds" {
+			if name != "lru_clock" && name != "uptime_in_seconds" && name != "redis_version" {
 				continue
 			}
 		}
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index 904a80d37..7d2fd1b51 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -91,6 +91,7 @@ func TestRedis_ParseMetrics(t *testing.T) {
 		"used_cpu_sys_children":          float64(0.00),
 		"used_cpu_user_children":         float64(0.00),
 		"keyspace_hitrate":               float64(0.50),
+		"redis_version":                  "2.8.9",
 	}
 
 	// We have to test rdb_last_save_time_offset manually because the value is based on the time when gathered