New Zabbix::Agent::Addons::Disks module

lib/Zabbix/Agent/Addons/Disks.pm

@@ -0,0 +1,47 @@
+package Zabbix::Agent::Addons::Disks;
+
+use strict;
+use warnings;
+
+# Return an array of block devices, skip if size == 0
+sub list_block_dev {
+  my @bd = ();
+  opendir(my $dh, "/sys/block") or die "Couldn't open /sys/block: $!";
+  my @blocks = grep { $_ !~ m/^\./ } readdir($dh);
+  closedir($dh);
+  foreach my $block (@blocks){
+    my $size = 1;
+    if ( -e "/sys/block/$block/size"){
+      open SIZE, "/sys/block/$block/size";
+      $size = join "", <SIZE>;
+      close SIZE;
+      chomp($size);
+      next if ($size eq '0');
+    }
+    push @bd, $block;
+  }
+  return @bd;
+}
+
+sub list_smart_hdd{
+  my ($param) = shift || {};
+  my @shd = ();
+  if (-x "/usr/sbin/smartctl"){
+   foreach my $block (list_block_dev()){
+      # Skip block we already know won't support SMART
+      next if ($block =~ m/^(ram|loop|md|dm\-)\d+/);
+      next unless (system("/usr/sbin/smartctl -A /dev/$block >/dev/null 2>&1") == 0);
+      if ($param->{skip_remouvable} && -e "/sys/block/$block/removable"){
+        open REMOVABLE, "/sys/block/$block/removable";
+        $removable = join "", <REMOVABLE>;
+        close REMOVABLE;
+        chomp($removable);
+        next if ($removable eq '1');
+      }
+      push @shd, $block;
+    }
+  }
+  return @shd;
+}
+
+1;

zabbix_scripts/disco_block_devices

@@ -1,20 +1,19 @@
 #!/usr/bin/perl -w
 
+use warnings;
+use strict;
+use Zabbix::Agent::Addons::Disks;
 use JSON;
 
-opendir(my $dh, "/sys/block") or die "Couldn't open /sys/block: $!";
-my @blocks = grep { $_ !~ m/^\./ } readdir($dh);
-closedir($dh);
 my $json;
 @{$json->{data}} = ();
-foreach my $block (@blocks){
+foreach my $block (Zabbix::Agent::Addons::Disks::list_block_dev()){
   my $size = 1;
   if ( -e "/sys/block/$block/size"){
     open SIZE, "/sys/block/$block/size";
     $size = join "", <SIZE>;
     close SIZE;
     chomp($size);
-        next if ($size eq '0');
   }
   push @{$json->{data}}, { "{#BLOCKDEVICE}" => $block, "{#BLOCKSIZE}" => $size };
 }

zabbix_scripts/disco_smart_sudo

@@ -2,34 +2,13 @@
 
 use warnings;
 use strict;
+use Zabbix::Agent::Addons::Disks;
 use JSON;
 
 my $json;
 @{$json->{data}} = ();
 
-opendir(my $dh, "/sys/block") or die "Couldn't open /sys/block: $!";
+foreach my $block (Zabbix::Agent::Addons::Disks::list_smart_hdd({ skip_remouvable => 1 })){
-my @blocks = grep { $_ !~ m/^\./ } readdir($dh);
-closedir($dh);
-foreach my $block (@blocks){
-    my $removable = 0;
-    my $size = 1;
-    # Skip block we already know they won't support SMART
-    next if ($block =~ m/^(ram|loop|md|dm\-)\d+/);
-    if ( -e "/sys/block/$block/removable"){
-        open REMOVABLE, "/sys/block/$block/removable";
-        $removable = join "", <REMOVABLE>;
-        close REMOVABLE;
-        chomp($removable);
-        next if ($removable eq '1');
-    }
-    if ( -e "/sys/block/$block/size"){
-        open SIZE, "/sys/block/$block/size";
-        $size = join "", <SIZE>;
-        close SIZE;
-        chomp($size);
-        next if ($size eq '0');
-    }
-    next unless (system("/usr/sbin/smartctl -A /dev/$block >/dev/null 2>&1") == 0);
   push @{$json->{data}}, { "{#SMARTDRIVE}" => "/dev/$block" };
 }
 print to_json($json);

zabbix_scripts/util_generate_sensors_ini

@@ -5,6 +5,8 @@ use warnings;
 use Config::Simple '-strict';
 use Getopt::Long;
 use File::Basename;
+use Zabbix::Agent::Addons::Disks;
+
 
 # Output file
 my $output = undef;
@@ -203,30 +205,7 @@ if (-x $ipmitool){
 
 # Now, try to detect smart capable HDD
 if (-x $smartctl){
-  # This is copied from disco_smart_sudo, I should create a module to
+  foreach my $block (Zabbix::Agent::Addons::Disks::list_smart_hdd({ skip_remouvable => 1 })){
-  # consolidate this
-  opendir(my $dh, "/sys/block") or die "Couldn't open /sys/block: $!";
-  my @blocks = grep { $_ !~ m/^\./ } readdir($dh);
-  closedir($dh);
-  foreach my $block (@blocks){
-    my $removable = 0;
-    my $size = 1;
-    # Skip block we already know they won't support SMART
-    next if ($block =~ m/^(ram|loop|md|dm\-)\d+/);
-    if ( -e "/sys/block/$block/removable"){
-      open REMOVABLE, "/sys/block/$block/removable";
-      $removable = join "", <REMOVABLE>;
-      close REMOVABLE;
-      chomp($removable);
-      next if ($removable eq '1');
-    }
-    if ( -e "/sys/block/$block/size"){
-      open SIZE, "/sys/block/$block/size";
-      $size = join "", <SIZE>;
-      close SIZE;
-      chomp($size);
-      next if ($size eq '0');
-    }
     my @lines = qx($smartctl -A /dev/$block);
     next if ($? != 0);
     foreach my $l (@lines){
@@ -270,7 +249,6 @@ if (-x $smartctl){
 }
 
 # TODO: add support for lm sensors, but its ouput is harder to parse
-
 foreach my $s (keys %$sensors){
   $cfg->set_block($s, $sensors->{$s});
 }