Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 10:39:53 +00:00
Code Issues Releases Wiki Activity

redis: fix "autoconf" to return "no" if no instances are configured

Browse source 
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.
This commit is contained in:
Kim B. Heino 2021-04-27 11:33:34 +03:00 • committed by Lars Kruse
parent 51af0be02b
commit b392cacc4b
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/redis/redis
View file

@ -95,23 +95,27 @@ for (my $i = 1; $ENV{"host$i"}; $i++)
my $config = ( defined $ARGV[0] and $ARGV[0] eq "config" ); my $config = ( defined $ARGV[0] and $ARGV[0] eq "config" );
my $autoconf = ( defined $ARGV[0] and $ARGV[0] eq "autoconf" ); my $autoconf = ( defined $ARGV[0] and $ARGV[0] eq "autoconf" );
if ( $autoconf ) { if ( $autoconf ) {
if (!%INSTANCES) {
print "no (no redis instances configured)\n";
exit 0;
}
my $err = ''; my $err = '';
for my $INSTANCE (keys %INSTANCES) { for my $INSTANCE (keys %INSTANCES) {
if (! defined( $INSTANCES{$INSTANCE}{'SOCK'} ) ) { 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) { if ($err) {
print $err; print $err;
} else { } else {
print 'yes'; print "yes\n";
} }
exit 0; exit 0;
} }
my $total = 0; my $total = 0;
my $multi_graph_output = "multigraph redis\n"; my $multi_graph_output = '';
my $instance_graph_output = ''; my $instance_graph_output = '';
my $connected_clients = 0; 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 .= "multigraph redis_connected_clients.$INSTANCE\n";
$instance_graph_output .= "connected_clients.value " . $hash->{'connected_clients'} . "\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 .= "multigraph keys_per_sec.$INSTANCE\n";
$instance_graph_output .= "hits.value " . $hash->{'keyspace_hits'} . "\n"; $instance_graph_output .= "hits.value " . $hash->{'keyspace_hits'} . "\n";
$keyspace_hits += $hash->{'keyspace_hits'}; $keyspace_hits += $hash->{'keyspace_hits'};
@ -260,7 +264,7 @@ foreach my $INSTANCE (keys %INSTANCES) {
$repl_backlog_size += $hash->{'repl_backlog_size'}; $repl_backlog_size += $hash->{'repl_backlog_size'};
$instance_graph_output .= "multigraph redis_repl_lag.$INSTANCE\n"; $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; $repl_backlog_size += $1;
$instance_graph_output .= "repl_backlog_size.value " . $1 . "\n"; $instance_graph_output .= "repl_backlog_size.value " . $1 . "\n";
} else { } else {