support for multiple protocol
Replace the new "Welcome page" with the logstash dashboard
Add capability to discover elasticsearch server via role. Use web_app definition from apache2 cookbook for cross distro compatibility
Add proxy for _mapping to retrieve fields
Update kibana-nginx.conf.erb
Merge pull request #10 from secondmarket-cookbooks/master

Enable discovery of es server and provide cross distro compatibility for Apache
Merge pull request #6 from klamontagne/master

Replace the new "Welcome page" with the logstash dashboard
Merge pull request #8 from ianneub/master

Adding terms module to config.js
Merge pull request #5 from paulczar/master

support for multiple protocol
Adding @benwtr @chrisferry @ianneub @klamontagne @paulczar for being awesome
Update README.md
small syntax error from a previous merge
Changed paths in default recipe for kibana source to the new kibana directory structure
Merge branch 'master' of https://github.com/nickpellant/chef-kibana into combined

Conflicts:
	metadata.rb
	templates/default/kibana-apache.conf.erb