mirror of
https://github.com/krislamo/puppet-fluentd
synced 2025-09-13 08:59:29 +00:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
bb2346df50 | ||
|
e062d4f2e0 | ||
|
f32ea2c0ba | ||
|
8081e8df20 | ||
|
6cb1364023 | ||
|
3dab36ee83 | ||
|
8916d18654 | ||
|
75a537432c | ||
|
9754e64490 |
@@ -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
|
||||
|
@@ -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**
|
||||
|
1
Rakefile
1
Rakefile
@@ -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"
|
||||
|
@@ -5,5 +5,5 @@
|
||||
# file installation
|
||||
::fluentd::plugin { 'fluent-plugin-elasticsearch':
|
||||
type => 'file',
|
||||
source => 'puppet:///path/to/plugin'
|
||||
source => 'puppet://path/to/plugin'
|
||||
}
|
||||
|
@@ -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*]
|
||||
|
@@ -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:
|
||||
|
@@ -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",
|
||||
|
@@ -27,6 +27,7 @@ describe 'fluentd::config', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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'
|
||||
|
@@ -9,6 +9,7 @@ describe 'fluentd::repo', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
it {
|
||||
|
@@ -20,6 +20,7 @@ describe 'fluentd::config', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -17,6 +17,7 @@ describe 'fluentd', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -18,6 +18,7 @@ describe 'fluentd::user', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -7,6 +7,7 @@ describe 'fluentd::filter' do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
let(:pre_condition) { 'include fluentd' }
|
||||
|
@@ -7,6 +7,7 @@ describe 'fluentd::match' do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
let(:pre_condition) { 'include fluentd' }
|
||||
|
@@ -7,6 +7,7 @@ describe 'fluentd::plugin' do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
let(:pre_condition) { 'include fluentd' }
|
||||
|
@@ -7,6 +7,7 @@ describe 'fluentd::source' do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
let(:pre_condition) { 'include fluentd' }
|
||||
|
Reference in New Issue
Block a user