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

Refs #5474

This commit is contained in:
garnier-quentin 2014-04-24 12:06:10 +02:00
parent 099aee5b38
commit 04e378c76b
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ sub new {
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', },
"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' }, "credentials" => { name => 'credentials' },

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

@ -52,7 +52,7 @@ sub new {
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', },
"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' }, "credentials" => { name => 'credentials' },

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

@ -52,7 +52,7 @@ sub new {
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', },
"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' }, "credentials" => { name => 'credentials' },

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

@ -51,7 +51,7 @@ sub new {
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', },
"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' }, "credentials" => { name => 'credentials' },

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

@ -51,7 +51,7 @@ sub new {
$options{options}->add_options(arguments => $options{options}->add_options(arguments =>
{ {
"hostname:s" => { name => 'hostname' }, "hostname:s" => { name => 'hostname' },
"port:s" => { name => 'port', default => '80' }, "port:s" => { name => 'port', },
"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' }, "credentials" => { name => 'credentials' },

7
centreon/plugins/httplib.pm
View File

@ -46,8 +46,13 @@ sub connect {
my $connection_exit = defined($options{connection_exit}) ? $options{connection_exit} : 'unknown'; my $connection_exit = defined($options{connection_exit}) ? $options{connection_exit} : 'unknown';
my ($response, $content); my ($response, $content);
my $req;
my $req = HTTP::Request->new( GET => $self->{option_results}->{proto}. "://" . $self->{option_results}->{hostname}.':'. $self->{option_results}->{port} . $self->{option_results}->{url_path}); if (defined($self->{option_results}->{port})) {
$req = HTTP::Request->new( GET => $self->{option_results}->{proto}. "://" . $self->{option_results}->{hostname}.':'. $self->{option_results}->{port} . $self->{option_results}->{url_path});
} else {
$req = HTTP::Request->new( GET => $self->{option_results}->{proto}. "://" . $self->{option_results}->{hostname} . $self->{option_results}->{url_path});
}
if (defined($self->{option_results}->{credentials})) { if (defined($self->{option_results}->{credentials})) {
$req->authorization_basic($self->{option_results}->{username}, $self->{option_results}->{password}); $req->authorization_basic($self->{option_results}->{username}, $self->{option_results}->{password});