From b392cacc4bcf631ad5c81108d849b55335b87a72 Mon Sep 17 00:00:00 2001
From: "Kim B. Heino" <b@bbbs.net>
Date: Tue, 27 Apr 2021 11:33:34 +0300
Subject: [PATCH] redis: fix "autoconf" to return "no" if no instances are
 configured

Previously it returned "yes" and empty graph with all labels having
value "0". Also remove bogus "multigraph redis" line.

TODO: die() in get_conn() makes this plugin to fail if any Redis
instance can't be connected.
---
 plugins/redis/redis | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/redis/redis b/plugins/redis/redis
index 622000af..ef3b61ad 100755
--- a/plugins/redis/redis
+++ b/plugins/redis/redis
@@ -95,23 +95,27 @@ for (my $i = 1; $ENV{"host$i"}; $i++)
 my $config = ( defined $ARGV[0] and $ARGV[0] eq "config" );
 my $autoconf = ( defined $ARGV[0] and $ARGV[0] eq "autoconf" );
 if ( $autoconf ) {
+    if (!%INSTANCES) {
+        print "no (no redis instances configured)\n";
+        exit 0;
+    }
     my $err = '';
     for my $INSTANCE (keys %INSTANCES) {
         if (! defined( $INSTANCES{$INSTANCE}{'SOCK'} ) ) {
-            $err .= "no (unable to connect to ".$INSTANCES{$INSTANCE}{'HOST'}."\[:". $INSTANCES{$INSTANCE}{'PORT'}."\])\n";
+            $err = "no (unable to connect to ".$INSTANCES{$INSTANCE}{'HOST'}."\[:". $INSTANCES{$INSTANCE}{'PORT'}."\])\n";
         }
     }
     if ($err) {
         print $err;
     } else {
-        print 'yes';
+        print "yes\n";
     }
     exit 0;
 }
 
 my $total = 0;
 
-my $multi_graph_output = "multigraph redis\n";
+my $multi_graph_output = '';
 my $instance_graph_output = '';
 
 my $connected_clients = 0;
@@ -230,7 +234,7 @@ foreach my $INSTANCE (keys %INSTANCES) {
 
     $instance_graph_output .=  "multigraph redis_connected_clients.$INSTANCE\n";
     $instance_graph_output .=  "connected_clients.value " . $hash->{'connected_clients'} . "\n";
-    $connected_clients += $hash->{'connected_clients'}; 
+    $connected_clients += $hash->{'connected_clients'};
     $instance_graph_output .=  "multigraph keys_per_sec.$INSTANCE\n";
     $instance_graph_output .=  "hits.value " . $hash->{'keyspace_hits'} . "\n";
     $keyspace_hits += $hash->{'keyspace_hits'};
@@ -260,7 +264,7 @@ foreach my $INSTANCE (keys %INSTANCES) {
     $repl_backlog_size += $hash->{'repl_backlog_size'};
 
     $instance_graph_output .=  "multigraph redis_repl_lag.$INSTANCE\n";
-    if (exists $hash->{slave0} && $hash->{slave0} =~ /lag=(\d+)/) { 
+    if (exists $hash->{slave0} && $hash->{slave0} =~ /lag=(\d+)/) {
         $repl_backlog_size += $1;
         $instance_graph_output .=  "repl_backlog_size.value " . $1 . "\n";
     } else {