Merge pull request #988 from kuleuven/master

Make port and host optional for mysql plugin

Author: bastelfreak

manifests/plugin/mysql/database.pp

@@ -2,8 +2,8 @@
 define collectd::plugin::mysql::database (
   Enum['present', 'absent'] $ensure    = 'present',
   String $database                     = $name,
-  Stdlib::Host $host                   = 'localhost',
-  Stdlib::Port $port                   = 3306,
+  Optional[Stdlib::Host] $host         = undef,
+  Optional[Stdlib::Port] $port         = undef,
   Boolean $masterstats                 = false,
   Boolean $slavestats                  = false,
   Optional[String[1]] $username        = undef,

spec/classes/collectd_plugin_mysql_database_spec.rb

@@ -75,7 +75,7 @@
         end
       end
 
-      context 'default options' do
+      context 'specify host and port' do
         let :title do
           'dbname'
         end
@@ -84,6 +84,13 @@
           facts.merge(collectd_version: '5.6')
         end
 
+        let :params do
+          {
+            'host' => 'localhost',
+            'port' => 3306,
+          }
+        end
+
         it 'creates an mysql database' do
           content_database_file = <<EOS
 # Generated by Puppet
@@ -96,6 +103,36 @@
     SlaveStats false
   </Database>
 </Plugin>
+EOS
+          is_expected.to compile.with_all_deps
+          is_expected.to contain_class('collectd')
+          is_expected.to contain_class('collectd::plugin::mysql')
+          is_expected.to contain_file('dbname.conf').with(
+            content: content_database_file,
+            path: "#{options[:plugin_conf_dir]}/mysql-dbname.conf"
+          )
+        end
+      end
+
+      context 'default options' do
+        let :title do
+          'dbname'
+        end
+
+        let :facts do
+          facts.merge(collectd_version: '5.6')
+        end
+
+        it 'creates an mysql database' do
+          content_database_file = <<EOS
+# Generated by Puppet
+
+<Plugin mysql>
+  <Database "dbname">
+    MasterStats false
+    SlaveStats false
+  </Database>
+</Plugin>
 EOS
           is_expected.to compile.with_all_deps
           is_expected.to contain_class('collectd')

templates/mysql-database.conf.erb

@@ -2,17 +2,21 @@
 
 <Plugin mysql>
   <Database "<%= @database %>">
+<%- if @host -%>
     Host "<%= @host %>"
+<%- end -%>
 <%- if @username -%>
     User "<%= @username %>"
 <%- end -%>
 <%- if @password -%>
     Password "<%= @password %>"
 <%- end -%>
+<%- if @port -%>
 <% if scope.function_versioncmp([scope.lookupvar('collectd::collectd_version_real'), '5.0']) >= 0 -%>
     Port "<%= @port %>"
 <% else -%>
     Port <%= @port %>
+<%- end -%>
 <%- end -%>
     MasterStats <%= @masterstats %>
     SlaveStats <%= @slavestats %>