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

Merge branch 'master' of https://github.com/centreon/centreon-plugins

This commit is contained in:
garnier-quentin 2015-08-18 14:46:02 +02:00
parent 19fc1e747a 9da8952ff5
commit 1ba7565739
3 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apcupsd/local/mode/libgetdata.pm
View File

@ -41,7 +41,7 @@ sub getdata {
my ($value);
#print $stdout;
foreach (split(/\n/, $stdout)) {
if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C Internal|F Internal)/i) {
if (/^$searchpattern\s*:\s*(.*)\s(Percent Load Capacity|Percent|Minutes|Seconds|Volts|Hz|seconds|C|F Internal)/i) {
$valueok = "1";
$value = $1;
#print $value;

17
network/atrica/snmp/mode/connections.pm
View File

@ -102,6 +102,12 @@ sub default_critical_status {
return undef;
}
sub default_check_status {
my ($self, %options) = @_;
return '%{opstatus} eq "up" or %{opstatus} eq "inService"';
}
sub default_global_admin_up_rule {
my ($self, %options) = @_;
@ -258,7 +264,14 @@ sub custom_traffic_output {
sub custom_traffic_calc {
my ($self, %options) = @_;
return -10 if (defined($instance_mode->{last_status}) && $instance_mode->{last_status} == 0);
my $diff_traffic = ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}});
if ($diff_traffic == 0 && !defined($instance_mode->{option_results}->{no_skipped_counters})) {
$self->{error_msg} = "skipped";
return -2;
}
$self->{result_values}->{traffic_per_seconds} = $diff_traffic / $options{delta_time};
if (defined($options{new_datas}->{$self->{instance} . '_speed_' . $options{extra_options}->{label_ref}}) &&
$options{new_datas}->{$self->{instance} . '_speed_' . $options{extra_options}->{label_ref}} > 0) {
@ -434,6 +447,10 @@ Set interface speed for incoming traffic (in Mb).
Set interface speed for outgoing traffic (in Mb).
=item B<--no-skipped-counters>
Don't skip counters when no change.
=item B<--reload-cache-time>
Time in seconds before reloading cache file (default: 180).

44
snmp_standard/mode/interfaces.pm
View File

@ -49,6 +49,11 @@ sub custom_threshold_output {
eval "$instance_mode->{option_results}->{warning_status}") {
$status = 'warning';
}
$instance_mode->{last_status} = 0;
if (eval "$instance_mode->{check_status}") {
$instance_mode->{last_status} = 1;
}
};
if (defined($message)) {
$self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
@ -75,21 +80,24 @@ sub custom_status_calc {
sub custom_cast_calc {
my ($self, %options) = @_;
my $diff_cast = ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}});
my $total = $diff_cast
+ ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref1}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref1}})
+ ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref2}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref2}});
return -10 if (defined($instance_mode->{last_status}) && $instance_mode->{last_status} == 0);
if ($options{new_datas}->{$self->{instance} . '_mode_cast'} ne $options{old_datas}->{$self->{instance} . '_mode_cast'}) {
$self->{error_msg} = "buffer creation";
return -2;
}
if ($total == 0) {
my $diff_cast = ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}});
my $total = $diff_cast
+ ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref1}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref1}})
+ ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref2}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{total_ref2}});
if ($total == 0 && !defined($instance_mode->{option_results}->{no_skipped_counters})) {
$self->{error_msg} = "skipped";
return -2;
}
$self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
$self->{result_values}->{$options{extra_options}->{label_ref} . '_prct'} = $diff_cast * 100 / $total;
$self->{result_values}->{$options{extra_options}->{label_ref} . '_prct'} = $total == 0 ? 0 : $diff_cast * 100 / $total;
return 0;
}
@ -156,13 +164,14 @@ sub custom_traffic_output {
sub custom_traffic_calc {
my ($self, %options) = @_;
return -10 if (defined($instance_mode->{last_status}) && $instance_mode->{last_status} == 0);
if ($options{new_datas}->{$self->{instance} . '_mode_traffic'} ne $options{old_datas}->{$self->{instance} . '_mode_traffic'}) {
$self->{error_msg} = "buffer creation";
return -2;
}
my $diff_traffic = ($options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}} - $options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref}});
if ($diff_traffic == 0) {
if ($diff_traffic == 0 && !defined($instance_mode->{option_results}->{no_skipped_counters})) {
$self->{error_msg} = "skipped";
return -2;
}
@ -227,6 +236,7 @@ sub custom_errors_output {
sub custom_errors_calc {
my ($self, %options) = @_;
return -10 if (defined($instance_mode->{last_status}) && $instance_mode->{last_status} == 0);
if ($options{new_datas}->{$self->{instance} . '_mode_cast'} ne $options{old_datas}->{$self->{instance} . '_mode_cast'}) {
$self->{error_msg} = "buffer creation";
return -2;
@ -236,12 +246,12 @@ sub custom_errors_calc {
$options{old_datas}->{$self->{instance} . '_' . $options{extra_options}->{label_ref1} . $options{extra_options}->{label_ref2}});
my $total = ($options{new_datas}->{$self->{instance} . '_total_' . $options{extra_options}->{label_ref1} . '_packets'} -
$options{old_datas}->{$self->{instance} . '_total_' . $options{extra_options}->{label_ref1} . '_packets'});
if ($total == 0) {
if ($total == 0 && !defined($instance_mode->{option_results}->{no_skipped_counters})) {
$self->{error_msg} = "skipped";
return -2;
}
$self->{result_values}->{prct} = $diff * 100 / $total;
$self->{result_values}->{prct} = $total == 0 ? 0 : $diff * 100 / $total;
$self->{result_values}->{used} = $diff;
$self->{result_values}->{total} = $total;
$self->{result_values}->{label1} = $options{extra_options}->{label_ref1};
@ -568,6 +578,12 @@ sub check_oids_label {
}
}
sub default_check_status {
my ($self, %options) = @_;
return '%{opstatus} eq "up"';
}
sub default_warning_status {
my ($self, %options) = @_;
@ -646,6 +662,7 @@ sub new {
"speed:s" => { name => 'speed' },
"speed-in:s" => { name => 'speed_in' },
"speed-out:s" => { name => 'speed_out' },
"no-skipped-counters" => { name => 'no_skipped_counters' },
"display-transform-src:s" => { name => 'display_transform_src' },
"display-transform-dst:s" => { name => 'display_transform_dst' },
"show-cache" => { name => 'show_cache' },
@ -834,7 +851,7 @@ sub run {
my ($value_check) = $obj->execute(values => $self->{interface_selected}->{$id},
new_datas => $self->{new_datas});
next if ($value_check == -10); # not running
if ($value_check != 0) {
$long_msg .= $long_msg_append . $obj->output_error();
$long_msg_append = ', ';
@ -881,6 +898,9 @@ sub change_macros {
$self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
}
}
$self->{check_status} = $self->default_check_status();
$self->{check_status} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
}
sub get_display_value {
@ -1287,6 +1307,10 @@ Set interface speed for incoming traffic (in Mb).
Set interface speed for outgoing traffic (in Mb).
=item B<--no-skipped-counters>
Don't skip counters when no change.
=item B<--reload-cache-time>
Time in seconds before reloading cache file (default: 180).