Merge pull request #324 from t-8ch/mysql_innodb

Add innodbstats and slavenotifications for mysql
xbezdick · Sep 4, 2015 · e4e906e · e4e906e
2 parents 662e6e7 + d7386ae
commit e4e906e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/manifests/plugin/mysql/database.pp b/manifests/plugin/mysql/database.pp
@@ -1,14 +1,16 @@
 #
 define collectd::plugin::mysql::database (
-  $ensure      = 'present',
-  $database    = $name,
-  $host        = 'UNSET',
-  $username    = 'UNSET',
-  $password    = 'UNSET',
-  $port        = '3306',
-  $masterstats = false,
-  $slavestats  = false,
-  $socket      = undef,
+  $ensure             = 'present',
+  $database           = $name,
+  $host               = 'UNSET',
+  $username           = 'UNSET',
+  $password           = 'UNSET',
+  $port               = '3306',
+  $masterstats        = false,
+  $slavestats         = false,
+  $socket             = undef,
+  $innodbstats        = undef,
+  $slavenotifications = undef,
 ) {
   include collectd::params
   include collectd::plugin::mysql
@@ -21,6 +23,14 @@
     validate_string($socket)
   }
 
+  if $innodbstats != undef {
+    validate_bool($innodbstats)
+  }
+
+  if $slavenotifications != undef {
+    validate_bool($slavenotifications)
+  }
+
   if ($masterstats == true and $slavestats == true) {
     fail('master and slave statistics are mutually exclusive.')
   }

diff --git a/templates/mysql-database.conf.erb b/templates/mysql-database.conf.erb
@@ -14,6 +14,12 @@
     SlaveStats <%= @slavestats %>
 <%- if @socket -%>
     Socket "<%= @socket %>"
+<%- end -%>
+<%- if not @innodbstats.nil? -%>
+    InnodbStats <%= @innodbstats %>
+<%- end -%>
+<%- if not @slavenotifications.nil? -%>
+    SlaveNotifications <%= @slavenotifications %>
 <%- end -%>
   </Database>
 </Plugin>