diff --git a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm
index c3c35d40c..8417a096b 100644
--- a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpu.pm
@@ -80,7 +80,8 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                  "filter:s"            => { name => 'filter', default => '' },
+                                  "node:s"                  => { name => 'node', default => '.*' },
+                                  "extra-filter:s@"         => { name => 'extra_filter' },
                                 });
    
     return $self;
@@ -92,9 +93,13 @@ sub manage_selection {
     $self->{nodes} = {};
     $self->{cpu} = {};
 
-    my $filter = (defined($self->{option_results}->{filter}) && $self->{option_results}->{filter} ne '') ? $self->{option_results}->{filter} . ',' : '';
+    my $extra_filter = '';
+    foreach my $filter (@{$self->{option_results}->{extra_filter}}) {
+        $extra_filter .= ',' . $filter;
+    }
 
-    my $results = $options{custom}->query_range(queries => [ "(1 - irate(node_cpu_seconds_total{" . $filter . "mode='idle'}[1m])) * 100" ]);
+    my $results = $options{custom}->query_range(queries => [ '(1 - irate(node_cpu_seconds_total{mode="idle",instance=~"' . $self->{option_results}->{node} .
+                                                                '"' . $extra_filter . '}[1m])) * 100' ]);
     
     foreach my $metric (@{$results}) {
         my $average = $options{custom}->compute(aggregation => 'average', values => $metric->{values});
@@ -125,9 +130,13 @@ Check CPU usage for nodes and each of their cores.
 
 =over 8
 
-=item B<--filter>
+=item B<--node>
 
-Set a PromQL filter (Example : 'instance=~".*master.*"')
+Filter on a specific node (Must be a regexp)
+
+=item B<--extra-filter>
+
+Set a PromQL filter (Can be multiple, Example : 'name=~".*pretty.*"')
 
 =item B<--warning-*>
 
diff --git a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm
index f0e8fcd65..4cdae3343 100644
--- a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/cpudetailed.pm
@@ -219,7 +219,8 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                  "filter:s"            => { name => 'filter', default => '' },
+                                  "node:s"                  => { name => 'node', default => '.*' },
+                                  "extra-filter:s@"         => { name => 'extra_filter' },
                                 });
    
     return $self;
@@ -230,10 +231,14 @@ sub manage_selection {
 
     $self->{nodes} = {};
     $self->{cpu} = {};
+    
+    my $extra_filter = '';
+    foreach my $filter (@{$self->{option_results}->{extra_filter}}) {
+        $extra_filter .= ',' . $filter;
+    }
 
-    my $filter = (defined($self->{option_results}->{filter}) && $self->{option_results}->{filter} ne '') ? $self->{option_results}->{filter} : '';
-
-    my $results = $options{custom}->query_range(queries => [ "(irate(node_cpu_seconds_total{" . $filter . "}[1m])) * 100" ]);
+    my $results = $options{custom}->query_range(queries => [ '(irate(node_cpu_seconds_total{instance=~"' . $self->{option_results}->{node} .
+                                                                '"' . $extra_filter . '}[1m])) * 100' ]);
 
     foreach my $metric (@{$results}) {
         my $average = $options{custom}->compute(aggregation => 'average', values => $metric->{values});
@@ -267,9 +272,13 @@ Check CPU detailed usage for nodes and each of their cores.
 
 =over 8
 
-=item B<--filter>
+=item B<--node>
 
-Set a PromQL filter (Example : 'instance=~".*master.*"')
+Filter on a specific node (Must be a regexp)
+
+=item B<--extra-filter>
+
+Set a PromQL filter (Can be multiple, Example : 'name=~".*pretty.*"')
 
 =item B<--warning-*>
 
diff --git a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/load.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/load.pm
index fe792bc07..40c27f36c 100644
--- a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/load.pm
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/load.pm
@@ -80,7 +80,8 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                  "filter:s"            => { name => 'filter', default => '' },
+                                  "node:s"                  => { name => 'node', default => '.*' },
+                                  "extra-filter:s@"         => { name => 'extra_filter' },
                                 });
    
     return $self;
@@ -92,10 +93,17 @@ sub manage_selection {
     $self->{nodes} = {};
     $self->{cpu} = {};
 
-    my $filter = (defined($self->{option_results}->{filter}) && $self->{option_results}->{filter} ne '') ? $self->{option_results}->{filter} . ',' : '';
+    my $extra_filter = '';
+    foreach my $filter (@{$self->{option_results}->{extra_filter}}) {
+        $extra_filter .= ',' . $filter;
+    }
 
-    my $results = $options{custom}->query_range(queries => [ "node_load1{" . $filter . "}", "node_load5{" . $filter . "}",
-                                                             "node_load15{" . $filter . "}" ]);
+    my $results = $options{custom}->query_range(queries => [ 'node_load1{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}',
+                                                            'node_load5{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}',
+                                                            'node_load15{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}' ]);
     
     foreach my $metric (@{$results}) {
         my $average = $options{custom}->compute(aggregation => 'average', values => $metric->{values});
@@ -115,23 +123,27 @@ __END__
 
 =head1 MODE
 
-Check CPU usage for nodes and each of their cores.
+Check nodes load.
 
 =over 8
 
-=item B<--filter>
+=item B<--node>
 
-Set a PromQL filter (Example : 'instance=~".*master.*"')
+Filter on a specific node (Must be a regexp)
+
+=item B<--extra-filter>
+
+Set a PromQL filter (Can be multiple, Example : 'name=~".*pretty.*"')
 
 =item B<--warning-*>
 
 Threshold warning.
-Can be: 'node-usage', 'cpu-usage'.
+Can be: 'load1', 'load5', 'load15'.
 
 =item B<--critical-*>
 
 Threshold critical.
-Can be: 'node-usage', 'cpu-usage'.
+Can be: 'load1', 'load5', 'load15'.
 
 =back
 
diff --git a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/memory.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/memory.pm
index 694d4f0df..4f7c16354 100644
--- a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/memory.pm
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/memory.pm
@@ -139,14 +139,14 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                  "filter:s"            => { name => 'filter', default => '' },
-                                  "units:s"             => { name => 'units', default => '%' },
+                                  "node:s"                  => { name => 'node', default => '.*' },
+                                  "extra-filter:s@"         => { name => 'extra_filter' },
+                                  "units:s"                 => { name => 'units', default => '%' },
                                 });
    
     return $self;
 }
 
-
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
@@ -158,13 +158,20 @@ sub manage_selection {
     my ($self, %options) = @_;
 
     $self->{nodes} = {};
-    my %nodes;
 
-    my $filter = (defined($self->{option_results}->{filter}) && $self->{option_results}->{filter} ne '') ? $self->{option_results}->{filter} . ',' : '';
+    my $extra_filter = '';
+    foreach my $filter (@{$self->{option_results}->{extra_filter}}) {
+        $extra_filter .= ',' . $filter;
+    }
 
-    my $results = $options{custom}->query_range(queries => [ "node_memory_MemTotal_bytes{" . $filter . "}", "node_memory_MemAvailable_bytes{" . $filter . "}",
-                                                             "node_memory_Cached_bytes{" . $filter . "}", "node_memory_Buffers_bytes{" . $filter . "}" ]);
-    
+    my $results = $options{custom}->query_range(queries => [ 'node_memory_MemTotal_bytes{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}',
+                                                            'node_memory_MemAvailable_bytes{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}',
+                                                            'node_memory_Cached_bytes{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}',
+                                                            'node_memory_Buffers_bytes{instance=~"' . $self->{option_results}->{node} .
+                                                            '"' . $extra_filter . '}' ]);
     
     foreach my $metric (@{$results}) {
         my $average = $options{custom}->compute(aggregation => 'average', values => $metric->{values});
@@ -188,9 +195,13 @@ Check memory usage.
 
 =over 8
 
-=item B<--filter>
+=item B<--node>
 
-Set a PromQL filter (Example : 'instance=~".*master.*"')
+Filter on a specific node (Must be a regexp)
+
+=item B<--extra-filter>
+
+Set a PromQL filter (Can be multiple, Example : 'name=~".*pretty.*"')
 
 =item B<--warning-*>
 
diff --git a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/storage.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/storage.pm
new file mode 100644
index 000000000..071bd3cc9
--- /dev/null
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/mode/storage.pm
@@ -0,0 +1,238 @@
+#
+# Copyright 2018 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 cloud::prometheus::exporters::nodeexporter::mode::storage;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+
+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 $extra_label = '';
+    $extra_label = '_' . $self->{result_values}->{multi} if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
+    $extra_label .= '_' . $self->{result_values}->{display} if (!defined($options{extra_instance_lvl2}) || $options{extra_instance_lvl2} != 0);
+    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 . $extra_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("Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)",
+                   $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}->{multi} = $options{new_datas}->{$self->{instance} . '_multi'};
+    $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_node_filesystem_size_bytes'};    
+    $self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_node_filesystem_free_bytes'};
+    $self->{result_values}->{used} = $self->{result_values}->{total} - $self->{result_values}->{free};
+    $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / ($self->{result_values}->{total});
+    $self->{result_values}->{prct_free} = 100 - $self->{result_values}->{prct_used};
+    
+    # limit to 100. Better output.
+    if ($self->{result_values}->{prct_used} > 100) {
+        $self->{result_values}->{free} = 0;
+        $self->{result_values}->{prct_used} = 100;
+        $self->{result_values}->{prct_free} = 0;
+    }
+
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'nodes', type => 3, cb_prefix_output => 'prefix_nodes_output', message_multiple => 'All nodes storages usage are ok',
+          counters => [ { name => 'storage', type => 1, cb_prefix_output => 'prefix_storage_output' } ] },
+    ];
+
+    $self->{maps_counters}->{storage} = [
+        { label => 'usage', set => {
+                key_values => [ { name => 'node_filesystem_free_bytes' }, { name => 'node_filesystem_size_bytes' }, { name => 'multi' }, { name => 'display' } ],
+                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'),
+            }
+        },
+    ];
+}
+
+sub prefix_nodes_output {
+    my ($self, %options) = @_;
+
+    return "Node '" . $options{instance_value}->{display} . "'";
+}
+
+sub prefix_storage_output {
+    my ($self, %options) = @_;
+
+    return "Node '" . $options{instance_value}->{multi} . "' Storage '" . $options{instance_value}->{display} . "' ";
+}
+
+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 =>
+                                {
+                                  "node:s"                  => { name => 'node', default => '.*' },
+                                  "storage:s"               => { name => 'storage', default => '.*' },
+                                  "exclude-storage-type:s"  => { name => 'exclude_storage_type', default => 'rootfs|tmpfs' },
+                                  "extra-filter:s@"         => { name => 'extra_filter' },
+                                  "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->{nodes} = {};
+    $self->{cpu} = {};
+
+    my $extra_filter = '';
+    foreach my $filter (@{$self->{option_results}->{extra_filter}}) {
+        $extra_filter .= ',' . $filter;
+    }
+
+    my $results = $options{custom}->query(queries => [ 'node_filesystem_free_bytes{instance=~"' . $self->{option_results}->{node} .
+                                                        '",mountpoint=~"' . $self->{option_results}->{storage} .
+                                                        '",fstype!~"' . $self->{option_results}->{exclude_storage_type} .
+                                                        '"' . $extra_filter . '}',
+                                                       'node_filesystem_size_bytes{instance=~".*' . $self->{option_results}->{node} .
+                                                        '",mountpoint=~"' . $self->{option_results}->{storage} .
+                                                        '",fstype!~"' . $self->{option_results}->{exclude_storage_type} .
+                                                        '"' . $extra_filter . '}' ]);
+    
+    foreach my $metric (@{$results}) {
+        $self->{nodes}->{$metric->{metric}->{instance}}->{display} = $metric->{metric}->{instance};
+        $self->{nodes}->{$metric->{metric}->{instance}}->{storage}->{$metric->{metric}->{mountpoint}}->{multi} = $metric->{metric}->{instance};
+        $self->{nodes}->{$metric->{metric}->{instance}}->{storage}->{$metric->{metric}->{mountpoint}}->{display} = $metric->{metric}->{mountpoint};
+        $self->{nodes}->{$metric->{metric}->{instance}}->{storage}->{$metric->{metric}->{mountpoint}}->{$metric->{metric}->{__name__}} = ${$metric->{value}}[1];
+    }
+
+    if (scalar(keys %{$self->{nodes}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "No nodes found.");
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check CPU usage for nodes and each of their cores.
+
+=over 8
+
+=item B<--node>
+
+Filter on a specific node (Must be a regexp)
+
+=item B<--storage>
+
+Filter on a specific storage (Must be a regexp)
+
+=item B<--exclude-storage-type>
+
+Exclude storage types (Must be a regexp, Default: 'rootfs|tmpfs')
+
+=item B<--extra-filter>
+
+Set a PromQL filter (Can be multiple, Example : 'name=~".*pretty.*"')
+
+=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/cloud/prometheus/exporters/nodeexporter/plugin.pm b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/plugin.pm
index 3f815be6c..114941b11 100644
--- a/centreon-plugins/cloud/prometheus/exporters/nodeexporter/plugin.pm
+++ b/centreon-plugins/cloud/prometheus/exporters/nodeexporter/plugin.pm
@@ -35,6 +35,7 @@ sub new {
                         'cpu-detailed'      => 'cloud::prometheus::exporters::nodeexporter::mode::cpudetailed',
                         'load'              => 'cloud::prometheus::exporters::nodeexporter::mode::load',
                         'memory'            => 'cloud::prometheus::exporters::nodeexporter::mode::memory',
+                        'storage'           => 'cloud::prometheus::exporters::nodeexporter::mode::storage',
                         );
 
     $self->{custom_modes}{api} = 'cloud::prometheus::restapi::custom::api';
diff --git a/centreon-plugins/cloud/prometheus/restapi/custom/api.pm b/centreon-plugins/cloud/prometheus/restapi/custom/api.pm
index d89355b91..effb3bd27 100644
--- a/centreon-plugins/cloud/prometheus/restapi/custom/api.pm
+++ b/centreon-plugins/cloud/prometheus/restapi/custom/api.pm
@@ -187,9 +187,15 @@ sub query_range {
 sub query {
     my ($self, %options) = @_;
 
+    my $data;
     my $uri = URI::Encode->new({encode_reserved => 1});
 
-    return $self->get_endpoint(url_path => '/query?query=' . $uri->encode($options{query}));
+    foreach my $query (@{$options{queries}}) {
+        my $result = $self->get_endpoint(url_path => '/query?query=' . $uri->encode($query));
+        push @{$data}, @{$result->{result}};
+    }
+
+    return $data;
 }
 
 sub get_endpoint {