diff --git a/apps/apache/serverstatus/mode/cpuload.pm b/apps/apache/serverstatus/mode/cpuload.pm index a841f5edb..285ead041 100644 --- a/apps/apache/serverstatus/mode/cpuload.pm +++ b/apps/apache/serverstatus/mode/cpuload.pm @@ -46,6 +46,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -134,16 +135,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--header> Set HTTP headers (Multiple option) diff --git a/apps/apache/serverstatus/mode/requests.pm b/apps/apache/serverstatus/mode/requests.pm index 604b6846a..c65400931 100644 --- a/apps/apache/serverstatus/mode/requests.pm +++ b/apps/apache/serverstatus/mode/requests.pm @@ -51,6 +51,7 @@ sub new { "warning-access:s" => { name => 'warning_access' }, "critical-access:s" => { name => 'critical_access' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); $self->{statefile_value} = centreon::plugins::statefile->new(%options); @@ -223,16 +224,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--header> Set HTTP headers (Multiple option) diff --git a/apps/apache/serverstatus/mode/responsetime.pm b/apps/apache/serverstatus/mode/responsetime.pm index 97e42704a..3264d795b 100644 --- a/apps/apache/serverstatus/mode/responsetime.pm +++ b/apps/apache/serverstatus/mode/responsetime.pm @@ -47,6 +47,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "unknown-status:s" => { name => 'unknown_status', default => '' }, "warning-status:s" => { name => 'warning_status' }, "critical-status:s" => { name => 'critical_status', default => '%{http_code} < 200 or %{http_code} >= 300' }, @@ -126,11 +127,11 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--proxyurl> @@ -140,6 +141,10 @@ Proxy URL if any Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--header> Set HTTP headers (Multiple option) diff --git a/apps/apache/serverstatus/mode/slotstates.pm b/apps/apache/serverstatus/mode/slotstates.pm index cc7ef90d9..2075db477 100644 --- a/apps/apache/serverstatus/mode/slotstates.pm +++ b/apps/apache/serverstatus/mode/slotstates.pm @@ -206,6 +206,7 @@ sub new { "proxyurl:s" => { name => 'proxyurl' }, "header:s@" => { name => 'header' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "units:s" => { name => 'units', default => '%' }, }); @@ -347,16 +348,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--header> Set HTTP headers (Multiple option) diff --git a/apps/apache/serverstatus/mode/workers.pm b/apps/apache/serverstatus/mode/workers.pm index 0044eb3bd..c6528174f 100644 --- a/apps/apache/serverstatus/mode/workers.pm +++ b/apps/apache/serverstatus/mode/workers.pm @@ -46,6 +46,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -138,16 +139,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--header> Set HTTP headers (Multiple option) diff --git a/apps/bluemind/mode/incoming.pm b/apps/bluemind/mode/incoming.pm index 8212ec791..4e7f8f405 100644 --- a/apps/bluemind/mode/incoming.pm +++ b/apps/bluemind/mode/incoming.pm @@ -43,9 +43,11 @@ sub new { "database:s" => { name => 'database' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, + "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, - "timeout:s" => { name => 'timeout' }, }); $self->{statefile_value} = centreon::plugins::statefile->new(%options); @@ -196,9 +198,17 @@ Specify username for API authentification Specify password for API authentification +=item B<--proxyurl> + +Proxy URL if any + =item B<--timeout> -Threshold for HTTP timeout (Default: 3) +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--warning> diff --git a/apps/checkmyws/mode/status.pm b/apps/checkmyws/mode/status.pm index aec30b494..e8aabce2e 100644 --- a/apps/checkmyws/mode/status.pm +++ b/apps/checkmyws/mode/status.pm @@ -51,6 +51,7 @@ sub new { "proxyurl:s" => { name => 'proxyurl' }, "uid:s" => { name => 'uid' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "threshold-overload:s@" => { name => 'threshold_overload' }, }); @@ -203,20 +204,24 @@ Specify https if needed (Default: 'https') =item B<--urlpath> -Set path to get checkmyws information (Default: 'api/status') +Set path to get checkmyws information (Default: '/api/status') =item B<--proxyurl> Proxy URL if any -=item B<--uid> - -ID for checkmyws API - =item B<--timeout> Threshold for HTTP timeout (Default: 5) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + +=item B<--uid> + +ID for checkmyws API + =item B<--threshold-overload> Set to overload default threshold values (syntax: status,regexp) diff --git a/apps/github/mode/commits.pm b/apps/github/mode/commits.pm index b51924e90..49043f7dd 100644 --- a/apps/github/mode/commits.pm +++ b/apps/github/mode/commits.pm @@ -43,9 +43,11 @@ sub new { "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, + "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "owner:s" => { name => 'owner' }, "repository:s" => { name => 'repository' }, - "timeout:s" => { name => 'timeout' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -153,6 +155,18 @@ Specify username Specify password +=item B<--proxyurl> + +Proxy URL if any + +=item B<--timeout> + +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--owner> Specify GitHub's owner @@ -161,10 +175,6 @@ Specify GitHub's owner Specify GitHub's repository -=item B<--timeout> - -Threshold for HTTP timeout (Default: 5) - =back =cut diff --git a/apps/github/mode/issues.pm b/apps/github/mode/issues.pm index 9e177dd21..fdebb9bba 100644 --- a/apps/github/mode/issues.pm +++ b/apps/github/mode/issues.pm @@ -41,12 +41,14 @@ sub new { "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, + "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "owner:s" => { name => 'owner' }, "repository:s" => { name => 'repository' }, "label:s" => { name => 'label', default => '' }, - "timeout:s" => { name => 'timeout' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -160,6 +162,18 @@ Specify username Specify password +=item B<--proxyurl> + +Proxy URL if any + +=item B<--timeout> + +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Threshold warning. @@ -180,10 +194,6 @@ Specify GitHub's repository Specify label for issues -=item B<--timeout> - -Threshold for HTTP timeout (Default: 3) - =back =cut diff --git a/apps/github/mode/pullrequests.pm b/apps/github/mode/pullrequests.pm index 5abbae41f..f0768e86a 100644 --- a/apps/github/mode/pullrequests.pm +++ b/apps/github/mode/pullrequests.pm @@ -40,12 +40,14 @@ sub new { "proto:s" => { name => 'proto', default => 'https' }, "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, + "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "password:s" => { name => 'password' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "owner:s" => { name => 'owner' }, "repository:s" => { name => 'repository' }, - "timeout:s" => { name => 'timeout' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -145,6 +147,18 @@ Specify username Specify password +=item B<--proxyurl> + +Proxy URL if any + +=item B<--timeout> + +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Threshold warning. @@ -161,10 +175,6 @@ Specify GitHub's owner Specify GitHub's repository -=item B<--timeout> - -Threshold for HTTP timeout (Default: 5) - =back =cut diff --git a/apps/github/mode/stats.pm b/apps/github/mode/stats.pm index c3f1640b6..1cfed2dde 100644 --- a/apps/github/mode/stats.pm +++ b/apps/github/mode/stats.pm @@ -43,6 +43,8 @@ sub new { "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "owner:s" => { name => 'owner' }, "repository:s" => { name => 'repository' }, }); @@ -144,10 +146,18 @@ Specify username Specify password +=item B<--proxyurl> + +Proxy URL if any + =item B<--timeout> Threshold for HTTP timeout (Default: 5) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =cut diff --git a/apps/github/mode/status.pm b/apps/github/mode/status.pm index 17f420302..ee8b1b35d 100644 --- a/apps/github/mode/status.pm +++ b/apps/github/mode/status.pm @@ -43,15 +43,17 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname', default => 'status.github.com' }, - "port:s" => { name => 'port', default => '443'}, - "proto:s" => { name => 'proto', default => 'https' }, - "urlpath:s" => { name => 'url_path', default => '/api/last-message.json' }, - "credentials" => { name => 'credentials' }, - "username:s" => { name => 'username' }, - "password:s" => { name => 'password' }, - "timeout:s" => { name => 'timeout' }, - "threshold-overload:s@" => { name => 'threshold_overload' }, + "hostname:s" => { name => 'hostname', default => 'status.github.com' }, + "port:s" => { name => 'port', default => '443'}, + "proto:s" => { name => 'proto', default => 'https' }, + "urlpath:s" => { name => 'url_path', default => '/api/last-message.json' }, + "credentials" => { name => 'credentials' }, + "username:s" => { name => 'username' }, + "password:s" => { name => 'password' }, + "timeout:s" => { name => 'timeout' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "threshold-overload:s@" => { name => 'threshold_overload' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -164,9 +166,17 @@ Specify username Specify password +=item B<--proxyurl> + +Proxy URL if any + =item B<--timeout> -Threshold for HTTP timeout (Default: 5 +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--threshold-overload> diff --git a/apps/jenkins/mode/jobstate.pm b/apps/jenkins/mode/jobstate.pm index 01a5e3851..b9797a2cd 100644 --- a/apps/jenkins/mode/jobstate.pm +++ b/apps/jenkins/mode/jobstate.pm @@ -40,14 +40,16 @@ sub new { "port:s" => { name => 'port' }, "proto:s" => { name => 'proto' }, "urlpath:s" => { name => 'url_path' }, - "jobname:s" => { name => 'jobname' }, + "timeout:s" => { name => 'timeout' }, "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, + "proxyurl:s" => { name => 'proxyurl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "jobname:s" => { name => 'jobname' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, - "checkstyle" => { name => 'checkstyle' }, - "timeout:s" => { name => 'timeout' }, + "checkstyle" => { name => 'checkstyle' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -157,7 +159,7 @@ Specify https if needed (Default: 'http') Set path to get Jenkins information -=item B <--credentials> +=item B<--credentials> Required to use username/password authentication method @@ -169,6 +171,18 @@ Specify username for API authentification Specify password for API authentification +=item B<--proxyurl> + +Proxy URL if any + +=item B<--timeout> + +Threshold for HTTP timeout (Default: 5) + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for tendency score @@ -181,10 +195,6 @@ Critical Threshold for tendency score Add checkstyle's violation output and perfdata -=item B<--timeout> - -Threshold for HTTP timeout (Default: 5) - =back =cut diff --git a/apps/kayako/api/mode/listdepartment.pm b/apps/kayako/api/mode/listdepartment.pm index de61ea444..d6438043a 100644 --- a/apps/kayako/api/mode/listdepartment.pm +++ b/apps/kayako/api/mode/listdepartment.pm @@ -37,14 +37,18 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => - { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port' }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, - "kayako-api-key:s" => { name => 'kayako_api_key' }, - "kayako-secret-key:s" => { name => 'kayako_secret_key' }, - }); + { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port' }, + "proto:s" => { name => 'proto' }, + "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, + "proxyurl:s" => { name => 'proxyurl' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "kayako-api-key:s" => { name => 'kayako_api_key' }, + "kayako-secret-key:s" => { name => 'kayako_secret_key' }, + }); + $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; } @@ -116,9 +120,17 @@ Specify https if needed Proxy URL if any -=item B<--kayako-api-url> +=item B<--urlpath> -This is the URL you should dispatch all GET, POST, PUT & DELETE requests to. +This is the URL you should dispatch all GET, POST, PUT & DELETE requests to (Default: '/api/index.php?') + +=item B<--timeout> + +Threshold for HTTP timeout. + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--kayako-api-key> diff --git a/apps/kayako/api/mode/listpriority.pm b/apps/kayako/api/mode/listpriority.pm index fb66f1ea0..a937e4d05 100644 --- a/apps/kayako/api/mode/listpriority.pm +++ b/apps/kayako/api/mode/listpriority.pm @@ -37,14 +37,18 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => - { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port' }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, - "kayako-api-key:s" => { name => 'kayako_api_key' }, - "kayako-secret-key:s" => { name => 'kayako_secret_key' }, - }); + { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port' }, + "proto:s" => { name => 'proto' }, + "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, + "proxyurl:s" => { name => 'proxyurl' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "kayako-api-key:s" => { name => 'kayako_api_key' }, + "kayako-secret-key:s" => { name => 'kayako_secret_key' }, + }); + $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; } @@ -116,9 +120,17 @@ Specify https if needed Proxy URL if any -=item B<--kayako-api-url> +=item B<--urlpath> -This is the URL you should dispatch all GET, POST, PUT & DELETE requests to. +This is the URL you should dispatch all GET, POST, PUT & DELETE requests to (Default: '/api/index.php?') + +=item B<--timeout> + +Threshold for HTTP timeout. + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--kayako-api-key> diff --git a/apps/kayako/api/mode/liststaff.pm b/apps/kayako/api/mode/liststaff.pm index 60b1bdf17..4134d31eb 100644 --- a/apps/kayako/api/mode/liststaff.pm +++ b/apps/kayako/api/mode/liststaff.pm @@ -35,14 +35,17 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => - { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port' }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, - "kayako-api-key:s" => { name => 'kayako_api_key' }, - "kayako-secret-key:s" => { name => 'kayako_secret_key' }, - }); + { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port' }, + "proto:s" => { name => 'proto' }, + "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, + "proxyurl:s" => { name => 'proxyurl' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "kayako-api-key:s" => { name => 'kayako_api_key' }, + "kayako-secret-key:s" => { name => 'kayako_secret_key' }, + }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -115,9 +118,17 @@ Specify https if needed Proxy URL if any -=item B<--kayako-api-url> +=item B<--urlpath> -This is the URL you should dispatch all GET, POST, PUT & DELETE requests to. +This is the URL you should dispatch all GET, POST, PUT & DELETE requests to (Default: '/api/index.php?') + +=item B<--timeout> + +Threshold for HTTP timeout. + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--kayako-api-key> diff --git a/apps/kayako/api/mode/liststatus.pm b/apps/kayako/api/mode/liststatus.pm index 838d43c64..30c6e3853 100644 --- a/apps/kayako/api/mode/liststatus.pm +++ b/apps/kayako/api/mode/liststatus.pm @@ -35,14 +35,17 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => - { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port' }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, - "kayako-api-key:s" => { name => 'kayako_api_key' }, - "kayako-secret-key:s" => { name => 'kayako_secret_key' }, - }); + { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port' }, + "proto:s" => { name => 'proto' }, + "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, + "proxyurl:s" => { name => 'proxyurl' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "kayako-api-key:s" => { name => 'kayako_api_key' }, + "kayako-secret-key:s" => { name => 'kayako_secret_key' }, + }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -115,9 +118,17 @@ Specify https if needed Proxy URL if any -=item B<--kayako-api-url> +=item B<--urlpath> -This is the URL you should dispatch all GET, POST, PUT & DELETE requests to. +This is the URL you should dispatch all GET, POST, PUT & DELETE requests to (Default: '/api/index.php?') + +=item B<--timeout> + +Threshold for HTTP timeout. + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--kayako-api-key> diff --git a/apps/kayako/api/mode/ticketcount.pm b/apps/kayako/api/mode/ticketcount.pm index 4ddbf6790..42428fbb1 100644 --- a/apps/kayako/api/mode/ticketcount.pm +++ b/apps/kayako/api/mode/ticketcount.pm @@ -46,23 +46,26 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => - { - "hostname:s" => { name => 'hostname' }, - "port:s" => { name => 'port' }, - "proto:s" => { name => 'proto' }, - "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, - "kayako-api-key:s" => { name => 'kayako_api_key' }, - "kayako-secret-key:s" => { name => 'kayako_secret_key' }, - "reload-cache-time:s" => { name => 'reload_cache_time', default => 180 }, - "department-id:s" => { name => 'department_id' }, - "staff-id:s" => { name => 'staff_id' }, - "status-id:s" => { name => 'status_id' }, - "priority-id:s" => { name => 'priority_id' }, - "warning:s" => { name => 'warning' }, - "critical:s" => { name => 'critical' }, - "start-date:s" => { name => 'start_date' }, - "end-date:s" => { name => 'end_date' }, - }); + { + "hostname:s" => { name => 'hostname' }, + "port:s" => { name => 'port' }, + "proto:s" => { name => 'proto' }, + "urlpath:s" => { name => 'url_path', default => '/api/index.php?' }, + "proxyurl:s" => { name => 'proxyurl' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "kayako-api-key:s" => { name => 'kayako_api_key' }, + "kayako-secret-key:s" => { name => 'kayako_secret_key' }, + "reload-cache-time:s" => { name => 'reload_cache_time', default => 180 }, + "department-id:s" => { name => 'department_id' }, + "staff-id:s" => { name => 'staff_id' }, + "status-id:s" => { name => 'status_id' }, + "priority-id:s" => { name => 'priority_id' }, + "warning:s" => { name => 'warning' }, + "critical:s" => { name => 'critical' }, + "start-date:s" => { name => 'start_date' }, + "end-date:s" => { name => 'end_date' }, + }); $self->{statefile_cache} = centreon::plugins::statefile->new(%options); $self->{statefile_value} = centreon::plugins::statefile->new(%options); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -340,9 +343,17 @@ Specify https if needed Proxy URL if any -=item B<--kayako-api-url> +=item B<--urlpath> -This is the URL you should dispatch all GET, POST, PUT & DELETE requests to. (required) +This is the URL you should dispatch all GET, POST, PUT & DELETE requests to (Default: '/api/index.php?') + +=item B<--timeout> + +Threshold for HTTP timeout. + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--kayako-api-key> diff --git a/apps/kingdee/eas/custom/api.pm b/apps/kingdee/eas/custom/api.pm index b3171f00d..7533a0c37 100644 --- a/apps/kingdee/eas/custom/api.pm +++ b/apps/kingdee/eas/custom/api.pm @@ -41,13 +41,14 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, + "hostname:s@" => { name => 'hostname' }, "proto:s@" => { name => 'proto' }, - "port:s@" => { name => 'port', }, - "username:s@" => { name => 'username', }, - "password:s@" => { name => 'password', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, + "port:s@" => { name => 'port' }, + "username:s@" => { name => 'username' }, + "password:s@" => { name => 'password' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -175,6 +176,10 @@ Proxy URL if any. Set HTTP timeout in seconds (Default: '10'). +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/apps/nginx/serverstatus/mode/connections.pm b/apps/nginx/serverstatus/mode/connections.pm index 43d968afe..5232bca8b 100644 --- a/apps/nginx/serverstatus/mode/connections.pm +++ b/apps/nginx/serverstatus/mode/connections.pm @@ -50,6 +50,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); foreach (@{$maps}) { $options{options}->add_options(arguments => { @@ -143,16 +144,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning-*> Warning Threshold. Can be: 'active', 'waiting', 'writing', 'reading'. diff --git a/apps/nginx/serverstatus/mode/requests.pm b/apps/nginx/serverstatus/mode/requests.pm index df902e7cb..6f7ea8bbe 100644 --- a/apps/nginx/serverstatus/mode/requests.pm +++ b/apps/nginx/serverstatus/mode/requests.pm @@ -50,6 +50,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); foreach (@{$maps}) { $options{options}->add_options(arguments => { @@ -191,16 +192,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning-*> Warning Threshold. Can be: 'accepts', 'handled', 'requests'. diff --git a/apps/nginx/serverstatus/mode/responsetime.pm b/apps/nginx/serverstatus/mode/responsetime.pm index 88c410a50..fb7384811 100644 --- a/apps/nginx/serverstatus/mode/responsetime.pm +++ b/apps/nginx/serverstatus/mode/responsetime.pm @@ -46,6 +46,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "unknown-status:s" => { name => 'unknown_status', default => '' }, "warning-status:s" => { name => 'warning_status' }, "critical-status:s" => { name => 'critical_status', default => '%{http_code} < 200 or %{http_code} >= 300' }, @@ -124,11 +125,11 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--proxyurl> @@ -138,6 +139,10 @@ Proxy URL if any Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--unknown-status> Threshold warning for http response code diff --git a/apps/nsclient/restapi/mode/query.pm b/apps/nsclient/restapi/mode/query.pm index 9fd5c9265..235f278f4 100644 --- a/apps/nsclient/restapi/mode/query.pm +++ b/apps/nsclient/restapi/mode/query.pm @@ -197,11 +197,11 @@ Specify this option if you access webpage over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--legacy-password> diff --git a/apps/php/apc/web/mode/filecache.pm b/apps/php/apc/web/mode/filecache.pm index 7aa6702bf..4b8b122b0 100644 --- a/apps/php/apc/web/mode/filecache.pm +++ b/apps/php/apc/web/mode/filecache.pm @@ -211,6 +211,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout', default => 30 }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -278,16 +279,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout (Default: 30) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning-*> Threshold warning. diff --git a/apps/php/apc/web/mode/memory.pm b/apps/php/apc/web/mode/memory.pm index 8e12d31a5..3b3ac34eb 100644 --- a/apps/php/apc/web/mode/memory.pm +++ b/apps/php/apc/web/mode/memory.pm @@ -107,6 +107,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout', default => 30 }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -175,16 +176,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout (Default: 30) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning-*> Threshold warning. diff --git a/apps/php/fpm/web/mode/usage.pm b/apps/php/fpm/web/mode/usage.pm index ec27a49ad..794fe4eeb 100644 --- a/apps/php/fpm/web/mode/usage.pm +++ b/apps/php/fpm/web/mode/usage.pm @@ -151,6 +151,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout', default => 5 }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -228,6 +229,10 @@ Specify password for basic authentification (Mandatory if --credentials is speci Threshold for HTTP timeout (Default: 5) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning-*> Threshold warning. diff --git a/apps/redis/restapi/custom/api.pm b/apps/redis/restapi/custom/api.pm index afaf1374a..d52669170 100644 --- a/apps/redis/restapi/custom/api.pm +++ b/apps/redis/restapi/custom/api.pm @@ -51,6 +51,7 @@ sub new { "proxyurl:s@" => { name => 'proxyurl' }, "timeout:s@" => { name => 'timeout' }, "ssl:s@" => { name => 'ssl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -232,9 +233,9 @@ Proxy URL if any Set HTTP timeout -=item B<--ssl> +=item B<--ssl-opt> -SSL version (Default: tlsv1) +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =back diff --git a/apps/tomcat/web/mode/applications.pm b/apps/tomcat/web/mode/applications.pm index df77f68d7..bd2326b79 100644 --- a/apps/tomcat/web/mode/applications.pm +++ b/apps/tomcat/web/mode/applications.pm @@ -41,6 +41,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/text/list' }, "name:s" => { name => 'name' }, "regexp" => { name => 'use_regexp' }, @@ -167,16 +168,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager List (Default: Tomcat 7 '/manager/text/list') diff --git a/apps/tomcat/web/mode/listapplication.pm b/apps/tomcat/web/mode/listapplication.pm index fb7db50bb..6cbd71abb 100644 --- a/apps/tomcat/web/mode/listapplication.pm +++ b/apps/tomcat/web/mode/listapplication.pm @@ -41,6 +41,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/text/list' }, "filter-name:s" => { name => 'filter_name', }, "filter-state:s" => { name => 'filter_state', }, @@ -150,16 +151,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--url-path> Path to the Tomcat Manager List (Default: Tomcat 7 '/manager/text/list') diff --git a/apps/tomcat/web/mode/memory.pm b/apps/tomcat/web/mode/memory.pm index 5b9f7c2fe..6ab9114c7 100644 --- a/apps/tomcat/web/mode/memory.pm +++ b/apps/tomcat/web/mode/memory.pm @@ -42,6 +42,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/status?XML=true' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -202,16 +203,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager XML (Default: '/manager/status?XML=true') diff --git a/apps/tomcat/web/mode/requestinfo.pm b/apps/tomcat/web/mode/requestinfo.pm index 27c693147..9beccda37 100644 --- a/apps/tomcat/web/mode/requestinfo.pm +++ b/apps/tomcat/web/mode/requestinfo.pm @@ -45,6 +45,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/status?XML=true' }, "name:s" => { name => 'name' }, "regexp" => { name => 'use_regexp' }, @@ -344,16 +345,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager XML (Default: '/manager/status?XML=true') diff --git a/apps/tomcat/web/mode/sessions.pm b/apps/tomcat/web/mode/sessions.pm index 6b0f7faa2..3a1135d6a 100644 --- a/apps/tomcat/web/mode/sessions.pm +++ b/apps/tomcat/web/mode/sessions.pm @@ -41,6 +41,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/text/list' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -170,16 +171,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager List (Default: Tomcat 7 '/manager/text/list') diff --git a/apps/tomcat/web/mode/threads.pm b/apps/tomcat/web/mode/threads.pm index 00e624a0d..2c6cc45f3 100644 --- a/apps/tomcat/web/mode/threads.pm +++ b/apps/tomcat/web/mode/threads.pm @@ -43,6 +43,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/status?XML=true' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -238,16 +239,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager XML (Default: '/manager/status?XML=true') diff --git a/apps/tomcat/web/mode/traffic.pm b/apps/tomcat/web/mode/traffic.pm index eb4089ed5..8a93762bd 100644 --- a/apps/tomcat/web/mode/traffic.pm +++ b/apps/tomcat/web/mode/traffic.pm @@ -148,6 +148,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "urlpath:s" => { name => 'url_path', default => '/manager/status?XML=true' }, "filter-name:s" => { name => 'filter_name' }, "speed-in:s" => { name => 'speed_in' }, @@ -297,16 +298,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--urlpath> Path to the Tomcat Manager XML (Default: '/manager/status?XML=true') diff --git a/apps/video/zixi/restapi/custom/api.pm b/apps/video/zixi/restapi/custom/api.pm index 1962596e4..2a6ca1239 100644 --- a/apps/video/zixi/restapi/custom/api.pm +++ b/apps/video/zixi/restapi/custom/api.pm @@ -49,6 +49,7 @@ sub new { "password:s@" => { name => 'password' }, "proxyurl:s@" => { name => 'proxyurl' }, "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -200,6 +201,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/apps/vtom/restapi/custom/api.pm b/apps/vtom/restapi/custom/api.pm index ae61f8d69..2ac706b2d 100644 --- a/apps/vtom/restapi/custom/api.pm +++ b/apps/vtom/restapi/custom/api.pm @@ -49,6 +49,7 @@ sub new { "password:s@" => { name => 'password' }, "proxyurl:s@" => { name => 'proxyurl' }, "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -242,6 +243,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/cloud/docker/restapi/custom/api.pm b/cloud/docker/restapi/custom/api.pm index 9f2e574ac..121da9b33 100644 --- a/cloud/docker/restapi/custom/api.pm +++ b/cloud/docker/restapi/custom/api.pm @@ -54,6 +54,7 @@ sub new { "proxypac:s" => { name => 'proxypac' }, "timeout:s" => { name => 'timeout', default => 10 }, "ssl:s" => { name => 'ssl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "cert-file:s" => { name => 'cert_file' }, "key-file:s" => { name => 'key_file' }, "cacert-file:s" => { name => 'cacert_file' }, @@ -412,9 +413,9 @@ Proxy pac file (can be an url or local file) Threshold for HTTP timeout (Default: 10) -=item B<--ssl> +=item B<--ssl-opt> -Specify SSL version (example : 'sslv3', 'tlsv1'...) +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =item B<--cert-file> diff --git a/cloud/ovh/restapi/custom/api.pm b/cloud/ovh/restapi/custom/api.pm index 1928c8d4f..96fb2f862 100644 --- a/cloud/ovh/restapi/custom/api.pm +++ b/cloud/ovh/restapi/custom/api.pm @@ -48,12 +48,13 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "ovh-type:s@" => { name => 'ovh_type', }, - "ovh-application-key:s@" => { name => 'ovh_application_key', }, - "ovh-application-secret:s@" => { name => 'ovh_application_secret', }, - "ovh-consumer-key:s@" => { name => 'ovh_consumer_key', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, + "ovh-type:s@" => { name => 'ovh_type' }, + "ovh-application-key:s@" => { name => 'ovh_application_key' }, + "ovh-application-secret:s@" => { name => 'ovh_application_secret' }, + "ovh-consumer-key:s@" => { name => 'ovh_consumer_key' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -250,6 +251,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/hardware/sensors/sensormetrix/em01/web/mode/contact.pm b/hardware/sensors/sensormetrix/em01/web/mode/contact.pm index 74c26ad88..397a5b9af 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/contact.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/contact.pm @@ -46,6 +46,7 @@ sub new { "critical" => { name => 'critical' }, "closed" => { name => 'closed' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{status} = { closed => 'ok', opened => 'ok' }; $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -128,16 +129,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning if door is opened (can set --close for closed door) diff --git a/hardware/sensors/sensormetrix/em01/web/mode/flood.pm b/hardware/sensors/sensormetrix/em01/web/mode/flood.pm index 7c18c8a2f..417ab1ac2 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/flood.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/flood.pm @@ -46,6 +46,7 @@ sub new { "critical" => { name => 'critical' }, "dry" => { name => 'dry' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{status} = { dry => 'ok', wet => 'ok' }; $self->{http} = centreon::plugins::http->new(output => $self->{output}); @@ -128,16 +129,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning if flood sensor is wet (can set --dry for dry sensor) diff --git a/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm b/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm index 5d21306b5..404f765fc 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/humidity.pm @@ -45,6 +45,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -129,16 +130,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for Humidity diff --git a/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm b/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm index 2628c4282..9274f2015 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/illumination.pm @@ -45,6 +45,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -129,16 +130,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for Illumination diff --git a/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm b/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm index b009b7119..ec5267151 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/temperature.pm @@ -45,6 +45,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -128,16 +129,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for Temperature diff --git a/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm b/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm index 3341d68db..1517895f1 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/thermistor.pm @@ -45,6 +45,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -128,16 +129,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for Thermistor Temperature diff --git a/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm b/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm index 0f6428c21..7898fdc5c 100644 --- a/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm +++ b/hardware/sensors/sensormetrix/em01/web/mode/voltage.pm @@ -45,6 +45,7 @@ sub new { "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); return $self; @@ -129,16 +130,20 @@ Specify this option if you access server-status page over basic authentification =item B<--username> -Specify username for basic authentification (Mandatory if --credentials is specidied) +Specify username for basic authentification (Mandatory if --credentials is specified) =item B<--password> -Specify password for basic authentification (Mandatory if --credentials is specidied) +Specify password for basic authentification (Mandatory if --credentials is specified) =item B<--timeout> Threshold for HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--warning> Warning Threshold for Voltage diff --git a/network/cisco/prime/restapi/custom/api.pm b/network/cisco/prime/restapi/custom/api.pm index f9ea4e89e..413254f76 100644 --- a/network/cisco/prime/restapi/custom/api.pm +++ b/network/cisco/prime/restapi/custom/api.pm @@ -50,6 +50,7 @@ sub new { "password:s@" => { name => 'password' }, "proxyurl:s@" => { name => 'proxyurl' }, "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -239,6 +240,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/network/freebox/restapi/custom/api.pm b/network/freebox/restapi/custom/api.pm index 35e9b4e1f..09887bf68 100644 --- a/network/freebox/restapi/custom/api.pm +++ b/network/freebox/restapi/custom/api.pm @@ -47,9 +47,10 @@ sub new { "freebox-app-id:s@" => { name => 'freebox_app_id' }, "freebox-app-token:s@" => { name => 'freebox_app_token' }, "freebox-api-version:s@" => { name => 'freebox_api_version', }, - "proxyurl:s@" => { name => 'proxyurl' }, - "timeout:s@" => { name => 'timeout' }, - "resolution:s@" => { name => 'resolution' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "resolution:s@" => { name => 'resolution' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -293,6 +294,10 @@ Proxy URL if any. Set HTTP timeout in seconds (Default: '10'). +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--resolution> Selected data performance resolution in seconds (Default: '300'). diff --git a/notification/highsms/mode/alert.pm b/notification/highsms/mode/alert.pm index a0d0c2df2..93e960427 100644 --- a/notification/highsms/mode/alert.pm +++ b/notification/highsms/mode/alert.pm @@ -42,6 +42,8 @@ sub new { "proxypac:s" => { name => 'proxypac' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, + "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "phonenumber:s" => { name => 'phonenumber' }, "message:s" => { name => 'message' }, "sender:s" => { name => 'sender', default => 'API_HIGHSMS' }, @@ -147,6 +149,14 @@ Specify username for API authentification. Specify password for API authentification. +=item B<--timeout> + +Threshold for HTTP timeout + +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--phonenumber> Specify phone number. diff --git a/notification/slack/mode/alert.pm b/notification/slack/mode/alert.pm index cc4933752..ffe220f6d 100644 --- a/notification/slack/mode/alert.pm +++ b/notification/slack/mode/alert.pm @@ -64,7 +64,6 @@ sub new { "link-url:s" => { name => 'link_url' }, "centreon-url:s" => { name => 'centreon_url' }, "centreon-token:s" => { name => 'centreon_token' }, - "credentials" => { name => 'credentials' }, "ntlm" => { name => 'ntlm' }, "username:s" => { name => 'username' }, @@ -72,6 +71,7 @@ sub new { "proxyurl:s" => { name => 'proxyurl' }, "proxypac:s" => { name => 'proxypac' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); $self->{http} = centreon::plugins::http->new(output => $self->{output}); $self->{payload_attachment} = { fields => [] }; @@ -328,10 +328,6 @@ Proxy pac file (can be an url or local file) Specify this option if you access webpage over basic authentification -=item B<--ntlm> - -Specify this option if you access webpage over ntlm authentification (Use with --credentials option) - =item B<--username> Specify username for basic authentification (Mandatory if --credentials is specidied) @@ -344,6 +340,10 @@ Specify password for basic authentification (Mandatory if --credentials is speci Threshold for HTTP timeout (Default: 5) +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =cut diff --git a/storage/emc/vplex/restapi/custom/vplexapi.pm b/storage/emc/vplex/restapi/custom/vplexapi.pm index 10abf93fa..3d813b039 100644 --- a/storage/emc/vplex/restapi/custom/vplexapi.pm +++ b/storage/emc/vplex/restapi/custom/vplexapi.pm @@ -46,11 +46,12 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, - "vplex-username:s@" => { name => 'vplex_username', }, - "vplex-password:s@" => { name => 'vplex_password', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, + "hostname:s@" => { name => 'hostname' }, + "vplex-username:s@" => { name => 'vplex_username' }, + "vplex-password:s@" => { name => 'vplex_password' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -220,6 +221,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/storage/emc/xtremio/restapi/custom/xtremioapi.pm b/storage/emc/xtremio/restapi/custom/xtremioapi.pm index 7b6a224ed..fc0a6e19a 100644 --- a/storage/emc/xtremio/restapi/custom/xtremioapi.pm +++ b/storage/emc/xtremio/restapi/custom/xtremioapi.pm @@ -43,11 +43,12 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, - "xtremio-username:s@" => { name => 'xtremio_username', }, - "xtremio-password:s@" => { name => 'xtremio_password', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, + "hostname:s@" => { name => 'hostname' }, + "xtremio-username:s@" => { name => 'xtremio_username' }, + "xtremio-password:s@" => { name => 'xtremio_password' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "reload-cache-time:s" => { name => 'reload_cache_time' }, }); } @@ -284,6 +285,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--reload-cache-time> Time in seconds before reloading cache file (default: 180). diff --git a/storage/hp/p2000/xmlapi/custom.pm b/storage/hp/p2000/xmlapi/custom.pm index d99078ead..32dbfc444 100644 --- a/storage/hp/p2000/xmlapi/custom.pm +++ b/storage/hp/p2000/xmlapi/custom.pm @@ -47,14 +47,15 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, - "port:s@" => { name => 'port', }, - "proto:s@" => { name => 'proto', }, - "urlpath:s@" => { name => 'url_path', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "username:s@" => { name => 'username', }, - "password:s@" => { name => 'password', }, - "timeout:s@" => { name => 'timeout', }, + "hostname:s@" => { name => 'hostname' }, + "port:s@" => { name => 'port' }, + "proto:s@" => { name => 'proto' }, + "urlpath:s@" => { name => 'url_path' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "username:s@" => { name => 'username' }, + "password:s@" => { name => 'password' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'P2000 OPTIONS', once => 1); @@ -308,6 +309,10 @@ Password to connect. Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/storage/hp/storeonce/restapi/custom/api.pm b/storage/hp/storeonce/restapi/custom/api.pm index b2f05bc8f..2a2281d78 100644 --- a/storage/hp/storeonce/restapi/custom/api.pm +++ b/storage/hp/storeonce/restapi/custom/api.pm @@ -42,11 +42,12 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, - "username:s@" => { name => 'username', }, - "password:s@" => { name => 'password', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, + "hostname:s@" => { name => 'hostname' }, + "username:s@" => { name => 'username' }, + "password:s@" => { name => 'password' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -177,6 +178,10 @@ Proxy URL if any Set HTTP timeout +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =back =head1 DESCRIPTION diff --git a/storage/kaminario/restapi/custom/api.pm b/storage/kaminario/restapi/custom/api.pm index 4ff8c8def..66a78af30 100644 --- a/storage/kaminario/restapi/custom/api.pm +++ b/storage/kaminario/restapi/custom/api.pm @@ -42,12 +42,13 @@ sub new { if (!defined($options{noptions})) { $options{options}->add_options(arguments => { - "hostname:s@" => { name => 'hostname', }, - "username:s@" => { name => 'username', }, - "password:s@" => { name => 'password', }, - "proxyurl:s@" => { name => 'proxyurl', }, - "timeout:s@" => { name => 'timeout', }, - "resolution:s@" => { name => 'resolution', }, + "hostname:s@" => { name => 'hostname' }, + "username:s@" => { name => 'username' }, + "password:s@" => { name => 'password' }, + "proxyurl:s@" => { name => 'proxyurl' }, + "timeout:s@" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, + "resolution:s@" => { name => 'resolution' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -186,6 +187,10 @@ Proxy URL if any. Set HTTP timeout in seconds (Default: '10'). +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--resolution> Selected data performance resolution (Default: '5m'). diff --git a/storage/netapp/restapi/custom/restapi.pm b/storage/netapp/restapi/custom/restapi.pm index a960af820..f8bd8969f 100644 --- a/storage/netapp/restapi/custom/restapi.pm +++ b/storage/netapp/restapi/custom/restapi.pm @@ -52,6 +52,7 @@ sub new { "proxyurl:s@" => { name => 'proxyurl' }, "timeout:s@" => { name => 'timeout' }, "ssl:s@" => { name => 'ssl' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, }); } $options{options}->add_help(package => __PACKAGE__, sections => 'REST API OPTIONS', once => 1); @@ -250,9 +251,9 @@ Proxy URL if any Set HTTP timeout -=item B<--ssl> +=item B<--ssl-opt> -SSL version (Default: tlsv1) +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). =back diff --git a/storage/purestorage/restapi/custom/api.pm b/storage/purestorage/restapi/custom/api.pm index bec58581c..b81da5dc3 100644 --- a/storage/purestorage/restapi/custom/api.pm +++ b/storage/purestorage/restapi/custom/api.pm @@ -47,6 +47,7 @@ sub new { "password:s" => { name => 'password' }, "proxyurl:s" => { name => 'proxyurl' }, "timeout:s" => { name => 'timeout' }, + "ssl-opt:s@" => { name => 'ssl_opt' }, "api-path:s" => { name => 'api_path' }, }); } @@ -120,7 +121,7 @@ sub build_options_for_httplib { $self->{option_results}->{timeout} = $self->{timeout}; $self->{option_results}->{port} = 443; $self->{option_results}->{proto} = 'https'; - $self->{option_results}->{proxyurl} = $self->{proxyurl}; + $self->{option_results}->{proxyurl} = $self->{proxyurl}; } sub settings { @@ -269,6 +270,10 @@ Proxy URL if any. Set HTTP timeout in seconds (Default: '10'). +=item B<--ssl-opt> + +Set SSL Options (--ssl-opt="SSL_version => TLSv1" --ssl-opt="SSL_verify_mode => SSL_VERIFY_NONE"). + =item B<--api-path> API base url path (Default: '/api/1.11').