diff --git a/snmp_standard/mode/diskusage.pm b/snmp_standard/mode/diskusage.pm
new file mode 100644
index 000000000..b59379883
--- /dev/null
+++ b/snmp_standard/mode/diskusage.pm
@@ -0,0 +1,344 @@
+################################################################################
+# Copyright 2005-2013 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package snmp_standard::mode::diskusage;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::statefile;
+
+my $oid_dskPath = '.1.3.6.1.4.1.2021.9.1.2';
+my $oid_dskTotalLow = '.1.3.6.1.4.1.2021.9.1.11'; # in kB
+my $oid_dskTotalHigh = '.1.3.6.1.4.1.2021.9.1.12'; # in kB
+my $oid_dskUsedLow = '.1.3.6.1.4.1.2021.9.1.15'; # in kB
+my $oid_dskUsedHigh = '.1.3.6.1.4.1.2021.9.1.16'; # in kB
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "warning:s"               => { name => 'warning' },
+                                  "critical:s"              => { name => 'critical' },
+                                  "units:s"                 => { name => 'units', default => '%' },
+                                  "free"                    => { name => 'free' },
+                                  "reload-cache-time:s"     => { name => 'reload_cache_time' },
+                                  "diskpath:s"              => { name => 'diskpath' },
+                                  "name"                    => { name => 'use_name' },
+                                  "regexp"                  => { name => 'use_regexp' },
+                                  "regexp-isensitive"       => { name => 'use_regexpi' },
+                                  "space-reservation:s"     => { name => 'space_reservation' },
+                                  "show-cache"              => { name => 'show_cache' },
+                                });
+
+    $self->{diskpath_id_selected} = [];
+    $self->{statefile_cache} = centreon::plugins::statefile->new(%options);
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
+       $self->{output}->option_exit();
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
+       $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{space_reservation}) && 
+        ($self->{option_results}->{space_reservation} < 0 || $self->{option_results}->{space_reservation} > 100)) {
+       $self->{output}->add_option_msg(short_msg => "Space reservation argument must be between 0 and 100 percent.");
+       $self->{output}->option_exit();
+    }
+    
+    $self->{statefile_cache}->check_options(%options);
+}
+
+sub run {
+    my ($self, %options) = @_;
+    # $options{snmp} = snmp object
+    $self->{snmp} = $options{snmp};
+    $self->{snmp_port} = $self->{snmp}->get_port();
+    $self->{hostname} = $self->{snmp}->get_hostname();
+
+    $self->manage_selection();
+    $self->{snmp}->load(oids => [$oid_dskTotalLow, $oid_dskTotalHigh,
+                                 $oid_dskUsedLow, $oid_dskUsedHigh], instances => $self->{diskpath_id_selected});
+    my $result = $self->{snmp}->get_leef(nothing_quit => 1);
+
+    
+
+    my $num_disk_check = 0;
+    foreach (sort @{$self->{diskpath_id_selected}}) {
+        my $name_diskpath = $self->get_display_value(id => $_);
+
+        # in bytes hrStorageAllocationUnits
+        my $total_size = (($result->{$oid_dskTotalHigh . "." . $_} << 32) + $result->{$oid_dskTotalLow . "." . $_}) * 1024;
+        if (defined($self->{option_results}->{space_reservation})) {
+            $total_size = $total_size - ($self->{option_results}->{space_reservation} * $total_size / 100);
+        }
+        if ($total_size == 0) {
+            $self->{output}->output_add(long_msg => sprintf("Skipping partition '%s' (total size is 0)", $name_diskpath));
+            next;
+        }
+
+        $num_disk_check++;
+        my $total_used = (($result->{$oid_dskUsedHigh . "." . $_} << 32) + $result->{$oid_dskUsedLow . "." . $_}) * 1024;
+        my $total_free = $total_size - $total_used;
+        my $prct_used = $total_used * 100 / $total_size;
+        my $prct_free = 100 - $prct_used;
+
+        my ($exit, $threshold_value);
+
+        $threshold_value = $total_used;
+        $threshold_value = $total_free if (defined($self->{option_results}->{free}));
+        if ($self->{option_results}->{units} eq '%') {
+            $threshold_value = $prct_used;
+            $threshold_value = $prct_free if (defined($self->{option_results}->{free}));
+        } 
+        $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
+
+        my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $total_size);
+        my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $total_used);
+        my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => ($total_size - $total_used));
+
+        $self->{output}->output_add(long_msg => sprintf("Partition '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name_diskpath,
+                                            $total_size_value . " " . $total_size_unit,
+                                            $total_used_value . " " . $total_used_unit, $prct_used,
+                                            $total_free_value . " " . $total_free_unit, $prct_free));
+        if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1) || (defined($self->{option_results}->{diskpath}) && !defined($self->{option_results}->{use_regexp}))) {
+            $self->{output}->output_add(severity => $exit,
+                                        short_msg => sprintf("Partition '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name_diskpath,
+                                            $total_size_value . " " . $total_size_unit,
+                                            $total_used_value . " " . $total_used_unit, $prct_used,
+                                            $total_free_value . " " . $total_free_unit, $prct_free));
+        }    
+
+        my $label = 'used';
+        my $value_perf = $total_used;
+        if (defined($self->{option_results}->{free})) {
+            $label = 'free';
+            $value_perf = $total_free;
+        }
+        my $extra_label = '';
+        $extra_label = '_' . $name_diskpath if (!defined($self->{option_results}->{diskpath}) || defined($self->{option_results}->{use_regexp}));
+        my %total_options = ();
+        if ($self->{option_results}->{units} eq '%') {
+            $total_options{total} = $total_size;
+            $total_options{cast_int} = 1; 
+        }
+        $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'B',
+                                      value => $value_perf,
+                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', %total_options),
+                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', %total_options),
+                                      min => 0, max => $total_size);
+    }
+
+    if (!defined($self->{option_results}->{diskpath}) || defined($self->{option_results}->{use_regexp})) {
+        $self->{output}->output_add(severity => 'OK',
+                                    short_msg => 'All partitions are ok.');
+    } elsif ($num_disk_check == 0) {
+        $self->{output}->output_add(severity => 'OK',
+                                    short_msg => 'No usage for partition.');
+    }
+    
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+sub reload_cache {
+    my ($self) = @_;
+    my $datas = {};
+
+    my $result = $self->{snmp}->get_table(oid => $oid_dskPath);
+    $datas->{all_ids} = [];
+    my $last_num = 0;
+    foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
+        next if ($key !~ /\.([0-9]+)$/);
+        push @{$datas->{all_ids}}, $1;
+        $datas->{'dskPath_' . $1} = $self->{output}->to_utf8($result->{$key});
+    }
+    
+    if (scalar(keys %$datas) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "Can't construct cache...");
+        $self->{output}->option_exit();
+    }
+
+    $self->{statefile_cache}->write(data => $datas);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    # init cache file
+    my $has_cache_file = $self->{statefile_cache}->read(statefile => 'cache_snmpstandard_' . $self->{hostname}  . '_' . $self->{snmp_port} . '_' . $self->{mode});
+    if (defined($self->{option_results}->{show_cache})) {
+        $self->{output}->add_option_msg(long_msg => $self->{statefile_cache}->get_string_content());
+        $self->{output}->option_exit();
+    }
+
+    my $timestamp_cache = $self->{statefile_cache}->get(name => 'last_timestamp');
+    if ($has_cache_file == 0 ||
+        (defined($timestamp_cache) && (time() - $timestamp_cache) > (($self->{option_results}->{reload_cache_time}) * 60))) {
+            $self->reload_cache();
+            $self->{statefile_cache}->read();
+    }
+
+    my $all_ids = $self->{statefile_cache}->get(name => 'all_ids');
+    if (!defined($self->{option_results}->{use_name}) && defined($self->{option_results}->{diskpath})) {
+        # get by ID
+        push @{$self->{diskpath_id_selected}}, $self->{option_results}->{diskpath}; 
+        my $name = $self->{statefile_cache}->get(name => 'dskPath_' . $self->{option_results}->{diskpath});
+        if (!defined($name)) {
+            $self->{output}->add_option_msg(short_msg => "No disk path found for id '" . $self->{option_results}->{diskpath} . "'.");
+            $self->{output}->option_exit();
+        }
+    } else {
+        foreach my $i (@{$all_ids}) {
+            my $filter_name = $self->{statefile_cache}->get(name => 'dskPath_' . $i);
+            next if (!defined($filter_name));
+            if (!defined($self->{option_results}->{diskpath})) {
+                push @{$self->{diskpath_id_selected}}, $i; 
+                next;
+            }
+            if (defined($self->{option_results}->{use_regexp}) && defined($self->{option_results}->{use_regexpi}) && $filter_name =~ /$self->{option_results}->{diskpath}/i) {
+                push @{$self->{diskpath_id_selected}}, $i; 
+            }
+            if (defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi}) && $filter_name =~ /$self->{option_results}->{diskpath}/) {
+                push @{$self->{diskpath_id_selected}}, $i; 
+            }
+            if (!defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi}) && $filter_name eq $self->{option_results}->{diskpath}) {
+                push @{$self->{diskpath_id_selected}}, $i; 
+            }
+        }
+        
+        if (scalar(@{$self->{diskpath_id_selected}}) <= 0) {
+            if (defined($self->{option_results}->{diskpath})) {
+                $self->{output}->add_option_msg(short_msg => "No disk path found for name '" . $self->{option_results}->{diskpath} . "' (maybe you should reload cache file).");
+            } else {
+                $self->{output}->add_option_msg(short_msg => "No disk path found (maybe you should reload cache file).");
+            }
+            $self->{output}->option_exit();
+        }
+    }
+}
+
+sub get_display_value {
+    my ($self, %options) = @_;
+    my $value = $self->{statefile_cache}->get(name => 'dskPath_' . $options{id});
+
+    if (defined($self->{option_results}->{display_transform_src})) {
+        $self->{option_results}->{display_transform_dst} = '' if (!defined($self->{option_results}->{display_transform_dst}));
+        eval "\$value =~ s{$self->{option_results}->{display_transform_src}}{$self->{option_results}->{display_transform_dst}}";
+    }
+    return $value;
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check usage on partitions (UCD-SNMP-MIB).
+Need to enable "includeAllDisk 10%" on snmpd.conf.
+
+=over 8
+
+=item B<--warning>
+
+Threshold warning.
+
+=item B<--critical>
+
+Threshold critical.
+
+=item B<--units>
+
+Units of thresholds (Default: '%') ('%', 'B').
+
+=item B<--free>
+
+Thresholds are on free space left.
+
+=item B<--diskpath>
+
+Set the disk path (number expected) ex: 1, 2,... (empty means 'check all disks path').
+
+=item B<--name>
+
+Allows to use disk path name with option --diskpath instead of disk path oid index.
+
+=item B<--regexp>
+
+Allows to use regexp to filter diskpath (with option --name).
+
+=item B<--regexp-isensitive>
+
+Allows to use regexp non case-sensitive (with --regexp).
+
+=item B<--reload-cache-time>
+
+Time in seconds before reloading cache file (default: 180).
+
+=item B<--display-transform-src>
+
+Regexp src to transform display value. (security risk!!!)
+
+=item B<--display-transform-dst>
+
+Regexp dst to transform display value. (security risk!!!)
+
+=item B<--show-cache>
+
+Display cache storage datas.
+
+=item B<--space-reservation>
+
+Some filesystem has space reserved (like ext4 for root).
+The value is in percent of total (Default: none).
+
+=back
+
+=cut
diff --git a/snmp_standard/mode/inodes.pm b/snmp_standard/mode/inodes.pm
index 7043a9ea4..13cefd610 100644
--- a/snmp_standard/mode/inodes.pm
+++ b/snmp_standard/mode/inodes.pm
@@ -40,7 +40,6 @@ use base qw(centreon::plugins::mode);
 use strict;
 use warnings;
 use centreon::plugins::statefile;
-use Digest::MD5 qw(md5_hex);
 
 my $oid_dskPath = '.1.3.6.1.4.1.2021.9.1.2';
 my $oid_dskPercentNode = '.1.3.6.1.4.1.2021.9.1.10';
diff --git a/snmp_standard/mode/listdiskspath.pm b/snmp_standard/mode/listdiskspath.pm
index 4c6668ff2..5e8f8e90b 100644
--- a/snmp_standard/mode/listdiskspath.pm
+++ b/snmp_standard/mode/listdiskspath.pm
@@ -41,6 +41,8 @@ use strict;
 use warnings;
 
 my $oid_dskPath = '.1.3.6.1.4.1.2021.9.1.2';
+my $oid_dskTotalLow = '.1.3.6.1.4.1.2021.9.1.11';
+my $oid_dskTotalHigh = '.1.3.6.1.4.1.2021.9.1.12';
 
 sub new {
     my ($class, %options) = @_;
@@ -56,6 +58,7 @@ sub new {
                                   "regexp-isensitive"       => { name => 'use_regexpi' },
                                   "display-transform-src:s" => { name => 'display_transform_src' },
                                   "display-transform-dst:s" => { name => 'display_transform_dst' },
+                                  "skip-total-size-zero"    => { name => 'skip_total_size_zero' },
                                 });
 
     $self->{diskpath_id_selected} = [];
@@ -74,10 +77,15 @@ sub run {
     $self->{snmp} = $options{snmp};
 
     $self->manage_selection();
+    my $result = $self->get_additional_information();
     
     my $diskpath_display = '';
     my $diskpath_display_append = '';
     foreach (sort @{$self->{diskpath_id_selected}}) {
+        if (defined($result)) {
+            my $total_size = (($result->{$oid_dskTotalHigh . "." . $_} << 32) + $result->{$oid_dskTotalLow . "." . $_});
+            next if ($total_size == 0);
+        }
         my $display_value = $self->get_display_value(id => $_);
         
         $diskpath_display .= $diskpath_display_append . "name = $display_value [id = $_]";
@@ -90,6 +98,18 @@ sub run {
     $self->{output}->exit();
 }
 
+sub get_additional_information {
+    my ($self, %options) = @_;
+
+    if (!defined($self->{option_results}->{skip_total_size_zero})) {
+        return undef;
+    }
+    my $oids = [$oid_dskTotalLow, $oid_dskTotalHigh];
+    
+    $self->{snmp}->load(oids => $oids, instances => $self->{diskpath_id_selected});
+    return $self->{snmp}->get_leef();
+}
+
 sub get_display_value {
     my ($self, %options) = @_;
     my $value = $self->{datas}->{'dskPath_' . $options{id}};
@@ -168,7 +188,12 @@ sub disco_show {
     $self->{snmp} = $options{snmp};
 
     $self->manage_selection();
+    my $result = $self->get_additional_information();
     foreach (sort @{$self->{diskpath_id_selected}}) {
+        if (defined($result)) {
+            my $total_size = (($result->{$oid_dskTotalHigh . "." . $_} << 32) + $result->{$oid_dskTotalLow . "." . $_});
+            next if ($total_size == 0);
+        }
         my $display_value = $self->get_display_value(id => $_);
 
         $self->{output}->add_disco_entry(name => $display_value,
@@ -211,6 +236,10 @@ Regexp src to transform display value. (security risk!!!)
 
 Regexp dst to transform display value. (security risk!!!)
 
+=item B<--skip-total-size-zero>
+
+Filter partitions with total size equals 0.
+
 =back
 
 =cut
diff --git a/snmp_standard/mode/storage.pm b/snmp_standard/mode/storage.pm
index 91715b708..e452b13ec 100644
--- a/snmp_standard/mode/storage.pm
+++ b/snmp_standard/mode/storage.pm
@@ -229,7 +229,7 @@ sub run {
             $total_options{total} = $total_size;
             $total_options{cast_int} = 1; 
         }
-        $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'o',
+        $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'B',
                                       value => $value_perf,
                                       warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', %total_options),
                                       critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', %total_options),