add some checks for netapp santricity

centreon-plugins/storage/netapp/santricity/restapi/custom/api.pm

@@ -182,18 +182,30 @@ sub request_api {
 sub execute_storages_request {
     my ($self, %options) = @_;
 
-    my $storages = $self->request_api(name => 'storages', endpoint => '/storage-systems');
+    my $storages = $self->request_api(
-    return $storages if (!defined($options{endpoint}));
+        name => 'storages',
+        endpoint => '/storage-systems'
+    );
+    return $storages if (!defined($options{endpoints}));
 
     for (my $i = 0; $i < scalar(@{$storages->{storages}}); $i++) {
         next if (defined($options{filter_name}) && $options{filter_name} ne '' &&
             $storages->{storages}->[$i]->{name} !~ /$options{filter_name}/);
 
-        my $info = $self->request_api(name => 'info', endpoint => '/storage-systems/' . $storages->{storages}->[$i]->{wwn} . $options{endpoint});
         $storages->{storages}->[$i]->{offline} = 0;
-        $storages->{storages}->[$i]->{offline} = 1 if (!defined($info));
 
-        $storages->{storages}->[$i]->{ $options{endpoint} } = defined($info) ? $info->{info} : undef;
+        foreach (@{$options{endpoints}}) {
+            my $info = $self->request_api(
+                name => 'info',
+                endpoint => '/storage-systems/' . $storages->{storages}->[$i]->{wwn} . $_->{endpoint} . (defined($_->{get_param}) ? '?' . $_->{get_param} : '') 
+            );
+            if (!defined($info)) {
+                $storages->{storages}->[$i]->{offline} = 1;
+                last;
+            }
+
+            $storages->{storages}->[$i]->{ $_->{endpoint} } = defined($info) ? $info->{info} : undef;
+        }
     }
 
     return $storages;

centreon-plugins/storage/netapp/santricity/restapi/mode/hardware.pm

@@ -147,7 +147,9 @@ sub new {
 sub execute_custom {
     my ($self, %options) = @_;
 
-    $self->{json_results} = $options{custom}->execute_storages_request(endpoint => '/hardware-inventory');
+    $self->{json_results} = $options{custom}->execute_storages_request(
+        endpoints => [ { endpoint => '/hardware-inventory' } ]
+    );
 }
 
 1;

centreon-plugins/storage/netapp/santricity/restapi/mode/storagecontrollers.pm

@@ -0,0 +1,252 @@
+#
+# Copyright 2020 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::netapp::santricity::restapi::mode::storagecontrollers;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
+use Digest::MD5 qw(md5_hex);
+
+sub custom_status_output {
+    my ($self, %options) = @_;
+
+    return sprintf(
+        'status: %s',
+        $self->{result_values}->{status}
+    );
+}
+
+sub ss_long_output {
+    my ($self, %options) = @_;
+
+    return "checking storage system '" . $options{instance_value}->{display} . "'";
+}
+
+sub prefix_ss_output {
+    my ($self, %options) = @_;
+
+    return "storage system '" . $options{instance_value}->{display} . "' ";
+}
+
+sub prefix_controller_output {
+    my ($self, %options) = @_;
+
+    return "controller '" . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'ss', type => 3, cb_prefix_output => 'prefix_ss_output', cb_long_output => 'ss_long_output', indent_long_output => '    ', message_multiple => 'All storage systems are ok',
+            group => [
+                { name => 'controllers', display_long => 1, cb_prefix_output => 'prefix_controller_output',  message_multiple => 'controllers are ok', type => 1, skipped_code => { -10 => 1 } }
+            ]
+        }
+    ];
+    
+    $self->{maps_counters}->{controllers} = [
+        { label => 'controller-status', threshold => 0, set => {
+                key_values => [ { name => 'status' }, { name => 'display' } ],
+                closure_custom_calc => \&catalog_status_calc,
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => \&catalog_status_threshold
+            }
+        },
+        { label => 'cpu-utilization', nlabel => 'volume.cpu.utilization.percentage', set => {
+                key_values => [ { name => 'cpu_util', diff => 1 }, { name => 'display' } ],
+                per_second => 1,
+                output_template => 'cpu usage: %.2f %%',
+                perfdatas => [
+                    { value => 'cpu_util_per_second', template => '%d',
+                      unit => '%', label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'read', nlabel => 'volume.io.read.usage.bytespersecond', set => {
+                key_values => [ { name => 'read_bytes', diff => 1 }, { name => 'display' } ],
+                output_template => 'read: %s %s/s',
+                per_second => 1, output_change_bytes => 1, 
+                perfdatas => [
+                    { value => 'read_bytes_per_second', template => '%d',
+                      unit => 'B/s', label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'write', nlabel => 'volume.io.write.usage.bytespersecond', set => {
+                key_values => [ { name => 'write_bytes', diff => 1 }, { name => 'display' } ],
+                output_template => 'write: %s %s/s',
+                per_second => 1, output_change_bytes => 1,
+                perfdatas => [
+                    { value => 'write_bytes_per_second', template => '%d',
+                      unit => 'B/s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'read-iops', nlabel => 'system.io.read.usage.iops', set => {
+                key_values => [ { name => 'read_iops', diff => 1 }, { name => 'display' } ],
+                output_template => 'read: %.2f iops',
+                per_second => 1,
+                perfdatas => [
+                    { value => 'read_iops_per_second',  template => '%.2f',
+                      unit => 'iops', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'write-iops', nlabel => 'system.io.write.usage.iops', set => {
+                key_values => [ { name => 'write_iops', diff => 1 }, { name => 'display' } ],
+                output_template => 'write: %.2f iops',
+                per_second => 1,
+                perfdatas => [
+                    { value => 'write_iops_per_second', template => '%.2f',
+                      unit => 'iops', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        }
+    ];
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1, force_new_perfdata => 1);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments => { 
+        'filter-storage-name:s'        => { name => 'filter_storage_name' },
+        'filter-controller-name:s'     => { name => 'filter_controller_name' },
+        'unknown-controller-status:s'  => { name => 'unknown_controller_status', default => '%{status} =~ /unknown/i' },
+        'warning-controller-status:s'  => { name => 'warning_controller_status', default => '%{status} =~ /rpaParErr|degraded/i' },
+        'critical-controller-status:s' => { name => 'critical_controller_status', default => '%{status} =~ /failed/i' }
+    });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $self->change_macros(macros => ['warning_controller_status', 'critical_controller_status', 'unknown_controller_status']);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $results = $options{custom}->execute_storages_request(
+        endpoints => [
+            { endpoint => '/controllers' },
+            { endpoint => '/controller-statistics', get_param => 'usecache=false' }
+        ],
+        filter_name => $self->{option_results}->{filter_storage_name}
+    );
+
+    my $mapping_controller = {};
+    $self->{ss} = {};
+    foreach (@{$results->{storages}}) {
+        my $storage_name = $_->{name};
+
+        $self->{ss}->{$storage_name} = {
+            display => $storage_name,
+            controllers => {}
+        };
+
+        next if (!defined($_->{'/controllers'}));
+
+        foreach my $entry (@{$_->{'/controllers'}}) {
+            my $name = $entry->{physicalLocation}->{label} ne '' ? $entry->{physicalLocation}->{label} : 
+                $entry->{physicalLocation}->{locationPosition} . ':' . $entry->{physicalLocation}->{slot};
+
+            next if (defined($options{filter_controller_name}) && $options{filter_controller_name} ne '' &&
+                $name !~ /$options{filter_controller_name}/);
+
+            $mapping_controller->{ $entry->{id} } = $name;
+            $self->{ss}->{$storage_name}->{controllers}->{ $name } = {
+                display => $name,
+                status => $entry->{status}
+            };
+        }
+
+        foreach my $entry (@{$_->{'/controller-statistics'}}) {
+            next if (!defined($mapping_controller->{ $entry->{controllerId} }));
+
+            $self->{ss}->{$storage_name}->{controllers}->{ $mapping_controller->{ $entry->{controllerId} } }->{write_bytes} = $entry->{writeBytesTotal};
+            $self->{ss}->{$storage_name}->{controllers}->{ $mapping_controller->{ $entry->{controllerId} } }->{read_bytes} = $entry->{readBytesTotal};
+            $self->{ss}->{$storage_name}->{controllers}->{ $mapping_controller->{ $entry->{controllerId} } }->{read_iops} = $entry->{readIopsTotal};
+            $self->{ss}->{$storage_name}->{controllers}->{ $mapping_controller->{ $entry->{controllerId} } }->{write_iops} = $entry->{writeIopsTotal};
+            $self->{ss}->{$storage_name}->{controllers}->{ $mapping_controller->{ $entry->{controllerId} } }->{cpu_util} = $entry->{cpuUtilizationStats}->[0]->{sumCpuUtilization};
+        }
+    }
+
+    $self->{cache_name} = 'netapp_santricity' . $self->{mode} . '_' . $options{custom}->get_hostname()  . '_' .
+        (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_storage_name}) ? md5_hex($self->{option_results}->{filter_storage_name}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_controller_name}) ? md5_hex($self->{option_results}->{filter_controller_name}) : md5_hex('all'));
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check storage controllers.
+
+=over 8
+
+=item B<--filter-counters>
+
+Only display some counters (regexp can be used).
+Example: --filter-counters='volume-status'
+
+=item B<--filter-storage-name>
+
+Filter storage name (can be a regexp).
+
+=item B<--filter-controller-name>
+
+Filter controller name (can be a regexp).
+
+=item B<--unknown-controller-status>
+
+Set unknown threshold for status (Default: '%{status} =~ /unknown/i').
+Can used special variables like: %{status}, %{display}
+
+=item B<--warning-controller-status>
+
+Set warning threshold for status (Default: '%{status} =~ /rpaParErr|degraded/i').
+Can used special variables like: %{status}, %{display}
+
+=item B<--critical-controller-status>
+
+Set critical threshold for status (Default: '%{status} =~ /failed/i').
+Can used special variables like: %{status}, %{display}
+
+=item B<--warning-*> B<--critical-*>
+
+Thresholds.
+Can be: 'read' (B/s), 'write' (B/s), 'read-iops', 'write-iops'.
+
+=back
+
+=cut

centreon-plugins/storage/netapp/santricity/restapi/mode/storagepools.pm

@@ -104,7 +104,7 @@ sub manage_selection {
     my ($self, %options) = @_;
 
     my $results = $options{custom}->execute_storages_request(
-        endpoint => '/storage-pools',
+        endpoints => [ { endpoint => '/storage-pools' } ],
         filter_name => $self->{option_results}->{filter_storage_name}
     );
 

centreon-plugins/storage/netapp/santricity/restapi/mode/storagevolumes.pm

@@ -25,6 +25,7 @@ use base qw(centreon::plugins::templates::counter);
 use strict;
 use warnings;
 use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
+use Digest::MD5 qw(md5_hex);
 
 sub custom_status_output {
     my ($self, %options) = @_;
@@ -35,21 +36,6 @@ sub custom_status_output {
     );
 }
 
-sub custom_usage_output {
-    my ($self, %options) = @_;
-    
-    my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total_space_absolute});
-    my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used_space_absolute});
-    my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free_space_absolute});
-    my $msg = sprintf(
-        'space 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_space_absolute},
-        $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free_space_absolute}
-    );
-    return $msg;
-}
-
 sub ss_long_output {
     my ($self, %options) = @_;
 
@@ -87,13 +73,53 @@ sub set_counters {
                 closure_custom_perfdata => sub { return 0; },
                 closure_custom_threshold_check => \&catalog_status_threshold
             }
+        },
+        { label => 'read', nlabel => 'volume.io.read.usage.bytespersecond', set => {
+                key_values => [ { name => 'read_bytes', diff => 1 }, { name => 'display' } ],
+                per_second => 1,
+                output_change_bytes => 1, output_template => 'read: %s %s/s',
+                perfdatas => [
+                    { value => 'read_bytes_per_second', template => '%d',
+                      unit => 'B/s', label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'write', nlabel => 'volume.io.write.usage.bytespersecond', set => {
+                key_values => [ { name => 'write_bytes', diff => 1 }, { name => 'display' } ],
+                output_template => 'write: %s %s/s',
+                per_second => 1, output_change_bytes => 1,
+                perfdatas => [
+                    { value => 'write_bytes_per_second', template => '%d',
+                      unit => 'B/s', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'read-iops', nlabel => 'system.io.read.usage.iops', set => {
+                key_values => [ { name => 'read_iops', diff => 1 }, { name => 'display' } ],
+                output_template => 'read: %.2f iops',
+                per_second => 1,
+                perfdatas => [
+                    { value => 'read_iops_per_second',  template => '%.2f',
+                      unit => 'iops', min => 0, label_extra_instance => 1 }
+                ]
+            }
+        },
+        { label => 'write-iops', nlabel => 'system.io.write.usage.iops', set => {
+                key_values => [ { name => 'write_iops', diff => 1 }, { name => 'display' } ],
+                output_template => 'write: %.2f iops',
+                per_second => 1,
+                perfdatas => [
+                    { value => 'write_iops_per_second', template => '%.2f',
+                      unit => 'iops', min => 0, label_extra_instance => 1 }
+                ]
+            }
         }
     ];
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => { 
@@ -118,7 +144,10 @@ sub manage_selection {
     my ($self, %options) = @_;
 
     my $results = $options{custom}->execute_storages_request(
-        endpoint => '/volumes',
+        endpoints => [
+            { endpoint => '/volumes' },
+            { endpoint => '/volume-statistics', get_param => 'usecache=false' }
+        ],
         filter_name => $self->{option_results}->{filter_storage_name}
     );
 
@@ -143,9 +172,23 @@ sub manage_selection {
                 status => $entry->{status}
             };
         }
+
+        foreach my $entry (@{$_->{'/volume-statistics'}}) {
+            next if (!defined($self->{ss}->{$storage_name}->{volumes}->{ $entry->{volumeName} }));
+
+            $self->{ss}->{$storage_name}->{volumes}->{ $entry->{volumeName} }->{write_bytes} = $entry->{writeBytes};
+            $self->{ss}->{$storage_name}->{volumes}->{ $entry->{volumeName} }->{read_bytes} = $entry->{readBytes};
+            $self->{ss}->{$storage_name}->{volumes}->{ $entry->{volumeName} }->{read_iops} = $entry->{readOps};
+            $self->{ss}->{$storage_name}->{volumes}->{ $entry->{volumeName} }->{write_iops} = $entry->{writeOps};
         }
     }
 
+    $self->{cache_name} = 'netapp_santricity' . $self->{mode} . '_' . $options{custom}->get_hostname()  . '_' .
+        (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_storage_name}) ? md5_hex($self->{option_results}->{filter_storage_name}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_volume_name}) ? md5_hex($self->{option_results}->{filter_volume_name}) : md5_hex('all'));
+}
+
 1;
 
 __END__
@@ -184,6 +227,11 @@ Can used special variables like: %{status}, %{display}
 Set critical threshold for status (Default: '%{status} =~ /failed/i').
 Can used special variables like: %{status}, %{display}
 
+=item B<--warning-*> B<--critical-*>
+
+Thresholds.
+Can be: 'read' (B/s), 'write' (B/s), 'read-iops', 'write-iops'.
+
 =back
 
 =cut

centreon-plugins/storage/netapp/santricity/restapi/plugin.pm

@@ -32,6 +32,7 @@ sub new {
     $self->{version} = '0.1';
     %{ $self->{modes} } = (
         'hardware'            => 'storage::netapp::santricity::restapi::mode::hardware',
+        'storage-controllers' => 'storage::netapp::santricity::restapi::mode::storagecontrollers',
         'storage-pools'       => 'storage::netapp::santricity::restapi::mode::storagepools',
         'storage-systems'     => 'storage::netapp::santricity::restapi::mode::storagesystems',
         'storage-volumes'     => 'storage::netapp::santricity::restapi::mode::storagevolumes'