prepare 0.5.5

added boolean param for enabling fluentd::conf_dir

.travis.yml

@@ -6,12 +6,16 @@ script: bundle exec rake validate && bundle exec rake lint && bundle exec rake s
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.1.10
+    env: PUPPET_VERSION="~> 3.0"
+  - rvm: 2.1.10
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.2.7
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.3.4
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.4.1
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   slack:
     secure: WVBx/OJqLpX9WXyiejEdnOcAf+5ShWJ2gcyeBCX032iKzPphcdPKqH+jnlFaKjqQCZARbRqzlj/if3FZWAlhWtTrWrcY545dRHcsaGvJ/nMtdHlBUuwUNHipSn+RTXtorsYz0efhJMPye2LMl0HgAp3rEs70XUt8rZOwdedLGVgfWRwM+KixhSf8P08v9QjNRNdhWII37KFRdqv/NHryNlVKsTLH6fQOyIvok3vrTvMR8rWMRETXv6JLpCJ3FfOrxo53fW7q+GlXXuVcQ2OGlgxm3eke6q2aXZAqczeB5CSlWgUEA5T3rQ//WI3enwTayRajV/9O26HZvASjSTnDRiSSv1itYqg1Uy6kuJy5ANpBizOyWY6/QTM5Rw00AXvaY9ur0EmyNe5vLNHyTxzdr4R+rXjE07yCDvWM9RGbu+4BipP+mAoJTkuCIP54FWYn1qOJnC8DYywD/+wniCNLbp6yMgbG/aC6H5RmuSy+3xRoEbwvyXKUgA+4gL3I3aAIvidBG+yazRBFvRCn4pUJdTEc4Cpu0jhQWXWyZSE66HNPKyIOXl9JPTzul08MDo9OaqBt+K3yeMVA8EPr196mWLwerF+dExQ2PJhUu/7MAiOgFrIr4/d05iKhj4ivLYBRNN317s2NVo8qyfhPHlfv6PyzhllC/qjClQ2rLOemVhg=

CHANGELOG.md

@@ -1,4 +1,36 @@
 # Changelog
+## 0.5.5
+* Added `conf_dir_manage` parameter (Default: false)
+  * Exclusively handle config files into fluentd::conf_dir. Other files not created by puppet, will be deleted
+
+## 0.5.4
+* fixed templates/filter.erb
+* fixed removing of old GPG key for yum repos
+
+## 0.5.3
+* update treasure data repo gpg key
+
+## 0.5.2
+* Correct the docs related to the service_enable parameter
+
+## 0.5.1
+* Allow to install specific version of fluent gem plugins
+
+## 0.5.0
+* Added support for Debian 6, 7, 8
+* Added support for CentOS 6, 7
+* Added `::fluentd::user`, which manages the td-agent user
+* Added parameter `user_manage`
+* Added parameter `user_name`
+* Added parameter `user_group`
+* Added parameter `user_groups`
+* Added acceptance tests
+* `::fluentd::repo::apt::location default` changed to
+  `http://packages.treasuredata.com/2/${::lsbdistid}/${::lsbdistcodename}`
+* Small fixes and improvements
+
+## 0.4.0
+* Allows definition of multiple directives in matching rules
 
 ## 0.3.0
 * Increased apt dependency

Gemfile

@@ -1,7 +1,21 @@
 source 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 0.8.2'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
+gem 'beaker-puppet_install_helper'
+gem 'metadata-json-lint'
+
+beakerrspec = '> 0'
+platforms [:ruby_19, :ruby_21] do
+  beakerrspec = '<= 5.6.0'
+end
+gem 'beaker-rspec', beakerrspec
+
+platforms :ruby_19 do
+  gem 'public_suffix', '< 1.5.0', :platforms => :ruby_19
+  gem 'nokogiri', '< 1.7.0', :platforms => :ruby_19
+  gem 'mime-types', '< 3.0', :platforms => :ruby_19
+end

README.md

@@ -11,9 +11,11 @@
 1. [Setup - The basics of getting started with fluentd](#setup)
 1. [Usage](#usage)
   * [Configuration](#configuration)
+    * [Parameters](#parameters)
     * [Source](#source)
     * [Filter](#filter)
     * [Match](#match)
+    * [Match Store](#match-store)
   * [Plugin Installation](#plugin-installation)
   * [Requirements](#requirements)
 1. [Limitations - OS compatibility, etc.](#limitations)
@@ -40,6 +42,67 @@ include '::fluentd'
 
 ### Configuration
 
+#### Parameters
+
+`repo_manage`
+
+  Include repository to install recent fluentd (td-agent) from.
+  **Default:** 'true'
+ 
+`package_ensure`
+
+  Package ensure.
+  **Default:** 'installed'
+ 
+`package_name`
+
+  Package name.
+  **Default:** 'td-agent'
+ 
+`package_install_options`
+
+  Package install options.
+  **Default:** '[]'
+ 
+`service_manage`
+
+  Defines if the service should be managed by puppet.
+  **Default:** 'true'
+ 
+`service_name`
+
+  Name of the service.
+  **Default:** 'td-agent'
+ 
+`service_ensure`
+
+  Service ensure.
+  **Default:** 'running'
+ 
+`service_enable`
+
+  Defines if the service should be enabled.
+  **Default:** 'true'
+ 
+`user_manage`
+
+  Defines if the user should be manage, which will add the user
+  to groups defined in `user_groups`.
+  For example to be able to view the /var/log directory with group adm
+  **Default:** 'true'
+
+`user_name`
+
+  **Default:** 'td-agent'
+ 
+`user_group`
+
+  **Default:** 'td-agent'
+ 
+`user_groups`
+
+  **Default:** '["adm"]'
+
 #### Source
 ```puppet
 ::fluentd::source { 'test':
@@ -97,9 +160,9 @@ include '::fluentd'
     'shared_key'     => 'my_shared_key',
     'self_hostname'  => 'instance.test.com',
     'ca_cert_path'   => '/path/to/ca.cert',
-    'servers'        => {
-      'host' => 'test.server.com'
-    }
+    'server'        => [{
+      'host' => 'test.server.com',
+    }]
   }
 }
 ```
@@ -113,9 +176,48 @@ include '::fluentd'
   shared_key my_shared_key
   self_hostname instance.test.com
   ca_cert_path /path/to/ca.cert
-  <servers>
+  <server>
     host test.server.com
-  </servers>
+  </server>
+</match>
+```
+### Match Store
+```puppet
+::fluentd::match { 'test':
+  priority => 30,
+  pattern  => '*.test',
+  config   => {
+    'type'  => 'copy',
+    'store' => [
+      {
+        'type'           => 'elasticsearch',
+        'logstashformat' => true,
+        'hosts'          => '172.20.10.17:9200',
+        'flush_interval' => '30s',
+      },
+      {
+        'type' => 'file',
+        'path' => '/tmp/td-agent-debug.log',
+      }
+    ]
+  }
+}
+```
+**creates:**
+```
+/etc/td-agent/conf.d/30-match-test.conf
+<match *.test>
+  type copy
+  <store>
+    type elasticsearch
+    logstash_format true
+    hosts 172.20.10.17:9200
+    flush_interval 30s
+  </store>
+  <store>
+    type file
+    path /tmp/crs
+  </store>
 </match>
 ```
 
@@ -126,7 +228,8 @@ This module gives you the possibility to install plugins as gem or files.
 **gem installation**
 ```puppet
 ::fluentd::plugin { 'fluent-plugin-elasticsearch':
-  type => 'gem'
+  type => 'gem',
+  ensure => '0.1.3'
 }
 ```
 **file installation**
@@ -162,6 +265,13 @@ To run the tests install the ruby dependencies with `bundler` and execute
 bundle install --path vendor/bundle
 bundle exec rake spec
 bundle exec rake lint
+bundle exec rake beaker BEAKER_set=ubuntu-server-1204-x64
+bundle exec rake beaker BEAKER_set=ubuntu-server-1404-x64
+bundle exec rake beaker BEAKER_set=debian-60-x64
+bundle exec rake beaker BEAKER_set=debian-78-x64
+bundle exec rake beaker BEAKER_set=debian-82-x64
+bundle exec rake beaker BEAKER_set=centos-66-x64
+bundle exec rake beaker BEAKER_set=centos-70-x64
 ```
 
 ## License

Rakefile

@@ -1,7 +1,22 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+PuppetLint.configuration.log_format = '%{path}:%{line}:%{check}:%{KIND}:%{message}'
+PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.send('relative')
+PuppetLint.configuration.send('disable_140chars')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_documentation')
+PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+
+exclude_paths = %w(
+  pkg/**/*
+  vendor/**/*
+  .vendor/**/*
+  spec/**/*
+)
+PuppetLint.configuration.ignore_paths = exclude_paths
+PuppetSyntax.exclude_paths = exclude_paths
 
 desc "Validate manifests, templates, and ruby files"
 task :validate do

examples/match.pp

@@ -9,8 +9,27 @@
     'shared_key'     => 'my_shared_key',
     'self_hostname'  => 'instance.test.com',
     'ca_cert_path'   => '/path/to/ca.cert',
-    'servers'        => {
-      'host' => 'test.server.com'
+    'server'         => [{
+      'host' => 'test.server.com',
+    }]
   }
 }
+
+::fluentd::match { 'test':
+  priority => 30,
+  pattern  => '*.test',
+  config   => {
+    'type'  => 'copy',
+    'store' => [{
+      'type'           => 'elasticsearch',
+      'logstashformat' => true,
+      'hosts'          => '172.20.10.17:9200',
+      'flush_interval' => '30s',
+      },
+      {
+      'type' => 'file',
+      'path' => '/tmp/td-agent-debug.log',
+      }
+    ]
+  }
 }

examples/plugin.pp

@@ -5,5 +5,5 @@
 # file installation
 ::fluentd::plugin { 'fluent-plugin-elasticsearch':
   type   => 'file',
-  source => 'puppet:///path/to/plugin'
+  source => 'puppet:///modules/path/to/plugin'
 }

examples/test.pp

@@ -0,0 +1,10 @@
+# This file is use for the beaker tests.
+
+# basic installation
+include '::fluentd'
+
+# install a gem plugin
+::fluentd::plugin { 'fluent-plugin-elasticsearch':
+  type    => 'gem',
+  require => Class['::fluentd']
+}

lib/puppet/provider/package/fluentd-gem.rb

@@ -8,6 +8,7 @@ Puppet::Type.type(:package).provide :fluentd_gem, :parent => :gem do
     not a valid URL, it will be interpreted as the path to a local gem file.  If
     source is not present at all, the gem will be installed from the default gem
     repositories."
+  confine :exists => "/opt/td-agent/embedded/bin/gem"
 
   has_feature :versionable, :install_options
 

manifests/config.pp

@@ -12,6 +12,8 @@ class fluentd::config inherits fluentd {
 
   file { $::fluentd::conf_dir:
     ensure  => 'directory',
+    recurse => $::fluentd::params::conf_dir_manage,
+    purge   => $::fluentd::params::conf_dir_manage,
     owner   => $::fluentd::user_name,
     group   => $::fluentd::user_group,
     mode    => '0750',

manifests/config/file.pp

@@ -17,8 +17,10 @@ define fluentd::config::file (
 
   # clean up to ensure priority changes take effect
   exec { "apply priority change for ${base_name}":
-    command => "rm ${::fluentd::conf_dir}/*-${base_name}",
-    onlyif  => "ls ${::fluentd::conf_dir}/*-${base_name} | grep -v ${config_name}",
+    path    => '/bin:/usr/bin:/usr/local/bin',
+    cwd     => $::fluentd::conf_dir,
+    command => "rm *-${base_name}",
+    onlyif  => "ls *-${base_name} | grep -v ${config_name}",
     before  => File[$config_path],
     notify  => Class['Fluentd::Service'],
   }

manifests/init.pp

@@ -5,9 +5,12 @@
 #
 # Parameters
 # ----------
-# [*manage_repo*]
+# [*repo_manage*]
 #   Include repository to install recent fluentd (td-agent) from
 #   Default: 'true'
+# [*conf_dir_manage*]
+#   Exclusively handle config files into fluentd::conf_dir. Other files not created by puppet, will be deleted
+#   Default: 'false'
 # [*package_ensure*]
 #   Package ensure
 #   Default: 'installed'
@@ -26,8 +29,20 @@
 # [*service_ensure*]
 #   Service ensure
 #   Default: 'running'
-# [*service_enabled*]
-#   Defines if the service should be enabled, defaults to 'true'
+# [*service_enable*]
+#   Defines if the service should be enabled
+#   Default: 'true'
+# [*user_manage*]
+#   Defines if the user should be manage, which will add the user
+#   to groups defined in $user_groups.
+#   For example to be able to view the /var/log directory with group adm
+#   Default: 'true'
+# [*user_name*]
+#   Default: 'td-agent'
+# [*user_group*]
+#   Default: 'td-agent'
+# [*user_groups*]
+#   Default: '["adm"]'
 #
 # Examples
 # --------
@@ -41,7 +56,7 @@
 # Copyright 2015 wywy GmbH, unless otherwise noted.
 #
 class fluentd (
-  $manage_repo             = $::fluentd::params::manage_repo,
+  $repo_manage             = $::fluentd::params::repo_manage,
   $package_ensure          = $::fluentd::params::package_ensure,
   $package_name            = $::fluentd::params::package_name,
   $package_install_options = $::fluentd::params::package_install_options,
@@ -51,13 +66,16 @@ class fluentd (
   $service_enable          = $::fluentd::params::service_enable,
   $config_path             = $::fluentd::params::config_path,
   $conf_dir                = $::fluentd::params::conf_dir,
+  $conf_dir_manage         = $::fluentd::params::conf_dir_manage,
   $config_file             = $::fluentd::params::config_file,
+  $user_manage             = $::fluentd::params::user_manage,
   $user_name               = $::fluentd::params::user_name,
   $user_group              = $::fluentd::params::user_group,
+  $user_groups             = $::fluentd::params::user_groups,
 ) inherits fluentd::params {
 
   # parameter validation
-  validate_bool($manage_repo)
+  validate_bool($repo_manage)
   validate_string($package_ensure)
   validate_string($package_name)
   validate_array($package_install_options)
@@ -72,12 +90,14 @@ class fluentd (
   # class calls
   include '::fluentd::repo'
   include '::fluentd::install'
+  include '::fluentd::user'
   include '::fluentd::config'
   include '::fluentd::service'
 
   # dependencies
-  Class['::Fluentd::Repo']    ->
-  Class['::Fluentd::Install'] ->
-  Class['::Fluentd::Config']  ->
-  Class['::Fluentd::Service']
+  Class['::Fluentd::Repo']
+  -> Class['::Fluentd::Install']
+  -> Class['::Fluentd::User']
+  -> Class['::Fluentd::Config']
+  -> Class['::Fluentd::Service']
 }

manifests/match.pp

@@ -31,9 +31,9 @@
 #         'shared_key'     => 'my_shared_key',
 #         'self_hostname'  => 'instance.test.com',
 #         'ca_cert_path'   => '/path/to/ca.cert',
-#         'servers'        => {
+#         'server'         => [{
 #           'host' => 'test.server.com'
-#         }
+#         }]
 #       }
 #     }
 #

manifests/params.pp

@@ -11,21 +11,20 @@ class fluentd::params {
   # config params
   $config_path = '/etc/td-agent'
   $conf_dir    = "${config_path}/conf.d"
+  $conf_dir_manage = false
   $config_file = "${config_path}/td-agent.conf"
   # user params
+  $user_manage = true
   $user_name   = 'td-agent'
   $user_group  = 'td-agent'
+  $user_groups = ['adm']
 
   case $::osfamily {
     'Debian': {
-      case $::operatingsystem {
-        'Ubuntu': {
-          $manage_repo = true
-        }
-        default: {
-          fail("Unsupported osfamily: ${::operatingsystem}")
-        }
+      $repo_manage = true
     }
+    'Redhat': {
+      $repo_manage = true
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily}")

manifests/plugin.pp

@@ -31,11 +31,6 @@ define fluentd::plugin (
   $source = undef,
 ) {
 
-  # parameter validation
-  if ! ($ensure in [ 'present', 'absent' ]) {
-    fail('ensure parameter must be present or absent')
-  }
-
   case $type {
     'gem': {
       fluentd::plugin::gem { $name:
@@ -44,6 +39,10 @@ define fluentd::plugin (
       }
     }
     'file': {
+      # parameter validation
+      if ! ($ensure in [ 'present', 'absent' ]) {
+        fail('ensure parameter must be present or absent')
+      }
       validate_string($source)
 
       fluentd::plugin::file { $name:

manifests/repo.pp

@@ -1,11 +1,14 @@
 # Configure package repository
 #
 class fluentd::repo inherits fluentd {
-  if $::fluentd::manage_repo {
+  if $::fluentd::repo_manage {
     case $::osfamily {
       'Debian': {
         include ::fluentd::repo::apt
       }
+      'RedHat': {
+        include ::fluentd::repo::yum
+      }
       default: {
         fail("No repo available for ${::osfamily}/${::operatingsystem}")
       }

manifests/repo/apt.pp

@@ -2,12 +2,17 @@
 #
 class fluentd::repo::apt (
   $ensure       = 'present',
-  $location = downcase("http://packages.treasuredata.com/2/${::operatingsystem}/${::lsbdistcodename}"),
+  $location     = downcase("http://packages.treasuredata.com/2/${::lsbdistid}/${::lsbdistcodename}"),
   $release      = $::lsbdistcodename,
   $repos        = 'contrib',
+  $architecture = $::architecture,
   $key          = {
-    'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
-    'source' => 'https://packages.treasuredata.com/GPG-KEY-td-agent'
+    'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
+    'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
+  },
+  $include      = {
+    'src' => false,
+    'deb' => true,
   },
 ) {
 
@@ -17,7 +22,9 @@ class fluentd::repo::apt (
     ensure       => $ensure,
     location     => $location,
     release      => $release,
+    architecture => $architecture,
     repos        => $repos,
     key          => $key,
+    include      => $include,
   }
 }

manifests/repo/yum.pp

@@ -0,0 +1,34 @@
+# Configure yumrepo
+#
+class fluentd::repo::yum (
+  $ensure   = 'present',
+  $descr    = 'TreasureData',
+  $baseurl  = 'https://packages.treasuredata.com/2/redhat/$releasever/$basearch',
+  $enabled  = '1',
+  $gpgcheck = '1',
+  $gpgkey   = 'https://packages.treasuredata.com/GPG-KEY-td-agent',
+) {
+
+  yumrepo { 'treasure-data':
+    ensure   => $ensure,
+    descr    => $descr,
+    baseurl  => $baseurl,
+    enabled  => $enabled,
+    gpgcheck => $gpgcheck,
+    notify   => Exec['add GPG key'],
+  }
+
+  exec { 'add GPG key':
+    command     => "rpm --import ${fluentd::repo::yum::gpgkey}",
+    path        => '/bin:/usr/bin/',
+    refreshonly => true,
+  }
+
+  exec { 'remove old GPG key':
+    command => 'rpm -e --allmatches gpg-pubkey-a12e206f-*',
+    path    => '/bin:/usr/bin/',
+    onlyif  => 'rpm -qi gpg-pubkey-a12e206f-*',
+    notify  => Exec['add GPG key'],
+  }
+
+}

manifests/user.pp

@@ -0,0 +1,13 @@
+# Configure package
+#
+class fluentd::user inherits fluentd {
+
+  if $::fluentd::user_manage {
+    user { 'fluentd':
+      name    => $::fluentd::user_name,
+      gid     => $::fluentd::user_group,
+      groups  => $::fluentd::user_groups,
+      require => Class['Fluentd::Install'],
+    }
+  }
+}

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "wywygmbh-fluentd",
-  "version": "0.3.0",
+  "version": "0.5.5",
   "author": "wywy GmbH",
   "summary": "Generic module for fluentd (td-agent).",
   "license": "Apache-2.0",
@@ -12,6 +12,14 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [ "14.04", "12.04" ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [ "6", "7", "8"]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [ "6",  "7" ]
     }
   ],
   "dependencies": [

spec/acceptance/fluentd_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper_acceptance'
+
+RSpec.describe 'fluentd' do
+  it 'runs successfully' do
+    manifest = File.read(File.expand_path('../../examples/test.pp', File.dirname(__FILE__)))
+
+    # Run it twice and test for idempotency
+    apply_manifest(manifest, catch_failures: true)
+    expect(apply_manifest(manifest, catch_failures: true).exit_code).to be_zero
+  end
+
+  # test package
+  describe package('td-agent') do
+    it { is_expected.to be_installed }
+  end
+
+  # test service
+  describe service('td-agent') do
+    it { is_expected.to be_running }
+    # @todo
+    # there seems to be a bug serverspec while checking if the service is enabled
+    # on Debian 8:
+    # server spec checks:
+    # /bin/sh -c systemctl\ --quiet\ is-enabled\ td-agent
+    # Failed to get unit file state for td-agent.service: No such file or directory
+    #
+    # but all update-rc.d files are present:
+    # /etc/rc0.d/K01td-agent
+    # /etc/rc1.d/K01td-agent
+    # /etc/rc2.d/S01td-agent
+    # /etc/rc3.d/S01td-agent
+    # /etc/rc4.d/S01td-agent
+    # /etc/rc5.d/S01td-agent
+    # /etc/rc6.d/K01td-agent
+    if ! ( os[:family] == 'debian' and os[:release].to_f >= 8.0 )
+      it { is_expected.to be_enabled }
+    end
+  end
+
+  # test gem installed plugin
+  describe command('/opt/td-agent/embedded/bin/gem list') do
+    its(:stdout) { should contain('fluent-plugin-elasticsearch') }
+  end
+
+end

spec/acceptance/nodesets/centos-66-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-66-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box: puppetlabs/centos-6.6-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/centos-70-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: puppetlabs/centos-7.0-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/debian-60-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-60-x64:
+    roles:
+      - master
+    platform: debian-6-amd64
+    box: puppetlabs/debian-6.0.10-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/debian-78-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-78-x64:
+    roles:
+      - master
+    platform: debian-7-amd64
+    box: puppetlabs/debian-7.8-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/debian-82-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-82-x64:
+    roles:
+      - master
+    platform: debian-8-amd64
+    box: puppetlabs/debian-8.2-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-1204-x64:
+    roles:
+      - master
+    platform: ubuntu-12.04-amd64
+    box: puppetlabs/ubuntu-12.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-server-1404-x64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: info
+  type: foss

spec/classes/fluentd_config_spec.rb

@@ -1,16 +1,7 @@
 require 'spec_helper'
 
 describe 'fluentd::config', :type => :class do
-  let(:facts) {
-    {
-      :osfamily        => 'Debian',
-      :lsbdistid       => 'Ubuntu',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistcodename => 'precise',
-    }
-  }
-
-  describe 'when called with no parameters on Ubuntu' do
+  shared_examples 'when called with no parameters' do
     it {
       should contain_file('/etc/td-agent/td-agent.conf').with({
         'ensure' => 'file',
@@ -28,4 +19,28 @@ describe 'fluentd::config', :type => :class do
       })
     }
   end
+
+  context 'when osfamily is Debian' do
+    let(:facts) {
+      {
+        :osfamily        => 'Debian',
+        :lsbdistid       => 'Ubuntu',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
+  context 'when osfamily is RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
 end

spec/classes/fluentd_install_spec.rb

@@ -1,16 +1,8 @@
 require 'spec_helper'
 
 describe 'fluentd::install', :type => :class do
-  let(:facts) {
-    {
-      :osfamily        => 'Debian',
-      :lsbdistid       => 'Ubuntu',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistcodename => 'precise',
-    }
-  }
 
-  describe 'when called with no parameters on Ubuntu' do
+  shared_examples 'when called with no parameters' do
     it {
       should contain_package('fluentd').with({
         'ensure'          => 'installed',
@@ -19,4 +11,28 @@ describe 'fluentd::install', :type => :class do
       })
     }
   end
+
+  context 'when osfamily is Debian' do
+    let(:facts) {
+      {
+        :osfamily        => 'Debian',
+        :lsbdistid       => 'Ubuntu',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
+      }
+    }
+    include_examples 'when called with no parameters'
+  end
+
+  context 'when osfamily is RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
 end

spec/classes/fluentd_repo_apt_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::repo::apt', :type => :class do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
 
@@ -18,9 +19,14 @@ describe 'fluentd::repo::apt', :type => :class do
         'location'     => 'http://packages.treasuredata.com/2/ubuntu/precise',
         'release'      => 'precise',
         'repos'        => 'contrib',
+        'architecture' => 'amd64',
         'key'          => {
-          'id'     => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
-          'source' => 'https://packages.treasuredata.com/GPG-KEY-td-agent'
+          'id'     => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
+          'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
+        },
+        'include'      => {
+          'src' => false,
+          'deb' => true
         }
       })
     }

spec/classes/fluentd_repo_spec.rb

@@ -1,18 +1,30 @@
 require 'spec_helper'
 
 describe 'fluentd::repo', :type => :class do
+
+  context 'when called with no parameters on osfamily Debian' do
     let(:facts) {
       {
         :osfamily        => 'Debian',
         :lsbdistid       => 'Ubuntu',
         :operatingsystem => 'Ubuntu',
         :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
       }
     }
-
-  describe 'when called with no parameters on Ubuntu' do
     it {
       should contain_class('fluentd::repo::apt')
     }
   end
+
+  context 'when called with no parameters on osfamily RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+    it {
+      should contain_class('fluentd::repo::yum')
+    }
+  end
 end

spec/classes/fluentd_repo_yum_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'fluentd::repo::yum', :type => :class do
+  let(:facts) {
+    {
+      :osfamily => 'RedHat',
+    }
+  }
+
+  describe 'when called with no parameters on RedHat' do
+    it {
+      should contain_yumrepo('treasure-data').with({
+        'ensure'   => 'present',
+        'baseurl'  => 'https://packages.treasuredata.com/2/redhat/$releasever/$basearch',
+        'descr'    => 'TreasureData',
+        'enabled'  => '1',
+        'gpgcheck' => '1'
+      }).that_notifies('Exec[add GPG key]')
+
+      should contain_exec('add GPG key').with({
+        'command'     => 'rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent',
+        'path'        => '/bin:/usr/bin/',
+        'refreshonly' => 'true'
+      })
+    }
+  end
+end

spec/classes/fluentd_service_spec.rb

@@ -1,16 +1,7 @@
 require 'spec_helper'
 
 describe 'fluentd::config', :type => :class do
-  let(:facts) {
-    {
-      :osfamily        => 'Debian',
-      :lsbdistid       => 'Ubuntu',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistcodename => 'precise',
-    }
-  }
-
-  describe 'when called with no parameters on Ubuntu' do
+  shared_examples 'when called with no parameters' do
     it {
       should contain_service('fluentd').with({
         'name'       => 'td-agent',
@@ -21,4 +12,28 @@ describe 'fluentd::config', :type => :class do
       })
     }
   end
+
+  context 'when osfamily is Debian' do
+    let(:facts) {
+      {
+        :osfamily        => 'Debian',
+        :lsbdistid       => 'Ubuntu',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
+  context 'when osfamily is RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
 end

spec/classes/fluentd_spec.rb

@@ -1,16 +1,7 @@
 require 'spec_helper'
 
 describe 'fluentd', :type => :class do
-  let(:facts) {
-    {
-      :osfamily        => 'Debian',
-      :lsbdistid       => 'Ubuntu',
-      :operatingsystem => 'Ubuntu',
-      :lsbdistcodename => 'precise',
-    }
-  }
-
-  describe 'when called with no parameters on Ubuntu' do
+  shared_examples 'when called with no parameters' do
     it {
       should contain_class('fluentd::repo')
       should contain_class('fluentd::install')
@@ -18,4 +9,29 @@ describe 'fluentd', :type => :class do
       should contain_class('fluentd::service')
     }
   end
+
+  context 'when osfamily is Debian' do
+    let(:facts) {
+      {
+        :osfamily        => 'Debian',
+        :lsbdistid       => 'Ubuntu',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
+  context 'when osfamily is RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
 end

spec/classes/fluentd_user_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'fluentd::user', :type => :class do
+  shared_examples 'when called with no parameters' do
+    it {
+      should contain_user('fluentd').with({
+        'name'   => 'td-agent',
+        'gid'    => 'td-agent',
+        'groups' => ['adm']
+      })
+    }
+  end
+
+  context 'when osfamily is Debian' do
+    let(:facts) {
+      {
+        :osfamily        => 'Debian',
+        :lsbdistid       => 'Ubuntu',
+        :operatingsystem => 'Ubuntu',
+        :lsbdistcodename => 'precise',
+        :architecture    => 'amd64',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+
+  context 'when osfamily is RedHat' do
+    let(:facts) {
+      {
+        :osfamily => 'RedHat',
+      }
+    }
+
+    include_examples 'when called with no parameters'
+  end
+end

spec/defines/filter_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::filter' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/defines/match_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::match' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }
@@ -24,9 +25,11 @@ describe 'fluentd::match' do
               'shared_key'     => 'my_shared_key',
               'self_hostname'  => 'instance.test.com',
               'ca_cert_path'   => '/path/to/ca.cert',
-              'servers'        => {
-                'host' => 'test.server.com'
+              'server'         => [
+                  {
+                    'host' => 'test.server.com',
                   }
+              ]
           }
       }
     end
@@ -40,9 +43,51 @@ describe 'fluentd::match' do
         with_content(/shared_key my_shared_key/).
         with_content(/self_hostname instance.test.com/).
         with_content(/ca_cert_path \/path\/to\/ca.cert/).
-        with_content(/<servers>/).
+        with_content(/<server>/).
         with_content(/host test.server.com/).
-        with_content(/<\/servers>/).
+        with_content(/<\/server>/).
+        with_content(/<\/match>/)
+    end
+  end
+
+  context 'multiple store' do
+    let(:title) { 'test' }
+    let(:params) do
+      {
+          priority: '30',
+          pattern: '*.test',
+          config: {
+              'type'  => 'copy',
+              'store' => [
+                  {
+                    'type'           => 'elasticsearch',
+                    'logstashformat' => true,
+                    'hosts'          => '172.20.10.17:9200',
+                    'flush_interval' => '30s',
+                  },
+                  {
+                    'type' => 'file',
+                    'path' => '/tmp/td-agent-debug.log',
+                }
+              ]
+          }
+      }
+    end
+
+    it do
+      is_expected.to contain_file('/etc/td-agent/conf.d/30-match-test.conf').
+          with_content(/<match \*.test>/).
+          with_content(/type copy/).
+          with_content(/<store>/).
+          with_content(/type elasticsearch/).
+          with_content(/logstashformat true/).
+          with_content(/hosts 172.20.10.17:9200/).
+          with_content(/flush_interval 30s/).
+          with_content(/<\/store>/).
+          with_content(/<store>/).
+          with_content(/type file/).
+          with_content(/path \/tmp\/td-agent-debug.log/).
+          with_content(/<\/store>/).
           with_content(/<\/match>/)
     end
   end

spec/defines/plugin_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::plugin' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/defines/source_spec.rb

@@ -7,6 +7,7 @@ describe 'fluentd::source' do
       :lsbdistid       => 'Ubuntu',
       :operatingsystem => 'Ubuntu',
       :lsbdistcodename => 'precise',
+      :architecture    => 'amd64',
     }
   }
   let(:pre_condition) { 'include fluentd' }

spec/spec_helper_acceptance.rb

@@ -0,0 +1,22 @@
+require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
+
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+
+RSpec.configure do |c|
+  # Project root
+  module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Readable test descriptions
+  c.formatter = :documentation
+
+  # Configure all nodes in nodeset
+  c.before :suite do
+    # Install module
+    puppet_module_install(:source => module_root, :module_name => 'fluentd')
+    hosts.each do |host|
+      on host, puppet('module', 'install', 'puppetlabs-stdlib', '--version', '4.6.0')
+      on host, puppet('module', 'install', 'puppetlabs-apt', '--version', '2.0.0')
+    end
+  end
+end

templates/filter.erb

@@ -2,8 +2,8 @@
 <% @config.each do |key, val| -%>
     <%- if val.is_a?( Hash ) -%>
         <<%= key -%>>
-        <%- val.each do |key, val| -%>
-            <%= key -%> <%= val %>
+        <%- val.each do |key2, val2| -%>
+            <%= key2 -%> <%= val2 %>
         <%- end -%>
         </<%= key %>>
     <%- else -%>

templates/match.erb

@@ -6,6 +6,32 @@
             <%= key -%> <%= val %>
         <%- end -%>
         </<%= key %>>
+    <%- elsif val.is_a?( Array ) -%>
+        <%- val.each do |k, v| -%>
+            <<%= key -%>>
+            <%- if k.is_a?( Hash ) -%>
+                <%- k.each do |x, y| -%>
+                    <%- if y.is_a?( Array ) -%>
+                        <%- y.each do |a, b| -%>
+                            <<%= x -%>>
+                            <%- if a.is_a?( Hash ) -%>
+                                <%- a.each do |c, d| -%>
+                                    <%= c -%> <%= d %>
+                                <%- end -%>
+                            <%- else -%>
+                                <%= a -%> <%= b %>
+                            <%- end -%>
+                            </<%= x %>>
+                        <%- end -%>
+                    <%- else -%>
+                        <%= x -%> <%= y %>
+                    <%- end -%>
+                <%- end -%>
+            <%- else -%>
+                <%= k -%> <%= v %>
+            <%- end -%>
+            </<%= key %>>
+        <%- end -%>
     <%- else -%>
         <%= key -%> <%= val %>
     <%- end -%>