tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+ enhance emc symmetrix

This commit is contained in:
garnier-quentin 2016-06-17 14:47:44 +02:00
parent 0c7511b84a
commit 6c86ff60ee
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
storage/emc/symmetrix/dmx34/local/mode/hardware.pm
View File

@ -153,10 +153,6 @@ sub send_email {
}
if (defined($self->{option_results}->{email_smtp_username}) && defined($self->{option_results}->{email_smtp_password})) {
$smtp_options{-pass} = $self->{option_results}->{email_smtp_password};
}
foreach my $option (@{$self->{option_results}->{email_smtp_options}}) {
next if ($option !~ /^(.+?)=(.+)$/);
$smtp_options{-$1} = $2;
}
#######
@ -172,6 +168,17 @@ sub send_email {
my $subject = $1;
my $status = lc($self->{output}->get_litteral_status());
foreach my $option (@{$self->{option_results}->{email_smtp_options}}) {
next if ($option !~ /^(.+?)=(.+)$/);
my ($label, $value) = ($1, $2);
if ($label =~ /subject/i) {
$value =~ s/%\{status\}/$status/g;
$value =~ s/%\{short_msg\}/$subject/g;
$label = lc($label);
}
$smtp_options{-$label} = $value;
}
my $send_email = 0;
$send_email = 1 if ($status ne 'ok');
#######
@ -216,7 +223,7 @@ sub send_email {
}
my $result = $mail->send(-to => $smtp_to,
-from => $self->{option_results}->{email_smtp_from},
-subject => $subject,
-subject => defined($smtp_options{-subject}) ? $smtp_options{-subject} : $subject,
-body => $stdout,
-attachments => $self->{option_results}->{file_health} . ',' . $self->{option_results}->{file_health_env});
$mail->bye();

17
storage/emc/symmetrix/vmax/local/mode/hardware.pm
View File

@ -179,10 +179,6 @@ sub send_email {
if (defined($self->{option_results}->{email_smtp_username}) && defined($self->{option_results}->{email_smtp_password})) {
$smtp_options{-pass} = $self->{option_results}->{email_smtp_password};
}
foreach my $option (@{$self->{option_results}->{email_smtp_options}}) {
next if ($option !~ /^(.+?)=(.+)$/);
$smtp_options{-$1} = $2;
}
#######
# Get current data
@ -197,6 +193,17 @@ sub send_email {
my $subject = $1;
my $status = lc($self->{output}->get_litteral_status());
foreach my $option (@{$self->{option_results}->{email_smtp_options}}) {
next if ($option !~ /^(.+?)=(.+)$/);
my ($label, $value) = ($1, $2);
if ($label =~ /subject/i) {
$value =~ s/%\{status\}/$status/g;
$value =~ s/%\{short_msg\}/$subject/g;
$label = lc($label);
}
$smtp_options{-$label} = $value;
}
my $send_email = 0;
$send_email = 1 if ($status ne 'ok');
#######
@ -241,7 +248,7 @@ sub send_email {
}
my $result = $mail->send(-to => $smtp_to,
-from => $self->{option_results}->{email_smtp_from},
-subject => $subject,
-subject => defined($smtp_options{-subject}) ? $smtp_options{-subject} : $subject,
-body => $stdout,
-attachments => $self->{option_results}->{file_health} . "," . $self->{option_results}->{file_health_env});
$mail->bye();