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 #5474

This commit is contained in:
garnier-quentin 2014-04-22 15:31:46 +02:00
parent 102312d889
commit 6041a6a342
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/apache/serverstatus/mode/requests.pm
View File

@ -115,13 +115,14 @@ sub run {
my ($self, %options) = @_; my ($self, %options) = @_;
my $webcontent = centreon::plugins::httplib::connect($self); my $webcontent = centreon::plugins::httplib::connect($self);
my ($rPerSec, $bPerReq, $total_access, $total_bytes); my ($rPerSec, $bPerReq, $total_access, $total_bytes, $avg_bPerSec);
$total_access = $1 if ($webcontent =~ /^Total Accesses:\s+([^\s]+)/mi); $total_access = $1 if ($webcontent =~ /^Total Accesses:\s+([^\s]+)/mi);
$total_bytes = $1 * 1024 if ($webcontent =~ /^Total kBytes:\s+([^\s]+)/mi); $total_bytes = $1 * 1024 if ($webcontent =~ /^Total kBytes:\s+([^\s]+)/mi);
$rPerSec = $1 if ($webcontent =~ /^ReqPerSec:\s+([^\s]+)/mi); $rPerSec = $1 if ($webcontent =~ /^ReqPerSec:\s+([^\s]+)/mi);
$bPerReq = $1 if ($webcontent =~ /^BytesPerReq:\s+([^\s]+)/mi); $bPerReq = $1 if ($webcontent =~ /^BytesPerReq:\s+([^\s]+)/mi);
$avg_bPerSec = $1 if ($webcontent =~ /^BytesPerSec:\s+([^\s]+)/mi);
if (!defined($bPerReq)) { if (!defined($bPerReq)) {
$self->{output}->add_option_msg(short_msg => "Apache 'ExtendedStatus' option is off."); $self->{output}->add_option_msg(short_msg => "Apache 'ExtendedStatus' option is off.");
@ -164,12 +165,14 @@ sub run {
my ($bPerReq_value, $bPerReq_unit) = $self->{perfdata}->change_bytes(value => $bPerReq); my ($bPerReq_value, $bPerReq_unit) = $self->{perfdata}->change_bytes(value => $bPerReq);
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(severity => $exit,
short_msg => sprintf("RequestPerSec: %s BytesPerSec: %s BytesPerRequest: %s AccessPerSec: %.2f", $rPerSec, short_msg => sprintf("BytesPerSec: %s AccessPerSec: %.2f RequestPerSec: %.2f BytesPerRequest: %s ",
$bPerSec_value . ' ' . $bPerSec_unit, $bPerSec_value . ' ' . $bPerSec_unit
$bPerReq_value . ' ' . $bPerReq_unit, $aPerSec,
$aPerSec)); $rPerSec,
$self->{output}->perfdata_add(label => "requestPerSec", $bPerReq_value . ' ' . $bPerReq_unit
value => $rPerSec, ));
$self->{output}->perfdata_add(label => "avg_RequestPerSec",
value => sprintf("%.2f", $rPerSec),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
min => 0 min => 0
@ -179,10 +182,14 @@ sub run {
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-bytes'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-bytes'),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-bytes'), critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-bytes'),
min => 0); min => 0);
$self->{output}->perfdata_add(label => "bytesPerRequest", unit => 'B', $self->{output}->perfdata_add(label => "avg_bytesPerRequest", unit => 'B',
value => $bPerReq, value => $bPerReq,
min => 0 min => 0
); );
$self->{output}->perfdata_add(label => "avg_bytesPerSec", unit => 'B',
value => $avg_bPerSec,
min => 0
);
$self->{output}->perfdata_add(label => "accessPerSec", $self->{output}->perfdata_add(label => "accessPerSec",
value => sprintf("%.2f", $aPerSec), value => sprintf("%.2f", $aPerSec),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-access'), warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-access'),

3
apps/apache/serverstatus/mode/workers.pm
View File

@ -54,6 +54,9 @@ sub new {
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', default => '80' },
"proto:s" => { name => 'proto', default => "http" }, "proto:s" => { name => 'proto', default => "http" },
"urlpath:s" => { name => 'url_path', default => "/server-status/?auto" }, "urlpath:s" => { name => 'url_path', default => "/server-status/?auto" },
"credentials" => { name => 'credentials' },
"username:s" => { name => 'username' },
"password:s" => { name => 'password' },
"proxyurl:s" => { name => 'proxyurl' }, "proxyurl:s" => { name => 'proxyurl' },
"warning:s" => { name => 'warning' }, "warning:s" => { name => 'warning' },
"critical:s" => { name => 'critical' }, "critical:s" => { name => 'critical' },