diff --git a/centreon-plugins/storage/hp/eva/cli/mode/components/system.pm b/centreon-plugins/storage/hp/eva/cli/mode/components/system.pm
index 0e7b5f472..2d9b368c8 100644
--- a/centreon-plugins/storage/hp/eva/cli/mode/components/system.pm
+++ b/centreon-plugins/storage/hp/eva/cli/mode/components/system.pm
@@ -38,7 +38,7 @@ sub check {
     
     # <object>
     #    <objecttype>storagecell</objecttype>
-    #    <objectname>Backup_Wintel</objectname>
+    #    <objectname>XXXXX</objectname>
     #    <operationalstate>attention</operationalstate>
     foreach my $object (@{$self->{xml_result}->{object}}) {
         next if ($object->{objecttype} ne 'storagecell');
diff --git a/centreon-plugins/storage/hp/eva/cli/mode/storageusage.pm b/centreon-plugins/storage/hp/eva/cli/mode/storageusage.pm
new file mode 100644
index 000000000..ac64dfbe2
--- /dev/null
+++ b/centreon-plugins/storage/hp/eva/cli/mode/storageusage.pm
@@ -0,0 +1,178 @@
+#
+# Copyright 2017 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package storage::hp::eva::cli::mode::storageusage;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'storage', type => 0 },
+    ];
+    $self->{maps_counters}->{storage} = [
+        { label => 'usage', set => {
+                key_values => [ { name => 'display' }, { name => 'used' }, { name => 'total' } ],
+                closure_custom_calc => $self->can('custom_usage_calc'),
+                closure_custom_output => $self->can('custom_usage_output'),
+                closure_custom_perfdata => $self->can('custom_usage_perfdata'),
+                closure_custom_threshold_check => $self->can('custom_usage_threshold'),
+            }
+        },
+    ];
+}
+
+my $instance_mode;
+
+sub custom_usage_perfdata {
+    my ($self, %options) = @_;
+    
+    my $label = 'used';
+    my $value_perf = $self->{result_values}->{used};
+    if (defined($instance_mode->{option_results}->{free})) {
+        $label = 'free';
+        $value_perf = $self->{result_values}->{free};
+    }
+    my %total_options = ();
+    if ($instance_mode->{option_results}->{units} eq '%') {
+        $total_options{total} = $self->{result_values}->{total};
+        $total_options{cast_int} = 1;
+    }
+
+    $self->{output}->perfdata_add(label => $label, unit => 'B',
+                                  value => $value_perf,
+                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options),
+                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options),
+                                  min => 0, max => $self->{result_values}->{total});
+}
+
+sub custom_usage_threshold {
+    my ($self, %options) = @_;
+    
+    my ($exit, $threshold_value);
+    $threshold_value = $self->{result_values}->{used};
+    $threshold_value = $self->{result_values}->{free} if (defined($instance_mode->{option_results}->{free}));
+    if ($instance_mode->{option_results}->{units} eq '%') {
+        $threshold_value = $self->{result_values}->{prct_used};
+        $threshold_value = $self->{result_values}->{prct_free} if (defined($instance_mode->{option_results}->{free}));
+    }
+    $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{label}, exit_litteral => 'warning' } ]);
+    return $exit;
+}
+
+sub custom_usage_output {
+    my ($self, %options) = @_;
+    
+    my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total});
+    my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used});
+    my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free});
+    my $msg = sprintf("Storage '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)",
+                   $self->{result_values}->{display},
+                   $total_size_value . " " . $total_size_unit,
+                   $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used},
+                   $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free});
+    return $msg;
+}
+
+sub custom_usage_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};    
+    $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'};
+    $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_used'};
+
+    $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
+    $self->{result_values}->{free} = $self->{result_values}->{total} - $self->{result_values}->{used};
+    $self->{result_values}->{prct_free} = 100 - $self->{result_values}->{prct_used};
+    
+    return 0;
+}
+
+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 =>
+                                {
+                                  "units:s"             => { name => 'units', default => '%' },
+                                  "free"                => { name => 'free' },
+                                });
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $instance_mode = $self;
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+    
+    $self->{xml_result} = $options{custom}->ssu_execute(commands => { 'ls system full xml' => 1 });
+    
+    # <object>
+    #    <objectname>XXXX</objectname>
+    #    <totalstoragespace>30168.18</totalstoragespace>
+    #    <usedstoragespace>27935.14</usedstoragespace>
+
+    foreach (@{$self->{xml_result}->{object}}) {
+        $self->{storage} = { display => $_->{objectname}, 
+            used => $_->{usedstoragespace} * 1024 * 1024 * 1024, total => $_->{totalstoragespace} * 1024 * 1024 * 1024
+        };
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check storage usage.
+
+=over 8
+
+=item B<--units>
+
+Units of thresholds (Default: '%') ('%', 'B').
+
+=item B<--free>
+
+Thresholds are on free space left.
+
+=item B<--warning-usage>
+
+Threshold warning.
+
+=item B<--critical-usage>
+
+Threshold critical.
+
+=back
+
+=cut
diff --git a/centreon-plugins/storage/hp/eva/cli/plugin.pm b/centreon-plugins/storage/hp/eva/cli/plugin.pm
index 850c91c0c..c193eeebf 100644
--- a/centreon-plugins/storage/hp/eva/cli/plugin.pm
+++ b/centreon-plugins/storage/hp/eva/cli/plugin.pm
@@ -31,7 +31,8 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'hardware'  => 'storage::hp::eva::cli::mode::hardware',
+                         'hardware'         => 'storage::hp::eva::cli::mode::hardware',
+                         'storage-usage'    => 'storage::hp::eva::cli::mode::storageusage',
                         );
     $self->{custom_modes}{api} = 'storage::hp::eva::cli::custom::api';