bump v0.3.2

dearing · Aug 1, 2015 · 0ade42f · 0ade42f
1 parent bf00fcc
commit 0ade42f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 31 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -2,13 +2,24 @@
 #driver:
 #  name: docker
 #  dockerfile: test/Dockerfile-centos66
-# provision_command: curl -L http://www.chef.io/chef/install.sh | bash
-
-driver_config:
-  publish_all: true
+#  provision_command: curl -L http://www.chef.io/chef/install.sh | bash
+#  driver_config:
+#    publish_all: true
 
 platforms:
-- name: centos-6.6
+- name: centos-5
+- name: centos-6
+- name: centos-7
+- name: fedora
+- name: ubuntu-12
+  run_list:
+  - recipe[apt]
+- name: ubuntu-14
+  run_list:
+  - recipe[apt]
+- name: debian
+  run_list:
+  - recipe[apt]
 
 provisioner:
   name: chef_zero

diff --git a/Berksfile b/Berksfile
@@ -5,6 +5,6 @@ metadata
 group :integration do
   cookbook 'ellktest', path: './test/cookbooks/ellktest'
   # until https://github.com/hw-cookbooks/runit/issues/142
-  cookbook 'runit', '~> 1.5.18'
+  cookbook 'runit', '= 1.5.18'
   # cookbook 'runit', git: "https://github.com/hw-cookbooks/runit.git", ref: "dev"
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ ellk CHANGELOG
 
 This file is used to list changes made in each version of the ellk cookbook.
 
+
+0.3.2
+-----
+- Jacob Dearing - Cosmtic updates and Berkshelf pinning to avoid bug in Runit
+			    - https://github.com/dearing/ellk/issues/22
+
 0.3.0
 -----
 - Jacob Dearing - Release-Ready for feedback. :8ball: 

diff --git a/README.md b/README.md
@@ -1,40 +1,37 @@
 ELLK Cookbook
 ============
 
-[![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://forthebadge.com)
-
 hack friendly: Elasticsearch, Logstash, Logstash-forwarder and Kibana
 
 *note: expects consumer to install java and handle certs*
 
-Support and Tested
-------------
-centos66
+Works with anything [ARK](https://github.com/burtlo/ark) and [RUNIT](https://github.com/hw-cookbooks/runit) can handle.
 
 Requirements
 ------------
 - chef 11+
 - some kind of java
-- see [metadata](/metadata.rb) for complexity
+- see [metadata](https://github.com/dearing/ellk/metadata.rb) for complexity
 
 About
 ------------
-The mindset for this creation is that logstash-forwarder is pleasant enough
-to cast out to all your resident nodes and since messing with templates is a pain,
-it allows you to just provide a hash to template out the configuration.  Making
-recipes easier to configure with.
-
-Next in the chain are the `logstash` nodes.  Typically, I'd imagine them to be 1:1 with all
-`elasticsearch` nodes also created by this LWRP; so `localhost` is a default output.  Otherwise,
-the matra of this design is if defaults don't work, `source` your consuming cookbook with your own
-templates copied from this cookbook.  Pass any optional config vars you want in your templaes with 
-`conf_options` attribute and hack away.
-
-This is hack friendly and mainly focused on getting you a framework
-to work by.  The heavy lifting comes from ARK and RUNIT cookbooks; everything else is template 
-manipulation.  Any discovery trickeness should be handled at the consuming recipe.
-
-See [ellktest](/test/cookbooks/ellktest/recipes/default.rb) as an example.
+The heavy lifting comes from [ARK](https://github.com/burtlo/ark) and [RUNIT](https://github.com/hw-cookbooks/runit) cookbooks with a focus around being able to pass optional configurations via merged hashsets for templates and environment variable sets.  Meditate on the idea that this library is simply providing a common installation and templating for the 4 projects.  It expects you to do all the tweaking and configuring as needed because attempting to account for all is untenable.  The opinion is then that you would want logstash-forwarder on all nodes communicating to your logstash endpoints.  Logstash-forwarder is overloaded to accept a hash for the logs it will harvert as an attribute making it easy to use in recipes without fumbling with templates. The defaults then expect that logstash would remain resident along all elasticsearch nodes which finally has an interface via kibana.  Beyond this, inheriting templates and customizing the configurations and security is up to you.
+
+The default installations are:
+```
+  elasticsearch      = 1.7.0 // JAVA
+  logstash           = 1.5.3 // RUBY
+  logstash-forwarder = 0.4.0 // GO
+  kibana             = 4.1.1 // NODEJS
+```
+You can override any of these by passing the url for the zip/tar package, a checksum (sha256) and a version to tag is by. See the resource files in the libraries folder for the accepted attributes.
+
+See [ellktest](https://github.com/dearing/ellk/test/cookbooks/ellktest/recipes/default.rb) for examples and flexibility..
+
+TODO
+------------
+see [issues](https://github.com/dearing/ellk/issues)
+
 
 Contributing
 ------------

diff --git a/metadata.rb b/metadata.rb
@@ -2,11 +2,12 @@
 maintainer 'Jacob Dearing'
 maintainer_email '[email protected]'
 license 'MIT'
-description 'Installs/Configures ELLK'
+description 'Library to handle Elasticsearch, Logstash, Logstash-Forwarder & Kibana'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.3.1'
+version '0.3.2'
 
-%w(ubuntu debian gentoo centos redhat amazon scientific oracle enterpriseenterprise).each do |os|
+# retsricted only to runit and ark really
+%w(ubuntu debian centos redhat amazon scientific oracle enterpriseenterprise).each do |os|
   supports os
 end