[WIP] Support Kibana 4

.kitchen.yml

@@ -3,7 +3,7 @@ driver_plugin: vagrant
 driver_config:
   require_chef_omnibus: true
   network:
-    - ["forwarded_port", {guest: 80, host: 8080}]
+    - ["forwarded_port", {guest: 8080, host: 8080}]
 
 platforms:
 - name: ubuntu-12.04
@@ -30,6 +30,8 @@ suites:
   attributes:
     kibana:
       version: '3'
+      nginx:
+        listen_http: 8080
 - name: kibana3_nginx
   run_list:
     - 'recipe[kibana]'
@@ -46,4 +48,40 @@ suites:
   attributes:
     kibana:
       version: '3'
+      nginx:
+        listen_http: 8080
+      install_method: 'source'
+- name: kibana4
+  run_list:
+    - 'recipe[kibana]'
+    - 'recipe[apache2]'
+    - 'recipe[kibana::apache]'
+    - 'recipe[java]'
+    - 'recipe[elasticsearch]'
+  attributes:
+    apache:
+      listen_ports:
+       - 8080
+    kibana:
+      version: '4'
+      apache:
+        port: 8080
+- name: kibana4_nginx
+  run_list:
+    - 'recipe[kibana]'
+    - 'recipe[nginx]'
+    - 'recipe[kibana::nginx]'
+    - 'recipe[java]'
+    - 'recipe[elasticsearch]'
+  attributes:
+    kibana:
+      version: '4'
+      nginx:
+        listen_http: 8080
+- name: kibana4_source
+  run_list:
+    - 'recipe[kibana]'
+  attributes:
+    kibana:
+      version: '4'
       install_method: 'source'

Berksfile

@@ -1,9 +1,11 @@
-site :opscode
+source 'https://api.berkshelf.com/'
 
 metadata
 
 group :vagrant do
-	cookbook 'apt'
+    cookbook 'apt'
     cookbook 'apache2'
     cookbook 'nginx'
+    cookbook 'java'
+    cookbook 'elasticsearch'
 end

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## v0.1.10:
 * Support proxying elasticsearch through apache. Submitted by Dmitry (cyberflow).
 * Replace depends with suggest for the apache cookbook as it is not needed when using nginx. Submitted by Bryan Casey.
+* Correct apache configuration to work with apache < 2.4. Submitted by Olivier Dolbeau (odolbeau).
 
 ## v0.1.8:
 * nginx support. Submitted by Gregoire Seux and Jonathon W. Marshall.

Gemfile

@@ -7,7 +7,7 @@ group :test do
   gem 'test-kitchen',       '~> 1.0.0'
   gem 'kitchen-vagrant',    '~> 0.11'
   gem 'foodcritic',         '~> 3.0.3'
-  gem 'rubocop',            '~> 0.15.0'
+  gem 'rubocop',            '~> 0.23.0'
   gem 'chefspec',           '~> 3.0'
 end
 

README.md

@@ -16,7 +16,7 @@ Kibana requires ElasticSearch index to be configured to work as per logstash req
 
 * build-essential
 * ark
-* apache2 (>= 2.0)
+* apache2 (>= 2.0) (Suggested but not required)
 * authbind (Suggested but not required)
 * apt (Suggested but not required)
 * nginx (Suggested but not required)
@@ -51,11 +51,15 @@ Kibana requires ElasticSearch index to be configured to work as per logstash req
 * `node['kibana']['apache']['basic_auth_username']` - Apache http auth username. Defaults to `admin`.
 * `node['kibana']['apache']['basic_auth_password']` - Apache http auth password. Defaults to `PLEASEchangeme`.
 * `node['kibana']['apache']['port']` - The port on which to bind apache. Defaults to `80`.
+* `node['kibana']['apache']['proxy']` - Boolean switch to enable apache search query proxy. Defaults to `false`.
 * `node['kibana']['nginx']['port']` - The port on which to bind nginx. Defaults to `80`.
 * `node['kibana']['nginx']['listen_http']` - The port on which to bind nginx. Defaults to `80`.
 * `node['kibana']['nginx']['listen_https']` - The HTTPS port on which to bind nginx. Defaults to `443`.
 * `node['kibana']['nginx']['client_max_body']` -  Defaults to `50M`.
 * `node['kibana']['nginx']['ssl']` - Boolean switch to enable SSL configuration. Defaults to `false`.
+* `node['kibana']['nginx']['proxy']` - Boolean switch to enable nginx search query proxy. Defaults to `false`.
+* `node['kibana']['nginx']['auth']` - Boolean switch to enable auth basic. Defaults to `false`.
+* `node['kibana']['auth_file']` - The path to auth basic file. Defaults to `/etc/nginx/htpasswd.users`.
 * `node['kibana']['nginx']['ssl_certificate']` - The path to the SSL certificate file. Defaults to `nil`.
 * `node['kibana']['nginx']['ssl_certificate_key']` - The path to the SSL certificate key. Defaults to `nil`.
 * `node['kibana']['nginx']['ssl_protocols']` - The SSL protocols. Defaults to `TLSv1 TLSv1.1 TLSv1.2`.
@@ -70,6 +74,7 @@ Kibana requires ElasticSearch index to be configured to work as per logstash req
 * [kibana::default](#kibanadefault) - Install Kibana.
 * kibana::kibana2
 * kibana::kibana3
+* kibana::kibana4
 * kibana::nginx
 
 ## kibana::apache

Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 require 'rainbow/ext/string'
 require 'rubocop/rake_task'
 desc 'Run RuboCop on the lib directory'
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = true
 end
 
@@ -18,4 +18,4 @@ task :foodcritic do
   sh 'foodcritic -f any -t ~FC007 .'
 end
 
-task default:  [:rubocop, :foodcritic]
+task default: [:rubocop, :foodcritic]

attributes/default.rb

@@ -1,9 +1,11 @@
 # Encoding: utf-8
 
-#<> Kibana version
+#<> Kibana major version
 default['kibana']['version'] = '2'
 #<> Kibana3 exact version
 default['kibana']['kibana3_version'] = '3.0.0'
+#<> Kibana4 exact version
+default['kibana']['kibana4_version'] = '4.2.0'
 #<> The base directory of kibana.
 default['kibana']['base_dir'] = '/opt/kibana'
 #<> The user under which Kibana is installed.
@@ -12,10 +14,15 @@
 default['kibana']['group'] = 'kibana'
 #<> Install method. Can be source or release
 default['kibana']['install_method'] = 'release'
+
+url_version = node['kibana']["kibana#{node['kibana']['version']}_version"] || node['kibana']['version']
 #<> Url of tarball
-default['kibana']['url'] = "https://download.elasticsearch.org/kibana/kibana/kibana-#{node['kibana']['kibana3_version']}.tar.gz"
+default['kibana']['url'] = Kibana::Url.new(node, url_version).get
 #<> Checksum of the tarball
 default['kibana']['checksum'] = 'df25bc0cc02385edcac446ef8cbd83b896cdc910a0fa1b0a7bd2a958164593a8'
+#<> Checksum of the tarball (for Kibana4)
+default['kibana']['kibana4_checksum'] = '67d586e43a35652adeb6780eaa785d3d785ce60cc74fbf3b6a9a53b753c8f985'
+
 #<> The URL to Kibana repository.
 default['kibana']['git']['url'] = if node['kibana']['version'] > '2'
                                     'https://github.com/elasticsearch/kibana.git'
@@ -32,20 +39,28 @@
 default['kibana']['rubyversion'] = '1.9.1'
 
 #<> The interface on which to bind.
-default['kibana']['interface'] = node['ipaddress']
+default['kibana']['interface'] = '127.0.0.1'
+
 #<> The port on which to bind.
 default['kibana']['port'] = 5601
 #<> An Array of the elasticsearch service hosts.
 default['kibana']['elasticsearch']['hosts'] = ['127.0.0.1']
 #<> The port of the elasticsearch http service.
 default['kibana']['elasticsearch']['port'] = 9200
+
+default['kibana']['index'] = if node['kibana']['version'] > '3'
+                               '.kibana'
+                             else
+                               'kibana-int'
+                             end
+
 #<> The which fields are shown by default.
 default['kibana']['default_fields'] = '["@message"]'
 #<> The operator used if no explicit operator is specified.
 default['kibana']['default_operator'] = 'OR'
-#<> The cookbook from which config.js template is taken
+#<> The cookbook from which configuration template is taken
 default['kibana']['config']['cookbook'] = nil
-#<> The template from which config.js is generated from
+#<> The template from which configuration is generated from
 default['kibana']['config']['source'] = nil
 #<> Fields specifiers which default to @message (may need to be changed for newer logstash)
 default['kibana']['highlighted_field'] = '@message'
@@ -65,7 +80,10 @@
 #<> The port on which to bind apache.
 default['kibana']['apache']['port'] = 80
 #<> Boolean switch to enable apache search query proxy
-default['kibana']['apache']['port'] = false
+default['kibana']['apache']['proxy'] = false
+#<> The apache configuration source
+default['kibana']['apache']['cookbook'] = 'kibana'
+
 #<> The port on which to bind nginx
 default['kibana']['nginx']['port'] = 80
 
@@ -105,3 +123,19 @@
 default['kibana']['nginx']['server_name'] = 'kibana'
 
 default['kibana']['elasticsearch_host'] = ''
+
+#<> The nginx configuration source
+default['kibana']['nginx']['cookbook'] = 'kibana'
+
+#<> Redirect requests to kibana service
+default['kibana']['kibana_service'] = nil
+unless node['kibana']['version'] =~ /^3/
+  default['kibana']['kibana_service'] = "http://#{node['kibana']['interface']}:#{node['kibana']['port']}"
+end
+
+#<> The kibana service configuration source
+default['kibana']['service']['source'] = 'upstart.conf.erb'
+default['kibana']['service']['cookbook'] = 'kibana'
+
+#<> The kibana 4 default application on load
+default['kibana']['defaultapp'] = 'discover'

libraries/version.rb

@@ -0,0 +1,41 @@
+# Encoding: utf-8
+
+class Kibana
+  # All to find correct url to download kibana
+  class Url
+    def initialize(node, version)
+      @node    = node
+      @version = version
+    end
+
+    def get
+      prefix = 'https://download.elastic.co/kibana/kibana/kibana-'
+      suffix = case @version
+               when /^3\./
+                 "#{@version}.#{ext}"
+               else
+                 "#{@version}-#{@node['os']}#{arch}.#{ext}"
+               end
+      prefix + suffix
+    end
+
+    def ext
+      case @node['os']
+      when 'windows'
+        'zip'
+      else
+        'tar.gz'
+      end
+    end
+
+    def arch
+      return '' if @node['os'] == 'windows'
+      case @node['kernel']['machine']
+      when 'x86_64'
+        '-x64'
+      else
+        '-x86'
+      end
+    end
+  end
+end

metadata.rb

@@ -1,16 +1,18 @@
 # Encoding: utf-8
 
-name             'kibana'
-maintainer       'Peter Donald'
+name 'kibana'
+maintainer 'Peter Donald'
 maintainer_email 'peter@realityforge.org'
-license          'Apache 2.0'
-description      'Installs/Configures kibana, the logstash UI'
+license 'Apache 2.0'
+description 'Installs/Configures kibana, the logstash UI'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.9'
+version '0.1.9'
 
 depends 'build-essential'
 depends 'ark'
 suggests 'apache2', '>= 2.0'
 suggests 'authbind'
 suggests 'apt'
 suggests 'nginx'
+suggests 'java'
+suggests 'elasticsearch'

recipes/_service.rb

@@ -0,0 +1,18 @@
+# Encoding: utf-8
+
+service 'kibana' do
+  provider Chef::Provider::Service::Upstart
+  supports start: true, restart: true, stop: true, status: true
+  action :nothing
+end
+
+template '/etc/init/kibana.conf' do
+  cookbook node['kibana']['service']['cookbook']
+  source node['kibana']['service']['source']
+  variables(
+    version: node['kibana']['version'],
+    options: '', # TODO
+    recent_upstart: (node['platform_family'] != 'rhel')
+  )
+  notifies :restart, 'service[kibana]', :delayed
+end

recipes/apache.rb

@@ -16,11 +16,18 @@
   owner node['apache']['user']
   group node['apache']['group']
   mode 00644
+  not_if { node['kibana']['apache']['basic_auth'] == 'off' }
 end
 
 template "#{node['apache']['dir']}/sites-available/kibana.conf" do
+  variables(
+    'index' => node['kibana']['index'],
+    'kibana_service' => node['kibana']['kibana_service']
+  )
   source 'vhost.conf.erb' if node['kibana']['version'] =~ /^2/
   source 'vhost3.conf.erb' if node['kibana']['version'] =~ /^3/
+  source 'vhost4.conf.erb' if node['kibana']['version'] =~ /^4/
+  cookbook node['kibana']['apache']['cookbook']
   owner node['apache']['user']
   group node['apache']['group']
   mode 00644

recipes/kibana2.rb

@@ -21,7 +21,7 @@
 end
 
 #gem1.8 doesn't get brought in with ruby1.8.x
-if  node['kibana']['rubyversion'] == '1.8'
+if node['kibana']['rubyversion'] == '1.8'
   package "rubygems#{node['kibana']['rubyversion']}"
 end
 

recipes/kibana3.rb

@@ -26,12 +26,13 @@
 
 template File.join(node['kibana']['base_dir'], config_path) do
   cookbook node['kibana']['config']['cookbook']
-  source   node['kibana']['config']['source']
+  source node['kibana']['config']['source']
   owner node['kibana']['user']
   group node['kibana']['group']
   mode '0644'
   variables({
               :es_port => node['kibana']['elasticsearch']['port'],
-              :elasticsearch_host => node['kibana']['elasticsearch_host']
+              :elasticsearch_host => node['kibana']['elasticsearch_host'],
+              :index => node['kibana']['index']
             })
 end