Merge lp:~mischa-ter-smitten/percona-monitoring-plugins/percona-monitoring-plugins into lp:percona-monitoring-plugins/1.0

[Mischa ter Smitten]

I added a MySQL SSL CA file option to make monitoring over SSL more configurable (and let it work for me).

[Roman Vynar (roman-vynar)]

review: Approve

[Mischa ter Smitten (mischa-ter-smitten)]

Thanks

=== modified file 'cacti/scripts/ss_get_mysql_stats.php'
--- cacti/scripts/ss_get_mysql_stats.php	2013-07-16 08:09:44 +0000
+++ cacti/scripts/ss_get_mysql_stats.php	2013-08-07 22:21:26 +0000
@@ -33,6 +33,7 @@
 $mysql_ssl  = FALSE;   # Whether to use SSL to connect to MySQL.
 $mysql_ssl_key  = '/etc/pki/tls/certs/mysql/client-key.pem';
 $mysql_ssl_cert = '/etc/pki/tls/certs/mysql/client-cert.pem';
+$mysql_ssl_ca = '/etc/pki/tls/certs/mysql/ca.pem';
 
 $heartbeat  = '';      # db.tbl if you use pt-heartbeat from Percona Toolkit.
 $cache_dir  = '/tmp';  # If set, this uses caching to avoid multiple calls.
@@ -245,7 +246,8 @@
 function ss_get_mysql_stats( $options ) {
    # Process connection options and connect to MySQL.
    global $debug, $mysql_user, $mysql_pass, $heartbeat, $cache_dir, $poll_time,
-          $chk_options, $mysql_port, $mysql_ssl, $mysql_ssl_key, $mysql_ssl_cert;
+          $chk_options, $mysql_port, $mysql_ssl, $mysql_ssl_key, $mysql_ssl_cert, 
+          $mysql_ssl_ca;
 
    # Connect to MySQL.
    $user = isset($options['user']) ? $options['user'] : $mysql_user;
@@ -263,7 +265,7 @@
    }
    if ( $mysql_ssl || (isset($options['mysql_ssl']) && $options['mysql_ssl']) ) {
       $conn = mysqli_init();
-      mysqli_ssl_set($conn, $mysql_ssl_key, $mysql_ssl_cert, NULL, NULL, NULL);
+      mysqli_ssl_set($conn, $mysql_ssl_key, $mysql_ssl_cert, $mysql_ssl_ca, NULL, NULL);
       mysqli_real_connect($conn, $host_str, $user, $pass);
    }
    else {