mirror of
https://github.com/krislamo/puppet-fluentd
synced 2024-11-10 04:50:34 +00:00
Merge pull request #8 from mhrabovcin/master
Allow to install specific version of fluent plugins
This commit is contained in:
commit
8916d18654
@ -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**
|
||||||
|
@ -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:
|
||||||
|
@ -27,6 +27,7 @@ describe 'fluentd::config', :type => :class do
|
|||||||
:lsbdistid => 'Ubuntu',
|
:lsbdistid => 'Ubuntu',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:lsbdistcodename => 'precise',
|
:lsbdistcodename => 'precise',
|
||||||
|
:architecture => 'amd64',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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'
|
||||||
|
@ -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 {
|
||||||
|
@ -20,6 +20,7 @@ describe 'fluentd::config', :type => :class do
|
|||||||
:lsbdistid => 'Ubuntu',
|
:lsbdistid => 'Ubuntu',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:lsbdistcodename => 'precise',
|
:lsbdistcodename => 'precise',
|
||||||
|
:architecture => 'amd64',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ describe 'fluentd', :type => :class do
|
|||||||
:lsbdistid => 'Ubuntu',
|
:lsbdistid => 'Ubuntu',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:lsbdistcodename => 'precise',
|
:lsbdistcodename => 'precise',
|
||||||
|
:architecture => 'amd64',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ describe 'fluentd::user', :type => :class do
|
|||||||
:lsbdistid => 'Ubuntu',
|
:lsbdistid => 'Ubuntu',
|
||||||
:operatingsystem => 'Ubuntu',
|
:operatingsystem => 'Ubuntu',
|
||||||
:lsbdistcodename => 'precise',
|
:lsbdistcodename => 'precise',
|
||||||
|
:architecture => 'amd64',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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' }
|
||||||
|
@ -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' }
|
||||||
|
@ -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' }
|
||||||
|
@ -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' }
|
||||||
|
Loading…
Reference in New Issue
Block a user