enh ibm softlayer plugin (#1241)

* enh ibm softlayer plugin

* enh ibm softlayer plugin, typos

centreon-plugins/cloud/ibm/softlayer/mode/events.pm

@@ -24,6 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
+use DateTime;
 
 my $instance_mode;
 
@@ -45,7 +46,7 @@ sub custom_status_threshold {
         }
     };
     if (defined($message)) {
-        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
+        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message, debug => 1);
     }
 
     return $status;
@@ -54,7 +55,11 @@ sub custom_status_threshold {
 sub custom_event_output {
     my ($self, %options) = @_;
     
-    my $msg = sprintf("Status is '%s', Impacted items: %d", $self->{result_values}->{status}, $self->{result_values}->{items});
+    my $msg = sprintf("Status is '%s', Impacted items: %d, Start date: %s, End date: %s",
+        $self->{result_values}->{status},
+        $self->{result_values}->{items},
+        ($self->{result_values}->{start_date} ne "-") ? $self->{result_values}->{start_date} . ' (' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{since_start}) . ' ago)' : '-',
+        ($self->{result_values}->{end_date} ne "-") ? $self->{result_values}->{end_date} . ' (' . centreon::plugins::misc::change_seconds(value => $self->{result_values}->{since_end}) . ' ago)' : '-');
     return $msg;
 }
 
@@ -65,6 +70,10 @@ sub custom_event_calc {
     $self->{result_values}->{subject} = $options{new_datas}->{$self->{instance} . '_subject'};
     $self->{result_values}->{status} = $options{new_datas}->{$self->{instance} . '_status'};
     $self->{result_values}->{items} = $options{new_datas}->{$self->{instance} . '_items'};
+    $self->{result_values}->{start_date} = $options{new_datas}->{$self->{instance} . '_start_date'};
+    $self->{result_values}->{since_start} = $options{new_datas}->{$self->{instance} . '_since_start'};
+    $self->{result_values}->{end_date} = $options{new_datas}->{$self->{instance} . '_end_date'};
+    $self->{result_values}->{since_end} = $options{new_datas}->{$self->{instance} . '_since_end'};
     return 0;
 }
 
@@ -119,7 +128,8 @@ sub set_counters {
     ];
     $self->{maps_counters}->{events} = [
         { label => 'event', threshold => 0, set => {
-                key_values => [ { name => 'id' }, { name => 'subject' }, { name => 'status' }, { name => 'items' } ],
+                key_values => [ { name => 'id' }, { name => 'subject' }, { name => 'status' }, { name => 'items' },
+                    { name => 'start_date' }, { name => 'since_start' }, { name => 'end_date' }, { name => 'since_end' } ],
                 closure_custom_calc => $self->can('custom_event_calc'),
                 closure_custom_output => $self->can('custom_event_output'),
                 closure_custom_perfdata => sub { return 0; },
@@ -166,6 +176,8 @@ sub change_macros {
 sub manage_selection {
     my ($self, %options) = @_;
     
+    my $current_time = time();
+    
     my %status_hash;
     my (undef, $events) = $options{custom}->get_endpoint(service => 'SoftLayer_Notification_Occurrence_Event', method => 'getAllObjects', extra_content => '');
     foreach my $event (@{$events->{'ns1:getAllObjectsResponse'}->{'getAllObjectsReturn'}->{'item'}}) {
@@ -187,11 +199,44 @@ sub manage_selection {
             $items = scalar(@{$ressources->{'ns1:getImpactedResourcesResponse'}->{'getImpactedResourcesReturn'}->{'item'}}) if (ref($ressources->{'ns1:getImpactedResourcesResponse'}->{'getImpactedResourcesReturn'}->{'item'}) eq 'ARRAY');
         }
 
+        my $start_epoch = '';
+        my $end_epoch = '';
+        if (defined($event->{startDate}->{content}) && 
+            $event->{startDate}->{content} =~ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(.*)$/) { # 2018-10-18T15:36:54+00:00
+            my $dt = DateTime->new(
+                year => $1,
+                month => $2,
+                day => $3,
+                hour => $4,
+                minute => $5,
+                second => $6,
+                time_zone => $7
+            );
+            $start_epoch = $dt->epoch;
+        }
+        if (defined($event->{endDate}->{content}) && 
+            $event->{endDate}->{content} =~ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(.*)$/) { # 2018-10-18T15:36:54+00:00
+            my $dt = DateTime->new(
+                year => $1,
+                month => $2,
+                day => $3,
+                hour => $4,
+                minute => $5,
+                second => $6,
+                time_zone => $7
+            );
+            $end_epoch = $dt->epoch;
+        }
+        
         $self->{events}->{$event->{id}->{content}} = {
             id => $event->{id}->{content},
             subject => $event->{subject}->{content},
             status => $status,
             items => $items,
+            start_date => (defined($event->{startDate}->{content})) ? $event->{startDate}->{content} : "-",
+            since_start => ($start_epoch ne '') ? $current_time - $start_epoch : "-",
+            end_date => (defined($event->{endDate}->{content})) ? $event->{endDate}->{content} : "-",
+            since_end => ($end_epoch ne '') ? $current_time - $end_epoch : "-",
         };
 
         $self->{global}->{lc($status)}++;
@@ -215,12 +260,14 @@ Filter events status (Default: 'Active')
 =item B<--warning-status>
 
 Set warning threshold for status (Default: '')
-Can used special variables like: %{status}, %{items}.
+Can used special variables like: %{id}, %{subject}, %{status}, %{items}, 
+%{start_date}, %{since_start}, %{end_date}, %{since_end}.
 
 =item B<--critical-status>
 
 Set critical threshold for status (Default: '%{status} =~ /Active/ && %{items} > 0').
-Can used special variables like: %{status}, %{items}.
+Can used special variables like: %{id}, %{subject}, %{status}, %{items}, 
+%{start_date}, %{since_start}, %{end_date}, %{since_end}.
 
 =item B<--warning-*>
 

centreon-plugins/cloud/ibm/softlayer/mode/opentickets.pm

@@ -24,12 +24,43 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
+use DateTime;
+
+my $instance_mode;
+
+sub custom_status_threshold {
+    my ($self, %options) = @_; 
+    my $status = 'ok';
+    my $message;
+    
+    eval {
+        local $SIG{__WARN__} = sub { $message = $_[0]; };
+        local $SIG{__DIE__} = sub { $message = $_[0]; };
+        
+        if (defined($instance_mode->{option_results}->{critical_status}) && $instance_mode->{option_results}->{critical_status} ne '' &&
+            eval "$instance_mode->{option_results}->{critical_status}") {
+            $status = 'critical';
+        } elsif (defined($instance_mode->{option_results}->{warning_status}) && $instance_mode->{option_results}->{warning_status} ne '' &&
+            eval "$instance_mode->{option_results}->{warning_status}") {
+            $status = 'warning';
+        }
+    };
+    if (defined($message)) {
+        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
+    }
+
+    return $status;
+}
 
 sub custom_ticket_output {
     my ($self, %options) = @_;
     
-    my $msg = sprintf("Title: '%s', Group: '%s', Priority: %s, Create Date: %s", $self->{result_values}->{title}, 
+    my $msg = sprintf("Title: '%s', Group: '%s', Priority: %s, Create Date: %s (%s ago)",
-        $self->{result_values}->{group}, $self->{result_values}->{priority}, $self->{result_values}->{createDate});
+        $self->{result_values}->{title}, 
+        $self->{result_values}->{group},
+        $self->{result_values}->{priority},
+        $self->{result_values}->{create_date},
+        centreon::plugins::misc::change_seconds(value => $self->{result_values}->{since}));
     return $msg;
 }
 
@@ -39,8 +70,9 @@ sub custom_ticket_calc {
     $self->{result_values}->{id} = $options{new_datas}->{$self->{instance} . '_id'};
     $self->{result_values}->{title} = $options{new_datas}->{$self->{instance} . '_title'};
     $self->{result_values}->{priority} = $options{new_datas}->{$self->{instance} . '_priority'};
-    $self->{result_values}->{createDate} = $options{new_datas}->{$self->{instance} . '_createDate'};
+    $self->{result_values}->{create_date} = $options{new_datas}->{$self->{instance} . '_create_date'};
     $self->{result_values}->{group} = $options{new_datas}->{$self->{instance} . '_group'};
+    $self->{result_values}->{since} = $options{new_datas}->{$self->{instance} . '_since'};
     return 0;
 }
 
@@ -71,11 +103,12 @@ sub set_counters {
     ];
     $self->{maps_counters}->{tickets} = [
         { label => 'ticket', threshold => 0, set => {
-                key_values => [ { name => 'id' }, { name => 'title' }, { name => 'priority' }, { name => 'createDate' },
+                key_values => [ { name => 'id' }, { name => 'title' }, { name => 'priority' }, { name => 'create_date' },
-                { name => 'group' } ],
+                { name => 'group' }, { name => 'since' } ],
                 closure_custom_calc => $self->can('custom_ticket_calc'),
                 closure_custom_output => $self->can('custom_ticket_output'),
                 closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => $self->can('custom_status_threshold'),
             }
         },
     ];
@@ -90,6 +123,8 @@ sub new {
     $options{options}->add_options(arguments =>
                                 {
                                     "ticket-group:s"    => { name => 'ticket_group' },
+                                    "warning-status:s"  => { name => 'warning_status', default => '' },
+                                    "critical-status:s" => { name => 'critical_status', default => '' },
                                 });
 
     return $self;
@@ -98,6 +133,19 @@ sub new {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
+
+    $instance_mode = $self;
+    $self->change_macros();
+}
+
+sub change_macros {
+    my ($self, %options) = @_;
+    
+    foreach (('warning_status', 'critical_status')) {
+        if (defined($self->{option_results}->{$_})) {
+            $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
+        }
+    }
 }
 
 sub manage_selection {
@@ -123,16 +171,30 @@ sub manage_selection {
         $self->{output}->option_exit();
     }
 
+    my $current_time = time();
+
     my (undef, $tickets) = $options{custom}->get_endpoint(service => 'SoftLayer_Account', method => 'getOpenTickets', extra_content => '');
     foreach my $ticket (@{$tickets->{'ns1:getOpenTicketsResponse'}->{'getOpenTicketsReturn'}->{'item'}}) {
         next if (defined($group_id) && $group_id ne '' && $ticket->{groupId}->{content} ne $group_id);
 
+        next if ($ticket->{createDate}->{content} !~ /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(.*)$/); # 2018-10-18T15:36:54+00:00
+        my $dt = DateTime->new(
+            year => $1,
+            month => $2,
+            day => $3,
+            hour => $4,
+            minute => $5,
+            second => $6,
+            time_zone => $7
+        );
+        
         $self->{tickets}->{$ticket->{id}->{content}} = {
             id => $ticket->{id}->{content},
             title => $ticket->{title}->{content},
             priority => $ticket->{priority}->{content},
-            createDate => $ticket->{createDate}->{content},
+            create_date => $ticket->{createDate}->{content},
             group => $groups_hash{$ticket->{groupId}->{content}},
+            since => $current_time - $dt->epoch,
         };
 
         $self->{global}->{open}++;
@@ -153,6 +215,18 @@ Check if there is open tickets
 
 Name of the ticket group (Can be a regexp).
 
+=item B<--warning-status>
+
+Set warning threshold for status (Default: '')
+Can used special variables like: %{id}, %{title},
+%{priority}, %{create_date}, %{group}, %{since}.
+
+=item B<--critical-status>
+
+Set critical threshold for status (Default: '').
+Can used special variables like: %{id}, %{title},
+%{priority}, %{create_date}, %{group}, %{since}.
+
 =item B<--warning-open>
 
 Threshold warning for open tickets.