1
0
mirror of https://github.com/krislamo/puppet-fluentd synced 2025-09-13 17:09:29 +00:00

4 Commits
0.5.0 ... 0.5.1

Author SHA1 Message Date
Max Wilhelm
3dab36ee83 prepare 0.5.1 release 2016-05-13 10:18:52 +02:00
Max Wilhelm
8916d18654 Merge pull request #8 from mhrabovcin/master
Allow to install specific version of fluent plugins
2016-05-13 10:16:40 +02:00
Martin Hrabovcin
75a537432c Fix tests for Puppet 4 2016-05-12 22:31:52 +02:00
Martin Hrabovcin
9754e64490 Allow to install specific version of fluent plugins 2016-05-11 18:32:31 +02:00
14 changed files with 20 additions and 7 deletions

View File

@@ -1,5 +1,8 @@
# Changelog # Changelog
## 0.5.1
* Allow to install specific version of fluent gem plugins
## 0.5.0 ## 0.5.0
* Added support for Debian 6, 7, 8 * Added support for Debian 6, 7, 8
* Added support for CentOS 6, 7 * Added support for CentOS 6, 7

View File

@@ -228,7 +228,8 @@ This module gives you the possibility to install plugins as gem or files.
**gem installation** **gem installation**
```puppet ```puppet
::fluentd::plugin { 'fluent-plugin-elasticsearch': ::fluentd::plugin { 'fluent-plugin-elasticsearch':
type => 'gem' type => 'gem',
ensure => '0.1.3'
} }
``` ```
**file installation** **file installation**

View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "wywygmbh-fluentd", "name": "wywygmbh-fluentd",
"version": "0.5.0", "version": "0.5.1",
"author": "wywy GmbH", "author": "wywy GmbH",
"summary": "Generic module for fluentd (td-agent).", "summary": "Generic module for fluentd (td-agent).",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@@ -27,6 +27,7 @@ describe 'fluentd::config', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }

View File

@@ -19,6 +19,7 @@ describe 'fluentd::install', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }
include_examples 'when called with no parameters' include_examples 'when called with no parameters'

View File

@@ -9,6 +9,7 @@ describe 'fluentd::repo', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }
it { it {

View File

@@ -20,6 +20,7 @@ describe 'fluentd::config', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }

View File

@@ -17,6 +17,7 @@ describe 'fluentd', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }

View File

@@ -18,6 +18,7 @@ describe 'fluentd::user', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }

View File

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

View File

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

View File

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

View File

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