Revert to suffix conversion for ZFS error count

zpool status -p is only supported since ZoL 0.8.0, so, to monitor older servers, we need to do this without -p
tags/zabbix-agent-addons-0.2.81-1
Daniel Berteaud 5 years ago
parent ea789a986c
commit ad7c36b6de
  1. 26
      zabbix_scripts/check_zfs

@ -81,7 +81,7 @@ sub get_zpool_errors {
}; };
my $i = 0; my $i = 0;
my $index = {}; my $index = {};
foreach my $line (qx($zpool status -p $pool)){ foreach my $line (qx($zpool status $pool)){
# Output looks like # Output looks like
# pool: rpool # pool: rpool
# state: ONLINE # state: ONLINE
@ -110,11 +110,11 @@ sub get_zpool_errors {
chomp($line); chomp($line);
$line =~ s/\s+/ /g; $line =~ s/\s+/ /g;
$errors->{$index->{$i-1}} .= $line; $errors->{$index->{$i-1}} .= $line;
} elsif ($line =~ m/\s+[a-zA-Z0-9_\-]+\s+[A-Z]+\s+(?<read>\d+(\.\d+)?)\s+(?<write>\d+(\.\d+)?)\s+(?<cksum>\d+(\.\d+)?)/){ } elsif ($line =~ m/\s+[a-zA-Z0-9_\-]+\s+[A-Z]+\s+(?<read>\d+(\.\d+)?)(?<read_suffix>[KMT])?\s+(?<write>\d+(\.\d+)?)(?<write_suffix>[KMT])?\s+(?<cksum>\d+(\.\d+)?)(?<cksum_suffix>[KMT])?/){
# And here, we count the number of read, write and checksum errors # And here, we count the number of read, write and checksum errors
$errors->{read_errors} += $+{'read'}; $errors->{read_errors} += convert_suffix($+{'read'},$+{'read_suffix'});
$errors->{write_errors} += $+{'write'}; $errors->{write_errors} += convert_suffix($+{'write'},$+{'write_suffix'});
$errors->{cksum_errors} += $+{'cksum'}; $errors->{cksum_errors} += convert_suffix($+{'write'},$+{'write_suffix'});
} }
$i++; $i++;
} }
@ -123,6 +123,22 @@ sub get_zpool_errors {
return $errors; return $errors;
} }
# Error counter can be suffixed. Apply this suffix to get raw error numbers
sub convert_suffix {
my $val = shift;
my $suf = shift;
if (!$suf){
return $val;
} elsif ($suf eq 'K'){
$val *= 1000;
} elsif ($suf eq 'M') {
$val *= 1000000;
} elsif ($suf eq 'T') {
$val *= 1000000000;
}
return $val;
}
sub get_zpool_stats { sub get_zpool_stats {
my $pool = shift; my $pool = shift;
my $stats = {}; my $stats = {};

Loading…
Cancel
Save