From 23836041c8cc609d1e6a3755164518fcd3898f85 Mon Sep 17 00:00:00 2001
From: Alex Krantz <alex@krantz.dev>
Date: Mon, 9 Aug 2021 11:00:04 -0700
Subject: [PATCH 1/2] Improve documentation for redis commands

---
 plugins/inputs/redis/README.md | 12 +++++++++---
 plugins/inputs/redis/redis.go  | 10 +++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 4327a28bb98ee..bd89ea75346b2 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -10,15 +10,21 @@
   ##  e.g.
   ##    tcp://localhost:6379
   ##    tcp://:password@192.168.99.100
+  ##    unix:///var/run/redis.sock
   ##
   ## If no servers are specified, then localhost is used as the host.
   ## If no port is specified, 6379 is used
   servers = ["tcp://localhost:6379"]
+
   ## Optional. Specify redis commands to retrieve values
   # [[inputs.redis.commands]]
-  # command = ["get", "sample-key"]
-  # field = "sample-key-value"
-  # type = "string"
+  #   # The command to run where each argument is a separate element 
+  #   command = ["get", "sample-key"]
+  #   # The field to store the result in
+  #   field = "sample-key-value"
+  #   # The type of the result
+  #   # Can be "string", "integer", or "float"
+  #   type = "string"
 
   ## specify server password
   # password = "s#cr@t%"
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index fdc5dcd14cb12..d48be1ccc20f8 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -201,9 +201,13 @@ var sampleConfig = `
 
   ## Optional. Specify redis commands to retrieve values
   # [[inputs.redis.commands]]
-  # command = ["get", "sample-key"]
-  # field = "sample-key-value"
-  # type = "string"
+  #   # The command to run where each argument is a separate element 
+  #   command = ["get", "sample-key"]
+  #   # The field to store the result in
+  #   field = "sample-key-value"
+  #   # The type of the result
+  #   # Can be "string", "integer", or "float"
+  #   type = "string"
 
   ## specify server password
   # password = "s#cr@t%"

From 49b51eedd4626b50b4db9620e6dd4c17ce97e24e Mon Sep 17 00:00:00 2001
From: Alex Krantz <alex@krantz.dev>
Date: Mon, 9 Aug 2021 11:16:36 -0700
Subject: [PATCH 2/2] Error on unknown result type

---
 plugins/inputs/redis/redis.go | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index d48be1ccc20f8..b66d4ea41d36b 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -32,8 +32,8 @@ type Redis struct {
 
 	Log telegraf.Logger
 
-	clients     []Client
-	initialized bool
+	clients   []Client
+	connected bool
 }
 
 type Client interface {
@@ -234,8 +234,18 @@ var Tracking = map[string]string{
 	"role":              "replication_role",
 }
 
-func (r *Redis) init() error {
-	if r.initialized {
+func (r *Redis) Init() error {
+	for _, command := range r.Commands {
+		if command.Type != "string" && command.Type != "integer" && command.Type != "float" {
+			return fmt.Errorf(`unknown result type: expected one of "string", "integer", "float"; got %q`, command.Type)
+		}
+	}
+
+	return nil
+}
+
+func (r *Redis) connect() error {
+	if r.connected {
 		return nil
 	}
 
@@ -303,15 +313,15 @@ func (r *Redis) init() error {
 		}
 	}
 
-	r.initialized = true
+	r.connected = true
 	return nil
 }
 
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
 func (r *Redis) Gather(acc telegraf.Accumulator) error {
-	if !r.initialized {
-		err := r.init()
+	if !r.connected {
+		err := r.connect()
 		if err != nil {
 			return err
 		}
@@ -337,6 +347,10 @@ func (r *Redis) gatherCommandValues(client Client, acc telegraf.Accumulator) err
 	for _, command := range r.Commands {
 		val, err := client.Do(command.Type, command.Command...)
 		if err != nil {
+			if strings.Contains(err.Error(), "unexpected type=") {
+				return fmt.Errorf("could not get command result: %s", err)
+			}
+
 			return err
 		}