forked from Icinga/icinga-vagrant
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed 'modules/filebeat/' content from commit 5b0de38
git-subtree-dir: modules/filebeat git-subtree-split: 5b0de38352dfeb98d631b04423a88f657538b7fc
- Loading branch information
Michael Friedrich
committed
Nov 28, 2016
0 parents
commit 9df2179
Showing
35 changed files
with
3,316 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
fixtures: | ||
repositories: | ||
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git" | ||
"apt": "https://github.com/puppetlabs/puppetlabs-apt.git" | ||
"powershell": "https://github.com/puppetlabs/puppetlabs-powershell.git" | ||
"remotefile": "https://github.com/lwf/puppet-remote_file.git" | ||
symlinks: | ||
"filebeat": "#{source_dir}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
pkg/ | ||
Gemfile.lock | ||
vendor/ | ||
spec/fixtures/ | ||
.vagrant/ | ||
.bundle/ | ||
coverage/ | ||
.idea/ | ||
*.iml | ||
*.swp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
--- | ||
language: ruby | ||
cache: bundler | ||
script: | ||
- "bundle exec rake validate lint spec SPEC_OPTS='--format documentation'" | ||
matrix: | ||
fast_finish: true | ||
include: | ||
- rvm: 2.3.1 | ||
dist: trusty | ||
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true | ||
script: bundle exec rake beaker | ||
services: docker | ||
sudo: required | ||
- rvm: 2.3.1 | ||
dist: trusty | ||
env: BEAKER_set=ubuntu-16.04 PUPPET_INSTALL_TYPE=agent BEAKER_debug=true | ||
script: bundle exec rake beaker | ||
services: docker | ||
sudo: required | ||
- rvm: 2.3.1 | ||
dist: trusty | ||
env: BEAKER_set=centos-7 PUPPET_INSTALL_TYPE=agent BEAKER_debug=true | ||
script: bundle exec rake beaker | ||
services: docker | ||
sudo: required | ||
- rvm: 2.1.9 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 4.5" STRICT_VARIABLES="yes" | ||
- rvm: 2.1.6 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.5" FUTURE_PARSER="yes" | ||
- rvm: 2.1.6 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.8" | ||
- rvm: 1.9.3 | ||
bundler_args: --without system_tests | ||
env: PUPPET_GEM_VERSION="~> 3.8" | ||
notifications: | ||
email: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,214 @@ | ||
Changelog | ||
========= | ||
|
||
## Unreleased | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.6...HEAD) | ||
|
||
## [v0.8.6](https://github.com/pcfens/puppet-filebeat/tree/v0.8.6) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.5...v0.8.6) | ||
|
||
- Sort field keys [\#55](https://github.com/pcfens/puppet-filebeat/pull/55), | ||
[\#57](https://github.com/pcfens/puppet-filebeat/issues/57) | ||
- Refresh the filebeat service when packages are updated [\#56](https://github.com/pcfens/puppet-filebeat/issues/56) | ||
|
||
|
||
## [v0.8.5](https://github.com/pcfens/puppet-filebeat/tree/v0.8.5) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.4...v0.8.5) | ||
|
||
- Check the kafka partition hash before checking for sub-hashes [\#54](https://github.com/pcfens/puppet-filebeat/pull/54) | ||
|
||
## [v0.8.4](https://github.com/pcfens/puppet-filebeat/tree/v0.8.4) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.3...v0.8.4) | ||
|
||
- Fix regression: Add the SSL label to the filebeat 5 template. [\#53](https://github.com/pcfens/puppet-filebeat/pull/53) | ||
|
||
## [v0.8.3](https://github.com/pcfens/puppet-filebeat/tree/v0.8.3) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.2...v0.8.3) | ||
|
||
- Don't use a possibly undefined array's length to determine if it should be | ||
iterated over [\#52](https://github.com/pcfens/puppet-filebeat/pull/52) | ||
|
||
## [v0.8.2](https://github.com/pcfens/puppet-filebeat/tree/v0.8.2) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.1...v0.8.2) | ||
|
||
- Correctly set document type for v5 prospectors [\#51](https://github.com/pcfens/puppet-filebeat/pull/51) | ||
|
||
## [v0.8.1](https://github.com/pcfens/puppet-filebeat/tree/v0.8.1) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.8.0...v0.8.1) | ||
|
||
- Don't manage the apt-transport-https package on Debian systems [\#49](https://github.com/pcfens/puppet-filebeat/pull/49) | ||
- undefined values shouldn't be rendered by the filebeat5 template [\#50](https://github.com/pcfens/puppet-filebeat/pull/50) | ||
|
||
## [v0.8.0](https://github.com/pcfens/puppet-filebeat/tree/v0.8.0) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.4...v0.8.0) | ||
|
||
**Enhancements** | ||
- Add support for Filebeat v5. | ||
|
||
If you use this module on a system with filebeat 1.x installed, and you keep your current parameters | ||
nothing will change. Setting `major_version` to '5' will modify the configuration template and update | ||
package repositories, but won't update the package itself. To update the package set the | ||
`package_ensure` parameter to at least 5.0.0. | ||
|
||
- Add a parameter `use_generic_template` that uses a more generic version of the configuration | ||
template. The generic template is more future proof (if types are correct), but looks | ||
very different than the example file. | ||
|
||
|
||
## [v0.7.4](https://github.com/pcfens/puppet-filebeat/tree/v0.7.4) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.2...v0.7.4) | ||
|
||
Version 0.7.3 was never released even though it is tagged. | ||
|
||
- Fixed some testing issues that were caused by changes to external resources | ||
|
||
**Fixed Bugs** | ||
- Some redis configuration options were not generated as integers [\#38](https://github.com/pcfens/puppet-filebeat/issues/38) | ||
|
||
## [v0.7.2](https://github.com/pcfens/puppet-filebeat/tree/v0.7.2) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.1...v0.7.2) | ||
|
||
- Wrap regular expressions in single quotes [\#31](https://github.com/pcfens/puppet-filebeat/pull/31) and [\#35](https://github.com/pcfens/puppet-filebeat/pull/35) | ||
- Use the default Windows temporary folder (C:\Windows\Temp) by default [\#33](https://github.com/pcfens/puppet-filebeat/pull/33) | ||
|
||
## [v0.7.1](https://github.com/pcfens/puppet-filebeat/tree/v0.7.1) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.7.0...v0.7.1) | ||
|
||
- Allow the config file to be written to an alternate location. Be sure and read limitations before you use this. | ||
|
||
**Fixed Bugs** | ||
- Add elasticsearch and logstash port setting to Ruby 1.8 template | ||
[\#29](https://github.com/pcfens/puppet-filebeat/issues/29) | ||
|
||
## [v0.7.0](https://github.com/pcfens/puppet-filebeat/tree/v0.7.0) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.3...v0.7.0) | ||
|
||
- Setting the `prospectors_merge` parameter to true will create prospectors across multiple hiera levels | ||
using `hiera_hash()` [\#25](https://github.com/pcfens/puppet-filebeat/pull/25) | ||
- No longer manage the windows temp directory where the Filebeat download is kept. The assumption is made | ||
that the directory exists and is writable by puppet. | ||
- Update the default windows download to Filebeat version 1.2.3 | ||
- Add redis output to the Ruby 1.8 template | ||
- Wrap include_lines and exclude_lines array elements in quotes [\#28](https://github.com/pcfens/puppet-filebeat/issues/28) | ||
|
||
**Fixed Bugs** | ||
- SLES repository and metaparameters didn't match [\#25](https://github.com/pcfens/puppet-filebeat/pull/25) | ||
|
||
## [v0.6.3](https://github.com/pcfens/puppet-filebeat/tree/v0.6.3) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.2...v0.6.3) | ||
|
||
**Fixed Bugs** | ||
- Spool size default should match upstream [\#24](https://github.com/pcfens/puppet-filebeat/pull/24) | ||
- Repository names now match notification parameters Part of [\#25](https://github.com/pcfens/puppet-filebeat/pull/25) | ||
|
||
## [v0.6.2](https://github.com/pcfens/puppet-filebeat/tree/v0.6.2) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.1...v0.6.2) | ||
|
||
**Fixed Bugs** | ||
- Fix the other certificate_key typo in Ruby 1.8 template | ||
[\#23](https://github.com/pcfens/puppet-filebeat/issues/23) | ||
|
||
|
||
## [v0.6.1](https://github.com/pcfens/puppet-filebeat/tree/v0.6.1) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.6.0...v0.6.1) | ||
|
||
**Fixed Bugs** | ||
- Fix typo in Ruby 1.8 template [\#23](https://github.com/pcfens/puppet-filebeat/issues/23) | ||
|
||
|
||
## [v0.6.0](https://github.com/pcfens/puppet-filebeat/tree/v0.6.0) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.8...v0.6.0) | ||
|
||
- Add the `close_older` parameter to support the option of the same name in filebeat 1.2.0 | ||
- Add support for the `publish_async` parameter. | ||
|
||
**Fixed Bugs** | ||
- Added limited, but improved support for Ruby versions pre-1.9.1 by fixing the hash sort issue | ||
[\#20](https://github.com/pcfens/puppet-filebeat/issues/20) | ||
|
||
## [v0.5.8](https://github.com/pcfens/puppet-filebeat/tree/v0.5.8) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.7...v0.5.8) | ||
|
||
**Fixed Bugs** | ||
- `doc_type` is now used in the documentation instead of the deprecated `log_type` | ||
[\#17](https://github.com/pcfens/puppet-filebeat/pull/17) | ||
- RedHat based systems should be using the redhat service provider. | ||
[\#18](https://github.com/pcfens/puppet-filebeat/pull/18) | ||
|
||
|
||
## [v0.5.7](https://github.com/pcfens/puppet-filebeat/tree/v0.5.7) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.6...v0.5.7) | ||
|
||
**Fixed Bugs** | ||
- Some configuration parameters should be rendered as integers, not strings | ||
[\#15](https://github.com/pcfens/puppet-filebeat/pull/15) | ||
|
||
|
||
## [v0.5.6](https://github.com/pcfens/puppet-filebeat/tree/v0.5.6) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.5...v0.5.6) | ||
|
||
**Fixed Bugs** | ||
- Configuration files should use the `conf_template` parameter [\#14](https://github.com/pcfens/puppet-filebeat/pull/14) | ||
|
||
## [v0.5.5](https://github.com/pcfens/puppet-filebeat/tree/v0.5.5) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.4...v0.5.5) | ||
|
||
**Fixed Bugs** | ||
- `rotate_every_kb` and `number_of_files` parameters in file outputs should be | ||
explicitly integers to keep filebeat happy. [\#13](https://github.com/pcfens/puppet-filebeat/issues/13) | ||
|
||
## [v0.5.4](https://github.com/pcfens/puppet-filebeat/tree/v0.5.4) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.2...v0.5.4) | ||
|
||
**Fixed Bugs** | ||
- Fix template regression in v0.5.3 | ||
|
||
## [v0.5.2](https://github.com/pcfens/puppet-filebeat/tree/v0.5.2) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.1...v0.5.2) | ||
|
||
- Use the anchor pattern instead of contain so that older versions of puppet | ||
are supported [\#12](https://github.com/pcfens/puppet-filebeat/pull/12) | ||
|
||
## [v0.5.1](https://github.com/pcfens/puppet-filebeat/tree/v0.5.1) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.5.0...v0.5.1) | ||
|
||
- Update metadata to reflect which versions of puppet are supported. | ||
|
||
## [v0.5.0](https://github.com/pcfens/puppet-filebeat/tree/v0.5.0) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.4.1...v0.5.0) | ||
|
||
- For prospectors, deprecate `log_type` in favor of `doc_type` to better | ||
match the actual configuration parameter. `document_type` is not used because | ||
it causes errors when running with a puppet master. `log_type` will be fully | ||
removed before module version 1.0. | ||
[\#9](https://github.com/pcfens/puppet-filebeat/issues/9) | ||
|
||
**New Features** | ||
- Add support for `exclude_files`, `exclude_lines`, `include_lines`, and `multiline`. | ||
Use of the new parameters requires a filebeat version >= 1.1 | ||
([\#10](https://github.com/pcfens/puppet-filebeat/issues/10), [\#11](https://github.com/pcfens/puppet-filebeat/issues/11)) | ||
|
||
## [v0.4.1](https://github.com/pcfens/puppet-filebeat/tree/v0.4.1) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.4.0...v0.4.1) | ||
|
||
**Fixed Bugs** | ||
- Fix links in documentation to match the updated documentation | ||
|
||
**New Features** | ||
- Change repository resource names to beats (e.g. apt::source['beats'], etc.), | ||
and only declare them if they haven't already been declared. This way we only | ||
have one module for all beats modules managed through puppet. | ||
|
||
## [v0.4.0](https://github.com/pcfens/puppet-filebeat/tree/v0.4.0) | ||
[Full Changelog](https://github.com/pcfens/puppet-filebeat/compare/v0.3.1...v0.4.0) | ||
|
||
This is the first release that includes changelog. Since v0.3.1: | ||
|
||
**Fixed Bugs** | ||
- 'fields' parse error in prospector.yml template [\#7](https://github.com/pcfens/puppet-filebeat/pull/7) | ||
|
||
**New Features** | ||
- Windows support [\#3](https://github.com/pcfens/puppet-filebeat/pull/3) | ||
- Requires the [`puppetlabs/powershell`](https://forge.puppetlabs.com/puppetlabs/powershell) | ||
and [`lwf/remote_file`](https://forge.puppetlabs.com/lwf/remote_file) modules. | ||
- Config file and folder permissions can be managed [\#8](https://github.com/pcfens/puppet-filebeat/pull/8) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
source ENV['GEM_SOURCE'] || "https://rubygems.org" | ||
|
||
def location_for(place, version = nil) | ||
if place =~ /^(git[:@][^#]*)#(.*)/ | ||
[version, { :git => $1, :branch => $2, :require => false}].compact | ||
elsif place =~ /^file:\/\/(.*)/ | ||
['>= 0', { :path => File.expand_path($1), :require => false}] | ||
else | ||
[place, version, { :require => false}].compact | ||
end | ||
end | ||
|
||
group :development, :unit_tests do | ||
gem 'json', :require => false | ||
gem 'metadata-json-lint', :require => false | ||
gem 'puppet_facts', :require => false | ||
gem 'puppetlabs_spec_helper', :require => false | ||
gem 'rspec-puppet', '>= 2.3.2', :require => false | ||
gem 'simplecov', :require => false | ||
end | ||
|
||
group :system_tests do | ||
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') | ||
gem 'beaker', *location_for(ENV['BEAKER_VERSION']) | ||
gem 'serverspec', :require => false | ||
gem 'beaker-puppet_install_helper', :require => false | ||
gem 'master_manipulator', :require => false | ||
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION']) | ||
end | ||
|
||
# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1 | ||
# if using ruby 1.x | ||
gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./ | ||
|
||
if facterversion = ENV['FACTER_GEM_VERSION'] | ||
gem 'facter', facterversion, :require => false | ||
else | ||
gem 'facter', :require => false | ||
end | ||
|
||
if puppetversion = ENV['PUPPET_GEM_VERSION'] | ||
gem 'puppet', puppetversion, :require => false | ||
else | ||
gem 'puppet', :require => false | ||
end | ||
|
||
# vim:ft=ruby |
Oops, something went wrong.