Add optional parameter plugindir (Directory containing kibana plugins)

lib/puppet/functions/kibana/hash2yaml.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# @summary Converts a puppet hash to YAML string.
+Puppet::Functions.create_function(:'kibana::hash2yaml') do
+  # @param input The hash to be converted to YAML
+  # @param options A hash of options to control YAML file format
+  # @return [String] A YAML formatted string
+  # @example Call the function with the $input hash
+  #   kibana::hash2yaml($input)
+  dispatch :yaml do
+    param 'Hash', :input
+    optional_param 'Hash', :options
+  end
+
+  require 'yaml'
+
+  def yaml(input, options = {})
+    settings = {
+      'header' => '# File managed by Puppet.'
+    }
+
+    settings.merge!(options)
+
+    if settings['header'].to_s.empty?
+      input.to_yaml
+    else
+      "#{settings['header']}\n#{input.to_yaml}"
+    end
+  end
+end

manifests/config.pp

@@ -9,13 +9,21 @@
     'absent' => $kibana::ensure,
     default  => 'file',
   }
-  $config = $kibana::config
 
   file { '/etc/kibana/kibana.yml':
     ensure  => $_ensure,
-    content => template("${module_name}/etc/kibana/kibana.yml.erb"),
+    content => Sensitive(kibana::hash2yaml($kibana::config)),
     owner   => $kibana::kibana_user,
     group   => $kibana::kibana_group,
     mode    => '0660',
   }
+
+  if $kibana::plugindir {
+    file { $kibana::plugindir:
+      ensure => 'directory',
+      owner  => $kibana::kibana_user,
+      group  => $kibana::kibana_group,
+      mode   => '0755',
+    }
+  }
 }

manifests/init.pp

@@ -24,6 +24,9 @@
 # @param status Service status
 # @param service_name Service name
 # @param package_name Package name
+# @param plugindir
+#   Directory containing kibana plugins.
+#   Use this setting if you want to manage the directory
 # @param kibana_user owner of kibana.yml
 # @param kibana_group group of kibana.yml
 #
@@ -36,6 +39,7 @@
   Boolean $oss,
   Optional[String] $package_source,
   Kibana::Status $status,
+  Optional[Stdlib::Absolutepath] $plugindir = undef,
   String[1] $service_name = 'kibana',
   String[1] $package_name = 'kibana',
   String[1] $kibana_user = 'kibana',

spec/classes/kibana_spec.rb

@@ -41,10 +41,10 @@
                   group: 'kibana',
                   mode: '0660'
                 ).
-                with_content(%r{
-                # Managed by Puppet..
-                ---.
-                }xm)
+                with_content(sensitive(%r{
+                  # Managed by Puppet..
+                  ---.
+                  }xm))
             end
 
             it 'enables and starts the service' do
@@ -246,6 +246,12 @@
                 with_name('kibana-custom')
             }
           end
+
+          describe 'kibana_plugindir' do
+            let(:params) { { plugindir: '/usr/local/kibana/plugins' } }
+
+            it { is_expected.to contain_file('/usr/local/kibana/plugins').with(mode: '0755') }
+          end
         end
       end
     end

spec/functions/kibana_hash2yaml.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+describe 'kibana::hash2yaml' do
+  context 'with header' do
+    it do
+      is_expected.to run.with_params({ cle: 1 }, { header: '# HEADER' }).and_return('# HEADER\ncle: 1')
+    end
+  end
+
+  context 'without header' do
+    it do
+      is_expected.to run.with_params({ cle: 1 }).and_return('# File managed by Puppet.\ncle: 1')
+    end
+  end
+end