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

9 Commits
0.5.0 ... 0.5.2

Author SHA1 Message Date
Max Wilhelm
bb2346df50 prepare 0.5.2 release 2016-07-14 11:22:44 +02:00
Max Wilhelm
e062d4f2e0 disable_puppet_url_without_modules for puppet-lint 2016-07-14 11:12:20 +02:00
Max Wilhelm
f32ea2c0ba try to fix build 2016-07-14 10:56:34 +02:00
Max Wilhelm
8081e8df20 Merge pull request #9 from pdrakeweb/fix-parameter-docs
Correct the docs related to the service_enable parameter.
2016-07-14 10:55:58 +02:00
Peter Drake
6cb1364023 Correct the docs related to the service_enable parameter. 2016-07-13 15:55:55 -04:00
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
17 changed files with 27 additions and 10 deletions

View File

@@ -1,5 +1,11 @@
# Changelog
## 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

View File

@@ -79,7 +79,7 @@ include '::fluentd'
Service ensure.
**Default:** 'running'
`service_enabled`
`service_enable`
Defines if the service should be enabled.
**Default:** 'true'
@@ -228,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**

View File

@@ -1,6 +1,7 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_puppet_url_without_modules')
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
desc "Validate manifests, templates, and ruby files"

View File

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

View File

@@ -26,7 +26,7 @@
# [*service_ensure*]
# Service ensure
# Default: 'running'
# [*service_enabled*]
# [*service_enable*]
# Defines if the service should be enabled
# Default: 'true'
# [*user_manage*]

View File

@@ -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:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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