+ enhance vplex (VIP)

storage/emc/vplex/restapi/custom/vplexapi.pm

@@ -137,12 +137,17 @@ sub get_items {
 
     $self->settings();
 
-    if (defined($options{engine}) && $options{engine} ne '') {
+    if (defined($options{parent})) {
-        $options{url} .= 'engine-' . $options{engine};
+        if (defined($options{$options{parent}}) && $options{$options{parent}} ne '') {
-    } else {
+            $options{url} .= $options{parent} . '-' . $options{engine} . '/';
-        $options{url} .= '*';
+        } else {
+            $options{url} .= '*' . '/';
+        }
     }
-    $options{url} .= '/' . $options{obj} . '/*';
+    if (defined($options{obj}) && $options{obj} ne '') {
+        $options{url} .= $options{obj} . '/';
+    }
+    $options{url} .= '*';
     
     my $response = $self->{http}->request(url_path => $options{url});
     my $decoded;
@@ -155,17 +160,25 @@ sub get_items {
     }
         
     my $items = {};
-    foreach my $context (@{$decoded->{response}->{context}}) { 
+    foreach my $context (@{$decoded->{response}->{context}}) {
-        $context->{parent} =~ /engines\/(.*?)\//;
+        my $engine_name;
-        my $engine_name = $1;
+        
-        $items->{$engine_name} = {} if (!defined($items->{$engine_name}));
+        if (defined($options{parent})) {
+            $context->{parent} =~ /\/$options{parent}-(.*?)\//;
+            $engine_name = $options{parent} . '-' . $1;
+            $items->{$engine_name} = {} if (!defined($items->{$engine_name}));
+        }
         
         my $attributes = {};
         foreach my $attribute (@{$context->{attributes}}) {
             $attributes->{$attribute->{name}} = $attribute->{value};
         }
         
-        $items->{$engine_name}->{$attributes->{name}} = $attributes;
+        if (defined($engine_name)) {
+            $items->{$engine_name}->{$attributes->{name}} = $attributes;
+        } else {
+            $items->{$attributes->{name}} = $attributes;
+        }
     }
 
     return $items;

storage/emc/vplex/restapi/mode/directors.pm

@@ -108,6 +108,7 @@ sub run {
     
     my $urlbase = '/vplex/engines/';
     my $items = $vplex->get_items(url => $urlbase,
+                                  parent => 'engine',
                                   engine => $self->{option_results}->{engine},
                                   obj => 'directors');
 

storage/emc/vplex/restapi/mode/fans.pm

@@ -100,6 +100,7 @@ sub run {
                                 short_msg => 'All Fans are OK');
 
     my $items = $vplex->get_items(url => $urlbase,
+                                  parent => 'engine',
                                   engine => $self->{option_results}->{engine},
                                   obj => 'fans');
     foreach my $engine_name (sort keys %{$items}) {
@@ -153,9 +154,7 @@ sub check_filter {
 sub get_severity {
     my ($self, %options) = @_;
     my $status = 'UNKNOWN'; # default 
-    
+        
-    return if (defined($options{instance}) && ) {
-    
     if (defined($self->{overload_th}->{$options{section}})) {
         foreach (@{$self->{overload_th}->{$options{section}}}) {            
             if ($options{value} =~ /$_->{filter}/i && 

storage/emc/vplex/restapi/mode/psus.pm

@@ -97,6 +97,7 @@ sub run {
     
     my $urlbase = '/vplex/engines/';
     my $items = $vplex->get_items(url => $urlbase,
+                                  parent => 'engine',
                                   engine => $self->{option_results}->{engine},
                                   obj => 'power-supplies');
 

storage/emc/vplex/restapi/mode/storagevolumes.pm

@@ -25,6 +25,13 @@ use base qw(centreon::plugins::mode);
 use strict;
 use warnings;
 
+my $thresholds = {
+    volume_health => [
+        ['online', 'ok'],
+        ['.*', 'CRITICAL'],
+    ],
+};
+
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
@@ -33,8 +40,9 @@ sub new {
     $self->{version} = '1.1';
     $options{options}->add_options(arguments =>
                {
-                   "cluster:s"       => { name => 'cluster', default => 'cluster-1' },
+                   "cluster:s"               => { name => 'cluster' },
-                   "filter-name:s"   => { name => 'filter_name' },
+                   "filter:s@"               => { name => 'filter' },
+                   "threshold-overload:s@"   => { name => 'threshold_overload' },
                });
 
     return $self;
@@ -44,51 +52,117 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
 
+    $self->{filter} = [];
+    foreach my $val (@{$self->{option_results}->{filter}}) {
+        next if (!defined($val) || $val eq '');
+        my @values = split (/,/, $val);
+        push @{$self->{filter}}, { filter => $values[0], instance => $values[1] }; 
+    }
+
+    $self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        next if (!defined($val) || $val eq '');
+        my @values = split (/,/, $val);
+        if (scalar(@values) < 3) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $instance, $status, $filter);
+        if (scalar(@values) == 3) {
+            ($section, $status, $filter) = @values;
+            $instance = '.*';
+        } else {
+             ($section, $instance, $status, $filter) = @values;
+        }
+        if ($section !~ /^volume/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload section '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status, instance => $instance };
+    }
 }
 
 sub run {
     my ($self, %options) = @_;
     my $vplex = $options{custom};
     
-    my $urlbase = '/vplex/clusters/'.$self->{option_results}->{cluster}.'/storage-elements/storage-volumes/';
+    my $urlbase = '/vplex/clusters/';     
-    
+    my $items = $vplex->get_items(url => $urlbase,
-    $vplex->connect();
+                                  parent => 'cluster',
-
+                                  engine => $self->{option_results}->{cluster},
-    my @items = $vplex->get_items(url => $urlbase);
+                                  obj => 'storage-elements/storage-volumes');
 
     $self->{output}->output_add(severity => 'OK',
                                 short_msg => 'All storage volumes are OK');
 
-    foreach my $item (@items) {
+    foreach my $cluster_name (sort keys %{$items}) {
+        foreach my $volume_name (sort keys %{$items->{$cluster_name}}) {
+            my $instance = $cluster_name . '_' . $volume_name;
 
-        if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
+            next if ($self->check_filter(section => 'volume', instance => $instance));
-            $item !~ /$self->{option_results}->{filter_name}/) {
+            
-            $self->{output}->output_add(long_msg => sprintf("Skipping storage '%s'.", $item));
+            $self->{output}->output_add(long_msg => sprintf("Storage volume '%s' health state is '%s'", 
-            next;
+                                                            $instance, 
+                                                            $items->{$cluster_name}->{$volume_name}->{'health-state'}));
+
+            my $exit = $self->get_severity(section => 'volume_health', instance => $instance, value => $items->{$cluster_name}->{$volume_name}->{'health-state'});
+            if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
+                $self->{output}->output_add(severity => $exit,
+                                            short_msg => sprintf("Storage volume '%s' health state is '%s'", 
+                                                            $instance, $items->{$cluster_name}->{$volume_name}->{'health-state'}));
+            }
         }
-
-        my $details = $vplex->get_param(url => $urlbase,
-                                        item => $item,
-                                        param => 'health-state');
-
-        $self->{output}->output_add(long_msg => sprintf("Device '%s' health state is '%s'", 
-                                                        $item, 
-                                                        $details->{context}->[0]->{attributes}->[0]->{value}
-                                                        ));
-
-        if ($details->{context}->[0]->{attributes}->[0]->{value} ne 'ok') {
-            $self->{output}->output_add(severity => 'CRITICAL',
-                                        short_msg => sprintf("Storage '%s' service is '%s'", 
-                                                             $item,
-                                                             $details->{context}->[0]->{attributes}->[0]->{value}
-                                                             ));
-        }
-
     }
-     
+    
     $self->{output}->display();
     $self->{output}->exit();
+}
 
+sub check_filter {
+    my ($self, %options) = @_;
+
+    foreach (@{$self->{filter}}) {
+        if ($options{section} =~ /$_->{filter}/) {
+            if (!defined($options{instance}) && !defined($_->{instance})) {
+                $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section."));
+                return 1;
+            } elsif (defined($options{instance}) && $options{instance} =~ /$_->{instance}/) {
+                $self->{output}->output_add(long_msg => sprintf("Skipping $options{section} section $options{instance} instance."));
+                return 1;
+            }
+        }
+    }
+    
+    return 0;
+}
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default 
+    
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {            
+           if ($options{value} =~ /$_->{filter}/i && 
+                (!defined($options{instance}) || $options{instance} =~ /$_->{instance}/)) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    my $label = defined($options{label}) ? $options{label} : $options{section};
+    foreach (@{$thresholds->{$label}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+    
+    return $status;
 }
 
 1;
@@ -97,17 +171,24 @@ __END__
 
 =head1 MODE
 
-Check Cluster devices health for VPlex
+Check Cluster Storage Volume health for VPlex
 
 =over 8
 
 =item B<--cluster>
 
-Set cluster name to check (cluster-1 and cluster-2) 
+Set cluster name to check (Example: '1')
 
-=item B<--filter-name>
+=item B<--filter>
 
-Filter some elements by name (can be a regexp)
+Filter some parts (comma seperated list)
+Can also exclude specific instance: --filter=volume,cluster-1_xxxx
+
+=item B<--threshold-overload>
+
+Set to overload default threshold values (syntax: section,[instance,]status,regexp)
+It used before default thresholds (order stays).
+Example: --threshold-overload='volume_health,CRITICAL,^(?!(ok)$)'
 
 =back