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

Fix #5517 

Add 'avg_' perfdata
This commit is contained in:
Quentin Garnier 2014-05-16 15:52:40 +02:00
parent 4432699048
commit 3054d15834
3 changed files with 79 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apache/serverstatus/mode/responsetime.pm
View File

@ -122,7 +122,7 @@ __END__
=head1 MODE
Check Apache WebServer statistics informations
Check Apache WebServer Time Response
=over 8

55
os/linux/local/mode/loadaverage.pm
View File

@ -139,12 +139,51 @@ sub run {
$msg = sprintf("Load average: %s [%s/%s CPUs], %s [%s/%s CPUs], %s [%s/%s CPUs]", $cpu_load1, $load1m, $countCpu,
$cpu_load5, $load5m, $countCpu,
$cpu_load15, $load15m, $countCpu);
$self->{output}->perfdata_add(label => 'avg_load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'avg_load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'avg_load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
$self->{output}->perfdata_add(label => 'load1',
value => $load1m,
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $load5m,
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $load15m,
min => 0);
} else {
$cpu_load1 = $load1m;
$cpu_load5 = $load5m;
$cpu_load15 = $load15m;
$msg = sprintf("Load average: %s, %s, %s", $cpu_load1, $cpu_load5, $cpu_load15);
$self->{output}->perfdata_add(label => 'load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
}
my $exit1 = $self->{perfdata}->threshold_check(value => $cpu_load1,
@ -156,22 +195,6 @@ sub run {
my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]);
$self->{output}->output_add(severity => $exit,
short_msg => $msg);
$self->{output}->perfdata_add(label => 'load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
$self->{output}->display();
$self->{output}->exit();

55
snmp_standard/mode/loadaverage.pm
View File

@ -120,12 +120,51 @@ sub run {
$msg = sprintf("Load average: %s [%s/%s CPUs], %s [%s/%s CPUs], %s [%s/%s CPUs]", $cpu_load1, $result->{$oid_CpuLoad1m}, $countCpu,
$cpu_load5, $result->{$oid_CpuLoad5m}, $countCpu,
$cpu_load15, $result->{$oid_CpuLoad15m}, $countCpu);
$self->{output}->perfdata_add(label => 'avg_load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'avg_load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'avg_load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
$self->{output}->perfdata_add(label => 'load1',
value => $result->{$oid_CpuLoad1m},
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $result->{$oid_CpuLoad5m},
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $result->{$oid_CpuLoad15m},
min => 0);
} else {
$cpu_load1 = $result->{$oid_CpuLoad1m};
$cpu_load5 = $result->{$oid_CpuLoad5m};
$cpu_load15 = $result->{$oid_CpuLoad15m};
$msg = sprintf("Load average: %s, %s, %s", $cpu_load1, $cpu_load5, $cpu_load15);
$self->{output}->perfdata_add(label => 'load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
}
my $exit1 = $self->{perfdata}->threshold_check(value => $cpu_load1,
@ -137,22 +176,6 @@ sub run {
my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2, $exit3 ]);
$self->{output}->output_add(severity => $exit,
short_msg => $msg);
$self->{output}->perfdata_add(label => 'load1',
value => $cpu_load1,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn1'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit1'),
min => 0);
$self->{output}->perfdata_add(label => 'load5',
value => $cpu_load5,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn5'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit5'),
min => 0);
$self->{output}->perfdata_add(label => 'load15',
value => $cpu_load15,
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warn15'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit15'),
min => 0);
$self->{output}->display();
$self->{output}->exit();