Merge from master (#41)

* + perl 5.10 & el6 compatibility (centreon#949) Fix centreon#945 * improve ntp mode empty ntp_hostname option (centreon#952) * Sonicwall plugin (centreon#922) * + add plugin for sonicwall Ref centreon#914 * Correcting mode formerly named 'traffic' to 'interfaces' (centreon#895) Closes centreon#895 * Enhance juniper ssg plugin (centreon#959) Closes centreon#891 * enhance juniper ssg plugin * fix key loop and hash init * List storages (centreon#946) * better response time & add posibility to know drive type * fix f5 bigip failover warning thresholds (centreon#964) Closes centreon#963 * add ssl opt harmonization (centreon#965) - Closes centreon#961 - enhance el7 perl ssl compatibility - add proxy option where missing * fix f5 bigip trunks (centreon#966) * add snmp_standard interfaces speed check (centreon#967) * refactor riverbed steelhead (centreon#971) * Closes centreon#970 * fix riverbed steelhead typo (centreon#972) * fix riverbed steelhead typo * prepare new release (centreon#973) * enhance http lib to handle hidden basic authent (centreon#974) * add basic option to mode using http lib (centreon#975) * fix f5 bigip trunks div by 0 error (centreon#977) Closes centreon#976 * enhance sonicwall plugin (centreon#978) * fix hirschmann psu wrong oid (centreon#985) * enhance quadstor vtltapeusage mode (centreon#987) * enhance quadstor vtltapeusage mode * init counter to 0 * [QOS] Cisco - Bug fix proposal (centreon#792) * Fix: Calcul total And Child * Fix: Put in 'variable' the name of the service-policy * Fix: child detection * prepare new release (centreon#998) * Cannot find physical memory informations fix centreon#994 (centreon#1000) * fix processcount perfdata output typos (centreon#1003) * refacto netapp qtreeusage and add not-kbytes option (centreon#1029) * fix qnap hardware thresholds overload (centreon#1028) * add cloudfoundry plugin (wip) (centreon#1031) * Filesystem Check (centreon#1036) * enh linux local mountpoint mode (centreon#1043) * enh selenium plugin (centreon#1039) * add silverpeak plugin (centreon#1037) * added silverpeak plugin and modes * fix type, oid name and timealarms * fix cache file name * starting peplink loadbalancer monitoring (centreon#1015) * Create memory.pm * Create cpu.pm * Create plugin.pm * fix peplink silverpeak plugins typos (centreon#1045) * fix peplink plugin typos * fix silverpeak plugin typos * report idrac installed CPUs only (centreon#1017) * Report installed CPUs only using processorDeviceTable instead of processorDeviceStatusTable * Report installed CPUs only, adapt var names * add database-size mode (centreon#870) * fix postgres databasesize mode (centreon#1046) * fix postgres databasesize mode, missing empty selection (centreon#1047) * fix arista memory output (centreon#1048) * enh h3c hardware cache (centreon#1049) * fix fortigate devicestatus help (centreon#1050) * fix dell fastpath temperature (centreon#1051) * fix hirschmann memory (centreon#1052) * fix tomcat web sessions (centreon#1053) * enh paloalto cluster output (centreon#1054) * convert blocked processes counters (centreon#938) * Convert database::mssql::mode::blockedprocesses to the counters library * Using fetchrow_hashref instead of fetchall_arrayref according to @Sims24 recommendation * Rationalizing a bit the output/long output/debug output * enh mssql blockedprocesses (centreon#1055) * adding new local plugin to os::hpux with two modes regarding disks (storage, inodes) (centreon#955) * adding new 'inodes' mode to os::aix::local::plugin (centreon#956) * enh aix local inodes (centreon#1056) * enh aix local inodes, wrong parsing (centreon#1057) * enh aix local storage inodes (centreon#1058) * correct RADIUS help (centreon#1060) * fix mssql blocked processes trim (centreon#1066) * fix mssql transactions case (centreon#1067) * adding Centos Upgrade Check (centreon#1034) * enh linux local pending updates (centreon#1068) * using a file a JSON source did not work (wrong file handler) (centreon#979) * re-calculating virtual memory for windows machines (centreon#929) * enh windows snmp swap (centreon#1069) * fix kaspersky snmp deployment devision by zero (centreon#1070) * enh windows snmp swap, help (centreon#1072) * enh windows snmp swap, physical memory name (centreon#1073) * fix netapp restapi volumeusage typo (centreon#1074) * enh sql sqlstring for dual tables (centreon#1075) * add slack plugin (centreon#1076)
Sims24 · Aug 16, 2018 · a502243 · a502243
1 parent 8f3d5ae
commit a502243
Show file tree

Hide file tree

Showing 141 changed files with 7,621 additions and 1,053 deletions.
diff --git a/apps/antivirus/kaspersky/snmp/mode/deployment.pm b/apps/antivirus/kaspersky/snmp/mode/deployment.pm
@@ -97,7 +97,7 @@ sub custom_progress_calc {
 
     $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_hostsInGroups'};
     $self->{result_values}->{installed} = $options{new_datas}->{$self->{instance} . '_hostsWithAntivirus'};
-    $self->{result_values}->{prct_installed} = $self->{result_values}->{installed} * 100 / $self->{result_values}->{total};
+    $self->{result_values}->{prct_installed} = ($self->{result_values}->{total} != 0) ? $self->{result_values}->{installed} * 100 / $self->{result_values}->{total} : 0;
 
     return 0;
 }

diff --git a/apps/apache/serverstatus/mode/cpuload.pm b/apps/apache/serverstatus/mode/cpuload.pm
@@ -39,13 +39,15 @@ sub new {
             "proto:s"           => { name => 'proto' },
             "urlpath:s"         => { name => 'url_path', default => "/server-status/?auto" },
             "credentials"       => { name => 'credentials' },
+            "basic"             => { name => 'basic' },
             "username:s"        => { name => 'username' },
             "password:s"        => { name => 'password' },
             "proxyurl:s"        => { name => 'proxyurl' },
             "header:s@"         => { name => 'header' },
             "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;
@@ -130,20 +132,32 @@ Set path to get server-status page in auto mode (Default: '/server-status/?auto'
 
 =item B<--credentials>
 
-Specify this option if you access server-status page over basic authentification
+Specify this option if you access server-status page with authentication
 
 =item B<--username>
 
-Specify username for basic authentification (Mandatory if --credentials is specidied)
+Specify username for authentication (Mandatory if --credentials is specified)
 
 =item B<--password>
 
-Specify password for basic authentification (Mandatory if --credentials is specidied)
+Specify password for authentication (Mandatory if --credentials is specified)
+
+=item B<--basic>
+
+Specify this option if you access server-status page over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
+
+Specify this option if you access server-status page over hidden basic authentication or you'll get a '404 NOT FOUND' error.
+
+(Use with --credentials)
 
 =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
@@ -40,6 +40,7 @@ sub new {
             "proto:s"           => { name => 'proto' },
             "urlpath:s"         => { name => 'url_path', default => "/server-status/?auto" },
             "credentials"       => { name => 'credentials' },
+            "basic"             => { name => 'basic' },
             "username:s"        => { name => 'username' },
             "password:s"        => { name => 'password' },
             "proxyurl:s"        => { name => 'proxyurl' },
@@ -51,6 +52,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);
@@ -219,20 +221,32 @@ Set path to get server-status page in auto mode (Default: '/server-status/?auto'
 
 =item B<--credentials>
 
-Specify this option if you access server-status page over basic authentification
+Specify this option if you access server-status page with authentication
 
 =item B<--username>
 
-Specify username for basic authentification (Mandatory if --credentials is specidied)
+Specify username for authentication (Mandatory if --credentials is specified)
 
 =item B<--password>
 
-Specify password for basic authentification (Mandatory if --credentials is specidied)
+Specify password for authentication (Mandatory if --credentials is specified)
+
+=item B<--basic>
+
+Specify this option if you access server-status page over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
+
+Specify this option if you access server-status page over hidden basic authentication or you'll get a '404 NOT FOUND' error.
+
+(Use with --credentials)
 
 =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
@@ -40,13 +40,15 @@ sub new {
          "proto:s"      => { name => 'proto' },
          "urlpath:s"    => { name => 'url_path', default => "/server-status/?auto" },
          "credentials"  => { name => 'credentials' },
+         "basic"        => { name => 'basic' },
          "username:s"   => { name => 'username' },
          "password:s"   => { name => 'password' },
          "proxyurl:s"   => { name => 'proxyurl' },
          "header:s@"    => { name => 'header' },
          "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' },
@@ -122,15 +124,23 @@ Set path to get server-status page in auto mode (Default: '/server-status/?auto'
 
 =item B<--credentials>
 
-Specify this option if you access server-status page over basic authentification
+Specify this option if you access server-status page with authentication
 
 =item B<--username>
 
-Specify username for basic authentification (Mandatory if --credentials is specidied)
+Specify username for authentication (Mandatory if --credentials is specified)
 
 =item B<--password>
 
-Specify password for basic authentification (Mandatory if --credentials is specidied)
+Specify password for authentication (Mandatory if --credentials is specified)
+
+=item B<--basic>
+
+Specify this option if you access server-status page over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
+
+Specify this option if you access server-status page over hidden basic authentication or you'll get a '404 NOT FOUND' error.
+
+(Use with --credentials)
 
 =item B<--proxyurl>
 
@@ -140,6 +150,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
@@ -201,11 +201,13 @@ sub new {
                                 "proto:s"       => { name => 'proto' },
                                 "urlpath:s"     => { name => 'url_path', default => "/server-status/?auto" },
                                 "credentials"   => { name => 'credentials' },
+                                "basic"         => { name => 'basic' },
                                 "username:s"    => { name => 'username' },
                                 "password:s"    => { name => 'password' },
                                 "proxyurl:s"    => { name => 'proxyurl' },
                                 "header:s@"     => { name => 'header' },
                                 "timeout:s"     => { name => 'timeout' },
+                                "ssl-opt:s@"    => { name => 'ssl_opt' },
                                 "units:s"       => { name => 'units', default => '%' },
                                 });
 
@@ -343,20 +345,32 @@ Set path to get server-status page in auto mode (Default: '/server-status/?auto'
 
 =item B<--credentials>
 
-Specify this option if you access server-status page over basic authentification
+Specify this option if you access server-status page with authentication
 
 =item B<--username>
 
-Specify username for basic authentification (Mandatory if --credentials is specidied)
+Specify username for authentication (Mandatory if --credentials is specified)
 
 =item B<--password>
 
-Specify password for basic authentification (Mandatory if --credentials is specidied)
+Specify password for authentication (Mandatory if --credentials is specified)
+
+=item B<--basic>
+
+Specify this option if you access server-status page over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
+
+Specify this option if you access server-status page over hidden basic authentication or you'll get a '404 NOT FOUND' error.
+
+(Use with --credentials)
 
 =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
@@ -39,13 +39,15 @@ sub new {
             "proto:s"       => { name => 'proto' },
             "urlpath:s"     => { name => 'url_path', default => "/server-status/?auto" },
             "credentials"   => { name => 'credentials' },
+            "basic"         => { name => 'basic' },
             "username:s"    => { name => 'username' },
             "password:s"    => { name => 'password' },
             "proxyurl:s"    => { name => 'proxyurl' },
             "header:s@"     => { name => 'header' },
             "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,20 +136,32 @@ Set path to get server-status page in auto mode (Default: '/server-status/?auto'
 
 =item B<--credentials>
 
-Specify this option if you access server-status page over basic authentification
+Specify this option if you access server-status page with authentication
 
 =item B<--username>
 
-Specify username for basic authentification (Mandatory if --credentials is specidied)
+Specify username for authentication (Mandatory if --credentials is specified)
 
 =item B<--password>
 
-Specify password for basic authentification (Mandatory if --credentials is specidied)
+Specify password for authentication (Mandatory if --credentials is specified)
+
+=item B<--basic>
+
+Specify this option if you access server-status page over basic authentication and don't want a '401 UNAUTHORIZED' error to be logged on your webserver.
+
+Specify this option if you access server-status page over hidden basic authentication or you'll get a '404 NOT FOUND' error.
+
+(Use with --credentials)
 
 =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/backup/quadstor/local/mode/vtltapeusage.pm b/apps/backup/quadstor/local/mode/vtltapeusage.pm
@@ -41,7 +41,7 @@ sub custom_status_threshold {
             eval "$instance_mode->{option_results}->{critical_status}") {
             $status = 'critical';
         } elsif (defined($instance_mode->{option_results}->{warning_status}) && $instance_mode->{option_results}->{warning_status} ne '' &&
-                 eval "$instance_mode->{option_results}->{warning_status}") {
+            eval "$instance_mode->{option_results}->{warning_status}") {
             $status = 'warning';
         }
     };
@@ -136,8 +136,21 @@ sub set_counters {
     my ($self, %options) = @_;
 
     $self->{maps_counters_type} = [
+        { name => 'global', type => 0 },
         { name => 'tape', type => 1, cb_prefix_output => 'prefix_tape_output', message_multiple => 'All tapes are ok' }
     ];
+
+    $self->{maps_counters}->{global} = [
+        { label => 'count', set => {
+                key_values => [ { name => 'count' } ],
+                output_template => 'Number of tapes : %s',
+                perfdatas => [
+                    { label => 'count', value => 'count_absolute', template => '%s', 
+                      unit => 'tapes', min => 0 },
+                ],
+            }
+        },
+    ];
 
     $self->{maps_counters}->{tape} = [
         { label => 'status', threshold => 0, set => {
@@ -227,7 +240,8 @@ sub manage_selection {
                                                     sudo => $self->{option_results}->{sudo},
                                                     command => $self->{option_results}->{command},
                                                     command_path => $self->{option_results}->{command_path},
-                                                    command_options => $self->{option_results}->{command_options});    
+                                                    command_options => $self->{option_results}->{command_options});
+    $self->{global}->{count} = 0;
     $self->{tape} = {};
     #Pool    Label    Element Address Vtype       WORM Size  Used% Status
     #Default 701862L2 Unknown 0       LTO 2 200GB No   200   99    Vaulted
@@ -257,6 +271,7 @@ sub manage_selection {
             used_prct => $used_prct,
             status => $status,
         };
+        $self->{global}->{count}++;
     }
 
     if (scalar(keys %{$self->{tape}}) == 0) {
@@ -345,12 +360,12 @@ Can used special variables like: %{status}, %{display}
 =item B<--warning-*>
 
 Threshold warning.
-Can be: 'usage'.
+Can be: 'count', 'usage'.
 
 =item B<--critical-*>
 
 Threshold critical.
-Can be: 'usage'.
+Can be: 'count', 'usage'.
 
 =back
 

diff --git 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>