Permalink
Browse files

Merge commit '42c97d26552d7c0e9c4ac84bf1e32ce890ac9180'

  • Loading branch information...
2 parents d25f888 + 42c97d2 commit 3905b49acc8897ac5aac7625fe9b0a8b8c9fd032 @dnsmichi dnsmichi committed Nov 28, 2016
Showing with 1,956 additions and 2,937 deletions.
  1. +1 −0 modules/logstash/.gitignore
  2. +1 −0 modules/logstash/.projectfile
  3. +25 −65 modules/logstash/.travis.yml
  4. +9 −7 modules/logstash/Gemfile
  5. +0 −10 modules/logstash/Modulefile
  6. +2 −2 modules/logstash/README.md
  7. +2 −1 modules/logstash/Vagrantfile
  8. +18 −1 modules/logstash/Vagrantfile.d/server.sh
  9. +29 −50 modules/logstash/doc/_index.html
  10. +38 −45 modules/logstash/doc/class_list.html
  11. +32 −31 modules/logstash/doc/css/full_list.css
  12. +220 −78 modules/logstash/doc/css/style.css
  13. +83 −104 modules/logstash/doc/file.README.html
  14. +42 −46 modules/logstash/doc/file_list.html
  15. +7 −16 modules/logstash/doc/frames.html
  16. +83 −104 modules/logstash/doc/index.html
  17. +100 −76 modules/logstash/doc/js/app.js
  18. +170 −135 modules/logstash/doc/js/full_list.js
  19. +43 −67 modules/logstash/doc/logstash.html
  20. +30 −51 modules/logstash/doc/logstash/config.html
  21. +43 −61 modules/logstash/doc/logstash/configfile.html
  22. +30 −51 modules/logstash/doc/logstash/java.html
  23. +30 −51 modules/logstash/doc/logstash/package.html
  24. +40 −58 modules/logstash/doc/logstash/package/install.html
  25. +30 −51 modules/logstash/doc/logstash/params.html
  26. +44 −62 modules/logstash/doc/logstash/patternfile.html
  27. +39 −57 modules/logstash/doc/logstash/plugin.html
  28. +30 −51 modules/logstash/doc/logstash/repo.html
  29. +32 −53 modules/logstash/doc/logstash/service.html
  30. +41 −59 modules/logstash/doc/logstash/service/init.html
  31. +39 −45 modules/logstash/doc/method_list.html
  32. +38 −45 modules/logstash/doc/puppet_manifest_list.html
  33. +38 −45 modules/logstash/doc/puppet_plugin_list.html
  34. +38 −45 modules/logstash/doc/puppet_provider_list.html
  35. +38 −45 modules/logstash/doc/puppet_type_list.html
  36. +35 −55 modules/logstash/doc/top-level-namespace.html
  37. +3 −1 modules/logstash/manifests/config.pp
  38. +1 −1 modules/logstash/manifests/configfile.pp
  39. +23 −142 modules/logstash/manifests/init.pp
  40. +0 −64 modules/logstash/manifests/java.pp
  41. +81 −32 modules/logstash/manifests/package.pp
  42. +0 −135 modules/logstash/manifests/package/install.pp
  43. +13 −126 modules/logstash/manifests/params.pp
  44. +20 −10 modules/logstash/manifests/plugin.pp
  45. +33 −35 modules/logstash/manifests/repo.pp
  46. +77 −6 modules/logstash/manifests/service.pp
  47. +0 −154 modules/logstash/manifests/service/init.pp
  48. +1 −1 modules/logstash/metadata.json
  49. +1 −1 modules/logstash/spec/acceptance/00_meta_spec.rb
  50. +20 −26 modules/logstash/spec/acceptance/class_logstash_spec.rb
  51. +20 −20 modules/logstash/spec/acceptance/class_plugin_spec.rb
  52. +3 −1 modules/logstash/spec/acceptance/nodesets/centos-6-docker.yml
  53. +2 −0 modules/logstash/spec/acceptance/nodesets/centos-7-docker.yml
  54. +16 −2 modules/logstash/spec/acceptance/nodesets/debian-7-docker.yml
  55. +3 −2 modules/logstash/spec/acceptance/nodesets/debian-8-docker.yml
  56. +17 −2 modules/logstash/spec/acceptance/nodesets/ubuntu-1204-docker.yml
  57. +11 −2 modules/logstash/spec/acceptance/nodesets/ubuntu-1404-docker.yml
  58. +25 −0 modules/logstash/spec/acceptance/nodesets/ubuntu-1604.yml
  59. +2 −1 modules/logstash/spec/classes/001_logstash_init_debian_spec.rb
  60. +2 −1 modules/logstash/spec/classes/002_logstash_init_redhat_spec.rb
  61. +2 −1 modules/logstash/spec/classes/003_logstash_init_opensuse_spec.rb
  62. +0 −39 modules/logstash/spec/classes/005_logstash_repo_spec.rb
  63. BIN modules/logstash/spec/fixtures/plugins/logstash-output-cowsay-0.1.0.gem
  64. BIN modules/logstash/spec/fixtures/plugins/logstash-output-cowsay-5.0.0.gem
  65. BIN modules/logstash/spec/fixtures/plugins/logstash-output-cowthink-0.1.0.gem
  66. BIN modules/logstash/spec/fixtures/plugins/logstash-output-cowthink-5.0.0.gem
  67. +46 −43 modules/logstash/spec/spec_helper_acceptance.rb
  68. +0 −203 modules/logstash/templates/etc/init.d/logstash.Debian.erb
  69. +0 −158 modules/logstash/templates/etc/init.d/logstash.RedHat.erb
  70. +0 −5 modules/logstash/templates/etc/sysconfig/defaults.erb
  71. +14 −0 modules/logstash/templates/startup.options.erb
@@ -1,4 +1,5 @@
.swp
+.#*
spec/fixtures/artifacts/*
!spec/fixtures/artifacts/.gitignore
spec/fixtures/modules/*
@@ -0,0 +1 @@
+-/doc
@@ -12,96 +12,56 @@ services:
language: ruby
rvm:
- - 1.9.3
+ - 2.2.5
script:
- # Some of our test can take long time, and not output anything while they
+ # Some of our tests can take long time, and not output anything while they
# are running. If this goes on for too long (ten minutes), then Travis
# will assume the build has stalled, and kill it.
#
- # It' a bit cheeky, but lets make sure that _something_ goes to STDOUT
+ # It's a bit cheeky, but let's make sure that _something_ goes to STDOUT
# every five minutes, so that our build won't be killed unjustly.
- (while true; do date --iso-8601=seconds; sleep 300; done) &
- (if [[ -n $TRAVIS_TEST_UNIT ]]; then make test-unit; else bundle exec rake beaker; fi)
env:
global:
- TRAVIS_CI=true
- - LOGSTASH_VERSION=2.3.2
+ - LOGSTASH_VERSION=5.0.1
- BEAKER_PE_DIR=spec/fixtures/artifacts
matrix:
# Run the unit tests once.
- - TRAVIS_TEST_UNIT=true
+ # FIXME: ...actually don't for now. They are a mess.
+ # FIXME: - TRAVIS_TEST_UNIT=true
# Then run the acceptance tests across the matrix.
- - PUPPET_VERSION=3.2.4 BEAKER_set=centos-6
- - PUPPET_VERSION=3.3.2 BEAKER_set=centos-6
- - PUPPET_VERSION=3.4.3 BEAKER_set=centos-6
- - PUPPET_VERSION=3.5.1 BEAKER_set=centos-6
- - PUPPET_VERSION=3.6.2 BEAKER_set=centos-6
- - PUPPET_VERSION=3.7.5 BEAKER_set=centos-6
- - PUPPET_VERSION=3.8.6 BEAKER_set=centos-6
- - PUPPET_VERSION=4.4.2 BEAKER_set=centos-6
+ - PUPPET_VERSION=3.8.7 BEAKER_set=centos-6
+ - PUPPET_VERSION=4.8.1 BEAKER_set=centos-6
- PUPPET_VERSION=3.8.4 BEAKER_set=centos-6 BEAKER_PE_VER=3.8.4 BEAKER_IS_PE=true
- - PUPPET_VERSION=3.2.4 BEAKER_set=centos-7
- - PUPPET_VERSION=3.3.2 BEAKER_set=centos-7
- - PUPPET_VERSION=3.4.3 BEAKER_set=centos-7
- - PUPPET_VERSION=3.5.1 BEAKER_set=centos-7
- - PUPPET_VERSION=3.6.2 BEAKER_set=centos-7
- - PUPPET_VERSION=3.7.5 BEAKER_set=centos-7
- - PUPPET_VERSION=3.8.6 BEAKER_set=centos-7
+ - PUPPET_VERSION=3.8.7 BEAKER_set=centos-7
- PUPPET_VERSION=4.0.0 BEAKER_set=centos-7
- PUPPET_VERSION=4.1.0 BEAKER_set=centos-7
- PUPPET_VERSION=4.2.3 BEAKER_set=centos-7
- PUPPET_VERSION=4.3.2 BEAKER_set=centos-7
- - PUPPET_VERSION=4.4.2 BEAKER_set=centos-7
+ - PUPPET_VERSION=4.8.1 BEAKER_set=centos-7
- - PUPPET_VERSION=3.2.4 BEAKER_set=debian-7
- - PUPPET_VERSION=3.3.2 BEAKER_set=debian-7
- - PUPPET_VERSION=3.4.3 BEAKER_set=debian-7
- - PUPPET_VERSION=3.5.1 BEAKER_set=debian-7
- - PUPPET_VERSION=3.6.2 BEAKER_set=debian-7
- - PUPPET_VERSION=3.7.5 BEAKER_set=debian-7
- - PUPPET_VERSION=3.8.6 BEAKER_set=debian-7
- - PUPPET_VERSION=4.4.2 BEAKER_set=debian-7
- - PUPPET_VERSION=3.8.4 BEAKER_set=debian-7 BEAKER_PE_VER=3.8.4 BEAKER_IS_PE=true
+ - PUPPET_VERSION=3.8.7 BEAKER_set=debian-7
+ - PUPPET_VERSION=4.8.1 BEAKER_set=debian-7
+ # FIXME: Beaker fails to install PE on Debian 7.
+ # Example: https://travis-ci.org/elastic/puppet-logstash/jobs/159507699#L542
+ # - PUPPET_VERSION=3.8.4 BEAKER_set=debian-7 BEAKER_PE_VER=3.8.4 BEAKER_IS_PE=true
- # 3.2 and 3.3 won't work on debian-8.
- # REF: https://github.com/puppetlabs/puppet/pull/2184
- # - PUPPET_VERSION=3.2.4 BEAKER_set=debian-8
- # - PUPPET_VERSION=3.3.2 BEAKER_set=debian-8
- - PUPPET_VERSION=3.4.3 BEAKER_set=debian-8
- - PUPPET_VERSION=3.5.1 BEAKER_set=debian-8
- - PUPPET_VERSION=3.6.2 BEAKER_set=debian-8
- - PUPPET_VERSION=3.7.5 BEAKER_set=debian-8
- - PUPPET_VERSION=3.8.6 BEAKER_set=debian-8
- - PUPPET_VERSION=4.4.2 BEAKER_set=debian-8
+ - PUPPET_VERSION=3.8.7 BEAKER_set=debian-8
+ - PUPPET_VERSION=4.8.1 BEAKER_set=debian-8
- # 3.2 and 3.3 won't work on opensuse-13
- # REF: https://github.com/puppetlabs/puppet/pull/2184
- # - PUPPET_VERSION=3.2.4 BEAKER_set=opensuse-13
- # - PUPPET_VERSION=3.3.2 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.4.3 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.5.1 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.6.2 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.7.5 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.8.6 BEAKER_set=opensuse-13
+ - PUPPET_VERSION=3.8.7 BEAKER_set=opensuse-13
- - PUPPET_VERSION=3.2.4 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.3.2 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.4.3 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.5.1 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.6.2 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.7.5 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.8.6 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=4.4.2 BEAKER_set=ubuntu-1204
+ - PUPPET_VERSION=3.8.7 BEAKER_set=ubuntu-1204
+ - PUPPET_VERSION=4.8.1 BEAKER_set=ubuntu-1204
- - PUPPET_VERSION=3.2.4 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.3.2 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.4.3 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.5.1 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.6.2 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.7.5 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=3.8.6 BEAKER_set=ubuntu-1404
- - PUPPET_VERSION=4.4.2 BEAKER_set=ubuntu-1404
+ - PUPPET_VERSION=3.8.7 BEAKER_set=ubuntu-1404
+ - PUPPET_VERSION=4.8.1 BEAKER_set=ubuntu-1404
+
+ - PUPPET_VERSION=3.8.7 BEAKER_set=ubuntu-1604
+ - PUPPET_VERSION=4.8.1 BEAKER_set=ubuntu-1604
@@ -1,11 +1,12 @@
source 'https://rubygems.org'
-ruby '1.9.3'
+ruby '2.2.5'
-puppetversion = ENV['PUPPET_VERSION'] || '3.8.6'
+puppetversion = ENV['PUPPET_VERSION'] || '4.5.1'
gem 'puppet', puppetversion, :require => false
-gem 'beaker'
-gem 'beaker-rspec'
+gem 'beaker', '3.4.0'
+gem 'beaker-pe', '1.6.1'
+gem 'beaker-rspec', '6.0.0'
# REF: https://github.com/voxpupuli/metadata-json-lint/issues/10
# gem 'metadata-json-lint'
@@ -22,17 +23,18 @@ gem 'rspec', '~> 3.0'
gem 'rake'
gem 'puppet-doc-lint'
gem 'puppet-lint'
-gem 'puppet-strings' if puppetversion =~ /^(3\.[789]|4\.)/
+gem 'puppet-strings'
gem 'puppetlabs_spec_helper'
gem 'puppet-syntax'
gem 'rspec-puppet-facts'
gem 'rubocop'
-gem 'serverspec'
+gem 'serverspec', '2.37.2'
+gem 'specinfra', '2.57.2'
gem 'webmock'
gem 'redcarpet'
# Extra Puppet-lint gems
-gem 'puppet-lint-appends-check', :require => false
+# gem 'puppet-lint-appends-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-undef_in_function-check', :require => false
@@ -1,10 +0,0 @@
-name 'elasticsearch-logstash'
-version '0.5.1'
-source 'https://github.com/elasticsearch/puppet-logstash'
-author 'elasticsearch'
-license 'Apache License, Version 2.0'
-summary 'Module for managing and configuring Logstash'
-description 'Module for managing and configuring Logstash'
-project_page 'https://github.com/elasticsearch/puppet-logstash'
-dependency 'puppetlabs/stdlib', '>= 3.2.0'
-dependency 'ispavailability/file_concat', '>= 0.1.0'
@@ -26,12 +26,12 @@ This overview shows you which Puppet module and Logstash version work together.
## Requirements
-* Puppet 3.2.0 or better.
+* Puppet 3.8.6 or better.
* The [stdlib](https://forge.puppetlabs.com/puppetlabs/stdlib) Puppet library.
* The [electrical/file_concat](https://forge.puppetlabs.com/electrical/file_concat) Puppet library.
Optional:
-* The [apt](https://forge.puppetlabs.com/puppetlabs/apt) Puppet library when using repo management on Debian/Ubuntu.
+* The [apt](https://forge.puppetlabs.com/puppetlabs/apt) (>= 2.0.0) Puppet library when using repo management on Debian/Ubuntu.
* The [zypprepo](https://forge.puppetlabs.com/darin/zypprepo) Puppet library when using repo management on SLES/SuSE
## Quick Start
@@ -6,7 +6,8 @@
module_root = '/etc/puppetlabs/code/environments/production/modules/logstash'
Vagrant.configure(2) do |config|
- config.vm.box = 'puppetlabs/debian-8.2-64-puppet'
+ # config.vm.box = 'puppetlabs/debian-8.2-64-puppet'
+ config.vm.box = 'puppetlabs/ubuntu-16.04-64-puppet'
config.vm.provider 'virtualbox' do |vm|
vm.memory = 3 * 1024
end
@@ -1,8 +1,8 @@
# Install and configure puppetserver.
-
export DEBIAN_FRONTEND=noninteractive
apt-get update
+apt-get install -y apt-transport-https
apt-get install -y puppetserver
# REF: https://tickets.puppetlabs.com/browse/SERVER-528
@@ -22,3 +22,20 @@ echo '127.0.0.1 localhost puppet' > /etc/hosts
for mod in puppetlabs-apt puppetlabs-stdlib electrical-file_concat; do
puppet module install --target-dir=/etc/puppetlabs/code/environments/production/modules $mod
done
+
+# Install Java 8 for Logstash.
+apt-get install openjdk-8-jre-headless
+java -version
+
+# Place a manifest to test the Logstash module.
+cat <<EOF > /etc/puppetlabs/code/environments/production/manifests/site.pp
+class { 'logstash':
+ manage_repo => true,
+ repo_version => '5.x',
+ version => '1:5.0.1-1',
+}
+
+logstash::configfile { 'basic_config':
+ content => 'input { tcp { port => 2000 } } output { null {} }'
+}
+EOF
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
- Documentation by YARD 0.8.7.6
+ Documentation by YARD 0.9.5
</title>
@@ -13,9 +13,8 @@
<link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
<script type="text/javascript" charset="utf-8">
- hasFrames = window.top.frames.main ? true : false;
+ pathId = null;
relpath = '';
- framesUrl = "frames.html#!_index.html";
</script>
@@ -26,57 +25,36 @@
</head>
<body>
- <div id="header">
- <div id="menu">
-
+ <div class="nav_wrap">
+ <iframe id="nav" src="class_list.html"></iframe>
+ <div id="resizer"></div>
+ </div>
- <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
+ <div id="main" tabindex="-1">
+ <div id="header">
+ <div id="menu">
+
</div>
- <div id="search">
+ <div id="search">
<a class="full_list_link" id="puppet_manifest_list_link"
href="puppet_manifest_list.html">
- Puppet Manifest List
- </a>
-
- <a class="full_list_link" id="puppet_plugin_list_link"
- href="puppet_plugin_list.html">
- Puppet Plugin List
- </a>
-
- <a class="full_list_link" id="puppet_type_list_link"
- href="puppet_type_list.html">
- Puppet Type List
- </a>
-
- <a class="full_list_link" id="puppet_provider_list_link"
- href="puppet_provider_list.html">
- Puppet Provider List
- </a>
-
- <a class="full_list_link" id="class_list_link"
- href="class_list.html">
- Class List
- </a>
-
- <a class="full_list_link" id="method_list_link"
- href="method_list.html">
- Method List
- </a>
-
- <a class="full_list_link" id="file_list_link"
- href="file_list.html">
- File List
+
+ <svg width="24" height="24">
+ <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+ <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+ <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+ </svg>
</a>
</div>
- <div class="clear"></div>
- </div>
+ <div class="clear"></div>
+ </div>
- <iframe id="search_frame"></iframe>
+ <iframe id="search_frame" src="class_list.html"></iframe>
- <div id="content"><h1 class="noborder title">Documentation by YARD 0.8.7.6</h1>
+ <div id="content"><h1 class="noborder title">Documentation by YARD 0.9.5</h1>
<div id="listing">
<h1 class="alphaindex">Alphabetic Index</h1>
@@ -245,11 +223,12 @@ <h1 class="alphaindex">Alphabetic Index</h1>
</div>
- <div id="footer">
- Generated on Fri May 13 16:02:58 2016 by
+ <div id="footer">
+ Generated on Fri Aug 5 13:07:59 2016 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
- 0.8.7.6 (ruby-1.9.3).
+ 0.9.5 (ruby-2.1.9).
</div>
+ </div>
</body>
</html>
Oops, something went wrong.

0 comments on commit 3905b49

Please sign in to comment.