Refactoring

kibanaをfluent pluginとしてインストールするよう変更。
td-agentとElasticsearchをぞれぞれ別recipeに分離
.kitchen.ymlを追加

Author: jacopen

.kitchen.yml

@@ -0,0 +1,21 @@
+---
+driver:
+  name: vagrant
+driver_config:
+  require_chef_omnibus: true
+
+provisioner:
+  name: chef_solo
+
+platforms:
+  - name: ubuntu-12.04
+    driver_config:
+      box: opscode-ubuntu-12.04
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+
+suites:
+  - name: default
+    run_list:
+      - recipe[apt]
+      - recipe[elasticsearch-aio::default]
+    attributes:

Berksfile

@@ -1,4 +1,6 @@
-cookbook 'apt'
-cookbook 'nginx',
+site :opscode
+
+metadata
+
 cookbook 'td-agent',
   :git => '[email protected]:treasure-data/chef-td-agent.git'

Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'berkshelf'
+gem 'foodcritic', '~> 3.0.3'
+gem 'rubocop'
+gem 'strainer'
+gem 'serverspec', :group => :integration
+gem 'test-kitchen', :group => :integration
+gem 'kitchen-vagrant', :group => :integration
+gem 'pry'

README.md

@@ -1,4 +1,4 @@
-es-with-fluentd Cookbook
+elasticsearch-aio Cookbook
 ========================
 
 Deploy elasticsearch with Kibana3 and Fluentd.

attributes/default.rb

@@ -1,17 +1,14 @@
-es = default[:es_with_fluentd]
+es = default[:elasticsearch_aio]
 es[:es_base_url]              = "https://download.elasticsearch.org/elasticsearch/elasticsearch/"
 es[:es_deb_filename]          = "elasticsearch-0.90.7.deb"
 
-es[:fluentd][:in_forward][:enabled] = "true"
-es[:fluentd][:in_forward][:port]    = "25224"
-es[:fluentd][:http][:enabled]       = "true"
-es[:fluentd][:http][:port]          = "8888"
+es[:td_agent][:in_forward][:enabled] = "true"
+es[:td_agent][:in_forward][:port]    = "25224"
+es[:td_agent][:http][:enabled]       = "true"
+es[:td_agent][:http][:port]          = "8888"
 
-es[:nginx][:port]             = "28080"
-es[:nginx][:server_name]      = "elasticsearch.example.com"
+es[:kibana][:port]             = "28080"
 es[:elasticsearch_head][:git] = "https://github.com/mobz/elasticsearch-head.git"
-es[:kibana][:zip]             = "http://download.elasticsearch.org/kibana/kibana/kibana-latest.zip"
-
 conf = es[:config]
 
 ## These attributes are export to elasticsearch.yml.

metadata.rb

@@ -1,11 +1,15 @@
-name             'es_with_fluentd'
+name             'elasticsearch-aio'
 maintainer       'Kazuto Kusama'
 maintainer_email '[email protected]'
 license          'All rights reserved'
-description      'Installs/Configures Elasticsearch, Fluentd(td-agent), Kibana and Elasticsearch Head'
+description      'Installs/Configures Elasticsearch, td-agent, Kibana and Elasticsearch Head'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
+version          '0.3.0'
 
 depends "apt"
 depends "td-agent"
-depends "nginx"
+
+recipe "elasticsearch-aio", "setup all in one"
+recipe "elasticsearch-aio::elasticsearch", "setup elasticsearch and plugins"
+recipe "elasticsearch-aio::td-agent", "setup td-agent and plugins"
+

recipes/default.rb

@@ -1,81 +1,9 @@
 #
-# Cookbook Name:: es-with-fluentd
+# Cookbook Name:: elasticsearch-aio
 # Recipe:: default
 #
 # Copyright 2013, Kazuto Kusama @jacopen
 #
 
-include_recipe "apt"
-include_recipe "td-agent"
-include_recipe "nginx"
-
-config = node[:es_with_fluentd]
-
-%w(openjdk-7-jdk git curl unzip).each do |pkg|
-  package pkg
-end
-
-remote_file "/tmp/#{config[:es_deb_filename]}" do
-  source config[:es_base_url] + config[:es_deb_filename]
-  action :create_if_missing
-end
-
-dpkg_package "/tmp/#{config[:es_deb_filename]}" do
-  action :install
-end
-
-remote_file "/tmp/kibana-latest.zip" do
-  source config[:kibana][:zip]
-end
-
-bash "extract kibana" do
-  code "unzip -o /tmp/kibana-latest.zip -d /var/www"
-end
-
-git "/var/www/eh" do
-  repository config[:elasticsearch_head][:git]
-  action :sync
-  notifies :restart, "service[nginx]"
-end
-
-template "/etc/elasticsearch/elasticsearch.yml" do
-  notifies :restart, "service[elasticsearch]"
-end
-
-template "/etc/td-agent/td-agent.conf" do
-  notifies :restart, "service[td-agent]"
-end
-
-template "/etc/nginx/sites-available/kibana" do
-  notifies :restart, "service[nginx]"
-end
-
-link File.join("/etc/nginx/sites-available/kibana") do
-  to File.join("/etc/nginx/sites-enabled/kibana")
-end
-
-file "/var/log/fluentd-kibana" do
-  action :touch
-  owner "td-agent"
-  group "td-agent"
-end
-
-file "/var/log/syslog" do
-  action :touch
-  mode "0644"
-end
-
-service "elasticsearch" do
-  supports [:restart]
-  action :enable
-end
-
-service "nginx" do
-  supports [:restart, :reload]
-  action :enable
-end
-
-service "td-agent" do
-  supports [:restart, :reload]
-  action :enable
-end
+include_recipe "elasticsearch-aio::td-agent"
+include_recipe "elasticsearch-aio::elasticsearch"

recipes/elasticsearch.rb

@@ -0,0 +1,32 @@
+#
+# Cookbook Name:: elasticsearch-aio
+# Recipe:: elasticsearch
+#
+# Copyright 2013, Kazuto Kusama @jacopen
+#
+
+include_recipe "elasticsearch-aio::td-agent"
+
+config = node[:elasticsearch_aio]
+
+%w(openjdk-7-jdk git curl unzip).each do |pkg|
+  package pkg
+end
+
+remote_file "/tmp/#{config[:es_deb_filename]}" do
+  source config[:es_base_url] + config[:es_deb_filename]
+  action :create_if_missing
+end
+
+dpkg_package "/tmp/#{config[:es_deb_filename]}" do
+  action :install
+end
+
+template "/etc/elasticsearch/elasticsearch.yml" do
+  notifies :restart, "service[elasticsearch]"
+end
+
+service "elasticsearch" do
+  supports [:restart]
+  action :enable
+end

recipes/td-agent.rb

@@ -0,0 +1,42 @@
+include_recipe "td-agent"
+
+td_agent_gem "kibana-server" do
+  version "0.0.2"
+  plugin true
+end
+
+directory "/etc/td-agent/conf.d" do
+  owner "root"
+  group "root"
+  action :create
+  not_if { File.exist? "/etc/td-agent/conf.d" }
+end
+
+directory "/var/log/kibana" do
+  action :create
+  owner "td-agent"
+  group "td-agent"
+end
+
+template "/etc/td-agent/td-agent.conf" do
+  source "td-agent.conf.erb"
+  owner "root"
+  group "root"
+  notifies :restart, "service[td-agent]"
+end
+
+template "/etc/td-agent/conf.d/kibana.conf" do
+  source "kibana.conf.erb"
+  owner "root"
+  group "root"
+  notifies :restart, "service[td-agent]"
+end
+
+execute "change permission" do
+  command "chown -R td-agent: /usr/lib/fluent/ruby/lib/ruby/gems/1.9.1/gems/fluent-plugin-kibana-server-*"
+end
+
+service "td-agent" do
+  supports [:restart, :reload]
+  action :enable
+end

templates/default/elasticsearch.conf.erb

@@ -0,0 +1,33 @@
+<% if node[:elasticsearch_aio][:td_agent][:in_forward][:enabled] == "true" %>
+<source>
+  type forward
+  port <%= node[:elasticsearch_aio][:td_agent][:in_forward][:port] %>
+</source>
+<% end %>
+
+<% if node[:elasticsearch_aio][:td_agent][:http][:enabled] == "true" %>
+<source>
+  type http
+  port <%= node[:elasticsearch_aio][:td_agent][:http][:port] %>
+</source>
+<% end %>
+
+<source>
+  type tail
+  format syslog
+  path /var/log/syslog
+  tag linux.syslog
+  pos_file /tmp/syslog.pos
+</source>
+ 
+<match *.*>
+  index_name fluentd
+  type_name fluentd
+  type elasticsearch
+  include_tag_key true
+  tag_key @log_name
+  host localhost
+  port 9200
+  logstash_format true
+  flush_interval 10s
+</match>