Merge pull request #314 from paulczar/master

Massive PR to turn into Library Cookbook

.gitignore

@@ -5,3 +5,4 @@ vendor/
 .kitchen/
 .kitchen.local.yml
 .bundle/
+bin/

.kitchen.yml

@@ -13,53 +13,30 @@ provisioner:
 
 platforms:
   - name: ubuntu-12.04
+  - name: centos-6.5
 
 suites:
   - name: server
     run_list:
       - recipe[apt::default]
       - recipe[java::default]
       - recipe[logstash::server]
-      - recipe[logstash::agent]
-      - recipe[kibana::default]
     attributes:
       java:
-        jdk_version: 7
-        oracle: 
+        install_flavor: "oracle"
+        jdk_version: "7"
+        oracle:
           accept_oracle_download_terms: true
-        install_flavor: oracle
       logstash:
-        supervisor_gid: 'adm'
-        agent:
-          server_ipaddress: 127.0.0.1
-          xms: 128m
-          xmx: 128m
-          enable_embedded_es: false
-          inputs:
-            - file:
-                type: syslog
-                path:
-                  - /var/log/syslog
-                  - /var/log/messages
-                start_position: beginning
-          filters:
-            - condition: 'if [type] == "syslog"'
-              block:
-                grok:
-                  match:
-                    - 'message'
-                    - '%{SYSLOGTIMESTAMP:timestamp} %{IPORHOST:host} (?:%{PROG:program}(?:\[%{POSINT:pid}\])?: )?%{GREEDYDATA:message}'
-                date:
-                  match:
-                    - 'timestamp'
-                    - 'MMM  d HH:mm:ss'
-                    - 'MMM dd HH:mm:ss'
-                    - 'ISO8601'
-        server:
-          enable_embedded_es: true
-          web:
-            enabled: true
-      kibana:
-        webserver_listen: '0.0.0.0'
-        webserver: 'nginx'
-        install_type: 'file'
+        instance:
+          server:
+            xms: '256M'
+            xmx: '256M'
+            config_templates:
+              input_syslog: 'config/input_syslog.conf.erb'
+              output_stdout: 'config/output_stdout.conf.erb'
+              output_elasticsearch: 'config/output_elasticsearch.conf.erb'
+            pattern_templates:
+              default: 'patterns/custom_patterns.erb'
+            elasticsearch_ip: '127.0.0.1'
+            enable_embedded_es: true

.rubocop.yml

@@ -1,12 +1,13 @@
 AllCops:
-  Excludes:
-    - vendor
-    - test/support/**
-  Includes:
-    - Rakefile
-    - Gemfile
-    - Vagrantfile
-    - Berksfile  
+  Exclude:
+    - 'vendor/**/*'
+    - 'test/support/**'
+    - 'bin/**/*'
+  Include:
+    - '**/Rakefile'
+    - '**/Gemfile'
+    - '**/Vagrantfile'
+    - '**/Berksfile'
 CyclomaticComplexity:
   Enabled: false
 
@@ -17,3 +18,24 @@ LineLength:
 MethodLength:
   Enabled: true
   Max: 20
+
+AccessorMethodName:
+  Enabled: false
+
+ClassAndModuleChildren:
+  Enabled: false
+
+UselessAssignment:
+  Enabled: false
+
+BlockNesting:
+  Max: 4
+
+Documentation:
+  Enabled: false
+
+MethodLength:
+  Max: 50
+
+SingleSpaceBeforeFirstArg:
+  Enabled: false

.travis.yml

@@ -1,7 +1,13 @@
 language: ruby
-gemfile:
-  - test/support/Gemfile
 rvm:
   - 1.9.3
-install: BUNDLE_GEMFILE=$PWD/test/support/Gemfile bundle install
-script: BUNDLE_GEMFILE=$PWD/test/support/Gemfile bundle exec rake strainer
+env:
+  - USE_SYSTEM_GECODE=1
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install libgecode-dev
+install:
+  - bundle install --path vendor --binstubs
+script:
+  - bin/berks install
+  - bin/rake style spec

Berksfile

@@ -1,14 +1,17 @@
 # Encoding: utf-8
 
+source 'https://api.berkshelf.com' if Gem::Version.new(Berkshelf::VERSION) > Gem::Version.new('3')
+
 metadata
 
-cookbook 'rabbitmq', git: 'git://github.com/opscode-cookbooks/rabbitmq.git'
 cookbook 'java'
+cookbook 'curl'
+cookbook 'ark'
+
+cookbook 'pleaserun', git: 'https://github.com/paulczar/chef-pleaserun.git'
 
 group :test do
-  cookbook 'minitest-handler', git: 'git://github.com/btm/minitest-handler-cookbook.git'
-  cookbook 'elasticsearch', git: 'git://github.com/elasticsearch/cookbook-elasticsearch.git'
-  cookbook 'kibana', git: 'git://github.com/lusis/chef-kibana.git'
-  cookbook 'curl'
-  cookbook 'ark'
+  cookbook 'minitest-handler', git: 'https://github.com/btm/minitest-handler-cookbook.git'
+  cookbook 'elasticsearch', git: 'https://github.com/elasticsearch/cookbook-elasticsearch.git'
+  cookbook 'kibana', git: 'https://github.com/lusis/chef-kibana.git'
 end

CHANGELOG.md

@@ -2,20 +2,39 @@
 
 This file is used to list changes made in each version of chef-logstash.
 
-## 0.7.7
+
+## 0.9.1:
+
+* curator LWRP
+
+## 0.9.0:
+
+_this will almost certainly break backwards compatibility_
+
+* support for Logstash 1.4
+* major refactor towards being a library cookbook
+  * instance LWRP
+  * service LWRP
+  * pattern LWP
+  * config LWP  
+
+## 0.7.7:
+
 * Support for new beaver config [#239](https://github.com/lusis/chef-logstash/pull/239)
 * Support for multiline codec [#240](https://github.com/lusis/chef-logstash/pull/240)
 * Parameterize /var/lib/logstash [#242](https://github.com/lusis/chef-logstash/pull/242)
 * Fix parameter spacing option [#244](https://github.com/lusis/chef-logstash/pull/244)
 
 ## 0.7.6:
+
 * introduced more testing
   * Strainer: rubocop, knife test, foodcritic, chefspec
   * lots of style fixes for rubocop
   * skeleton spec files for each recipe
   * testkitchen + server spec
 
 ## 0.7.5:
+
 * added fedora systemd support
 * moved zeromq repos to own recipe
 

Gemfile

@@ -2,4 +2,28 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf'
+gem 'berkshelf', '> 3'
+
+# Uncomment these lines if you want to live on the Edge:
+#
+# group :development do
+#   gem "berkshelf", github: "berkshelf/berkshelf"
+#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.5.2"
+# end
+#
+# group :plugins do
+#   gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
+#   gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus"
+# end
+
+gem 'chef', '>= 11.8'
+gem 'rake', '>= 10.2'
+gem 'rubocop', '= 0.23'
+gem 'foodcritic', '< 4.0'
+gem 'chefspec', '>= 3.4'
+gem 'serverspec', '>= 1.6'
+gem 'test-kitchen'
+gem 'kitchen-vagrant'
+gem 'guard', '>= 2.6'
+gem 'guard-rubocop', '>= 1.1'
+gem 'guard-foodcritic', '>= 1.0.2'