daddy 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3c032215479d481adf8381420f51701591c21d
-  data.tar.gz: 82bd1ebe703e78498029ebdf3a8989391892e67f
+  metadata.gz: 4d5150f9cbfc05fcf8b3a01de805b9f58135a8ef
+  data.tar.gz: c845fadd5f6d4768dfa53d9d8e9e5bc2b4a42e1e
 SHA512:
-  metadata.gz: d6d3b97707f3701e3f3066102339109d2672c2832f285b2809e75d3d323543d71e138c1e895342d9ca1e2ceeed30bf34971ad03af8982a41953fd7e8e1f0ce9f
-  data.tar.gz: 812c1f887c8eeb341fef965d37d1227aabfaa4bb6dd6d287e872d942a9fa7639d7560d9ea34bf214a8ae347e014e182698d94c42362c6ec0618c8807644056ca
+  metadata.gz: d695d73e2745db21c216b40956f66efaaaadddb70d1840303be204a9cb873469875630c04768269b673e3a34b9ab3783be294883c77e6e184ec6c6fef3c26b01
+  data.tar.gz: 4b15658091e9b62019324fb1456870574d4fe3ea84f6e249e80a372d5c991ae08dc5e67a82e8ddf8219ad0731a0a9e7e4e455074e8bf703102f5b1dc964a4cce

data/lib/daddy/http_client.rb

@@ -49,8 +49,8 @@ module Daddy
     end
     
     def ssl_options
-      lib_dir = File.expand_path('../..', __FILE__)
-      ca_path = File.join(lib_dir, 'ssl')
+      daddy_dir = File.expand_path('../../..', __FILE__)
+      ca_path = File.join(daddy_dir, 'ssl')
   
       ret = {
         :ca_path => ca_path,

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.13'.freeze
+  VERSION = '0.3.14'.freeze
 end

data/lib/tasks/elasticsearch.rake

@@ -0,0 +1,23 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :es do
+
+    desc "Elasticsearchをインストールします。"
+    task :install do
+      @options = {
+        :path_data => ask('path.data', :default => '/opt/elasticsearch/data')
+      }
+
+      template = File.join(File.dirname(__FILE__), 'elasticsearch', 'elasticsearch.yml.erb')
+      render(template, :to => File.join('tmp', 'elasticsearch.yml'))
+
+      template = File.join(File.dirname(__FILE__), 'elasticsearch', 'elasticsearch.conf.erb')
+      render(template, :to => File.join('tmp', 'elasticsearch.conf'))
+
+      script = File.join(File.dirname(__FILE__), 'elasticsearch', 'install.sh')
+      run "bash -ex #{script}"
+    end
+
+  end
+end

data/lib/tasks/elasticsearch/elasticsearch.conf.erb

@@ -0,0 +1,128 @@
+set.default.ES_HOME=/opt/elasticsearch
+set.default.ES_HEAP_SIZE=1024
+
+#********************************************************************
+# Wrapper Timeout Properties
+#********************************************************************
+# How long to wait for the JVM to start (in seconds)
+wrapper.startup.timeout=300
+# How long to wait for the JVM to stop (in seconds)
+wrapper.shutdown.timeout=300
+# When a ping will timeout to consider the JVM hung (in seconds)
+wrapper.ping.timeout=300
+
+#********************************************************************
+# Wrapper Java Properties
+#********************************************************************
+# Java Application
+wrapper.java.command=java
+
+# Tell the Wrapper to log the full generated Java command line.
+#wrapper.java.command.loglevel=INFO
+
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+wrapper.working.dir=%ES_HOME%
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=%ES_HOME%/bin/service/lib/wrapper.jar
+wrapper.java.classpath.2=%ES_HOME%/lib/elasticsearch*.jar
+wrapper.java.classpath.3=%ES_HOME%/lib/*.jar
+wrapper.java.classpath.4=%ES_HOME%/lib/sigar/*.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=%ES_HOME%/bin/service/lib
+
+# Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+wrapper.java.additional.auto_bits=TRUE
+
+# Java Additional Parameters
+wrapper.java.additional.1=-Delasticsearch-service
+wrapper.java.additional.2=-Des.path.home=%ES_HOME%
+wrapper.java.additional.3=-Xss256k
+wrapper.java.additional.4=-XX:+UseParNewGC
+wrapper.java.additional.5=-XX:+UseConcMarkSweepGC
+wrapper.java.additional.6=-XX:CMSInitiatingOccupancyFraction=75
+wrapper.java.additional.7=-XX:+UseCMSInitiatingOccupancyOnly
+wrapper.java.additional.8=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.9=-Djava.awt.headless=true
+
+# Initial Java Heap Size (in MB)
+wrapper.java.initmemory=%ES_HEAP_SIZE%
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=%ES_HEAP_SIZE%
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.elasticsearch.bootstrap.ElasticsearchF
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Enables Debug output from the Wrapper.
+# wrapper.debug=TRUE
+
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=%ES_HOME%/logs/service.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper General Properties
+#********************************************************************
+# Allow for the use of non-contiguous numbered properties
+wrapper.ignore_sequence_gaps=TRUE
+
+# Title to use when running as a console
+wrapper.console.title=Elasticsearch
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.name=Elasticsearch
+
+# Display name of the service
+wrapper.displayname=Elasticsearch
+
+# Description of the service
+wrapper.description=Open Source, Distributed, RESTful Search Engine
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START, DELAY_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+

data/lib/tasks/elasticsearch/elasticsearch.yml.erb

@@ -0,0 +1,388 @@
+##################### Elasticsearch Configuration Example #####################
+
+# This file contains an overview of various configuration settings,
+# targeted at operations staff. Application developers should
+# consult the guide at <http://elasticsearch.org/guide>.
+#
+# The installation procedure is covered at
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup.html>.
+#
+# Elasticsearch comes with reasonable defaults for most settings,
+# so you can try it out without bothering with configuration.
+#
+# Most of the time, these defaults are just fine for running a production
+# cluster. If you're fine-tuning your cluster, or wondering about the
+# effect of certain configuration option, please _do ask_ on the
+# mailing list or IRC channel [http://elasticsearch.org/community].
+
+# Any element in the configuration can be replaced with environment variables
+# by placing them in ${...} notation. For example:
+#
+#node.rack: ${RACK_ENV_VAR}
+
+# For information on supported formats and syntax for the config file, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/setup-configuration.html>
+
+
+################################### Cluster ###################################
+
+# Cluster name identifies your cluster for auto-discovery. If you're running
+# multiple clusters on the same network, make sure you're using unique names.
+#
+#cluster.name: elasticsearch
+
+
+#################################### Node #####################################
+
+# Node names are generated dynamically on startup, so you're relieved
+# from configuring them manually. You can tie this node to a specific name:
+#
+#node.name: "Franz Kafka"
+
+# Every node can be configured to allow or deny being eligible as the master,
+# and to allow or deny to store the data.
+#
+# Allow this node to be eligible as a master node (enabled by default):
+#
+#node.master: true
+#
+# Allow this node to store data (enabled by default):
+#
+#node.data: true
+
+# You can exploit these settings to design advanced cluster topologies.
+#
+# 1. You want this node to never become a master node, only to hold data.
+#    This will be the "workhorse" of your cluster.
+#
+#node.master: false
+#node.data: true
+#
+# 2. You want this node to only serve as a master: to not store any data and
+#    to have free resources. This will be the "coordinator" of your cluster.
+#
+#node.master: true
+#node.data: false
+#
+# 3. You want this node to be neither master nor data node, but
+#    to act as a "search load balancer" (fetching data from nodes,
+#    aggregating results, etc.)
+#
+#node.master: false
+#node.data: false
+
+# Use the Cluster Health API [http://localhost:9200/_cluster/health], the
+# Node Info API [http://localhost:9200/_nodes] or GUI tools
+# such as <http://www.elasticsearch.org/overview/marvel/>,
+# <http://github.com/karmi/elasticsearch-paramedic>,
+# <http://github.com/lukas-vlcek/bigdesk> and
+# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
+
+# A node can have generic attributes associated with it, which can later be used
+# for customized shard allocation filtering, or allocation awareness. An attribute
+# is a simple key value pair, similar to node.key: value, here is an example:
+#
+#node.rack: rack314
+
+# By default, multiple nodes are allowed to start from the same installation location
+# to disable it, set the following:
+#node.max_local_storage_nodes: 1
+
+
+#################################### Index ####################################
+
+# You can set a number of options (such as shard/replica options, mapping
+# or analyzer definitions, translog settings, ...) for indices globally,
+# in this file.
+#
+# Note, that it makes more sense to configure index settings specifically for
+# a certain index, either when creating it or by using the index templates API.
+#
+# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
+# for more information.
+
+# Set the number of shards (splits) of an index (5 by default):
+#
+#index.number_of_shards: 5
+
+# Set the number of replicas (additional copies) of an index (1 by default):
+#
+#index.number_of_replicas: 1
+
+# Note, that for development on a local machine, with small indices, it usually
+# makes sense to "disable" the distributed features:
+#
+#index.number_of_shards: 1
+#index.number_of_replicas: 0
+
+# These settings directly affect the performance of index and search operations
+# in your cluster. Assuming you have enough machines to hold shards and
+# replicas, the rule of thumb is:
+#
+# 1. Having more *shards* enhances the _indexing_ performance and allows to
+#    _distribute_ a big index across machines.
+# 2. Having more *replicas* enhances the _search_ performance and improves the
+#    cluster _availability_.
+#
+# The "number_of_shards" is a one-time setting for an index.
+#
+# The "number_of_replicas" can be increased or decreased anytime,
+# by using the Index Update Settings API.
+#
+# Elasticsearch takes care about load balancing, relocating, gathering the
+# results from nodes, etc. Experiment with different settings to fine-tune
+# your setup.
+
+# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
+# the index status.
+
+
+#################################### Paths ####################################
+
+# Path to directory containing configuration (this file and logging.yml):
+#
+#path.conf: /path/to/conf
+
+# Path to directory where to store index data allocated for this node.
+#
+#path.data: /path/to/data
+#
+# Can optionally include more than one location, causing data to be striped across
+# the locations (a la RAID 0) on a file level, favouring locations with most free
+# space on creation. For example:
+#
+#path.data: /path/to/data1,/path/to/data2
+<%- unless @options[:path_data].empty? -%>
+path.data: <%= @options[:path_data] %>
+<%- end -%>
+
+# Path to temporary files:
+#
+#path.work: /path/to/work
+
+# Path to log files:
+#
+#path.logs: /path/to/logs
+
+# Path to where plugins are installed:
+#
+#path.plugins: /path/to/plugins
+
+
+#################################### Plugin ###################################
+
+# If a plugin listed here is not installed for current node, the node will not start.
+#
+#plugin.mandatory: mapper-attachments,lang-groovy
+
+
+################################### Memory ####################################
+
+# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
+# it _never_ swaps.
+#
+# Set this property to true to lock the memory:
+#
+#bootstrap.mlockall: true
+
+# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
+# to the same value, and that the machine has enough memory to allocate
+# for Elasticsearch, leaving enough memory for the operating system itself.
+#
+# You should also make sure that the Elasticsearch process is allowed to lock
+# the memory, eg. by using `ulimit -l unlimited`.
+
+
+############################## Network And HTTP ###############################
+
+# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
+# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
+# communication. (the range means that if the port is busy, it will automatically
+# try the next port).
+
+# Set the bind address specifically (IPv4 or IPv6):
+#
+#network.bind_host: 192.168.0.1
+
+# Set the address other nodes will use to communicate with this node. If not
+# set, it is automatically derived. It must point to an actual IP address.
+#
+#network.publish_host: 192.168.0.1
+
+# Set both 'bind_host' and 'publish_host':
+#
+#network.host: 192.168.0.1
+
+# Set a custom port for the node to node communication (9300 by default):
+#
+#transport.tcp.port: 9300
+
+# Enable compression for all communication between nodes (disabled by default):
+#
+#transport.tcp.compress: true
+
+# Set a custom port to listen for HTTP traffic:
+#
+#http.port: 9200
+
+# Set a custom allowed content length:
+#
+#http.max_content_length: 100mb
+
+# Disable HTTP completely:
+#
+#http.enabled: false
+
+
+################################### Gateway ###################################
+
+# The gateway allows for persisting the cluster state between full cluster
+# restarts. Every change to the state (such as adding an index) will be stored
+# in the gateway, and when the cluster starts up for the first time,
+# it will read its state from the gateway.
+
+# There are several types of gateway implementations. For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
+
+# The default gateway type is the "local" gateway (recommended):
+#
+#gateway.type: local
+
+# Settings below control how and when to start the initial recovery process on
+# a full cluster restart (to reuse as much local data as possible when using shared
+# gateway).
+
+# Allow recovery process after N nodes in a cluster are up:
+#
+#gateway.recover_after_nodes: 1
+
+# Set the timeout to initiate the recovery process, once the N nodes
+# from previous setting are up (accepts time value):
+#
+#gateway.recover_after_time: 5m
+
+# Set how many nodes are expected in this cluster. Once these N nodes
+# are up (and recover_after_nodes is met), begin recovery process immediately
+# (without waiting for recover_after_time to expire):
+#
+#gateway.expected_nodes: 2
+
+
+############################# Recovery Throttling #############################
+
+# These settings allow to control the process of shards allocation between
+# nodes during initial recovery, replica allocation, rebalancing,
+# or when adding and removing nodes.
+
+# Set the number of concurrent recoveries happening on a node:
+#
+# 1. During the initial recovery
+#
+#cluster.routing.allocation.node_initial_primaries_recoveries: 4
+#
+# 2. During adding/removing nodes, rebalancing, etc
+#
+#cluster.routing.allocation.node_concurrent_recoveries: 2
+
+# Set to throttle throughput when recovering (eg. 100mb, by default 20mb):
+#
+#indices.recovery.max_bytes_per_sec: 20mb
+
+# Set to limit the number of open concurrent streams when
+# recovering a shard from a peer:
+#
+#indices.recovery.concurrent_streams: 5
+
+
+################################## Discovery ##################################
+
+# Discovery infrastructure ensures nodes can be found within a cluster
+# and master node is elected. Multicast discovery is the default.
+
+# Set to ensure a node sees N other master eligible nodes to be considered
+# operational within the cluster. This should be set to a quorum/majority of 
+# the master-eligible nodes in the cluster.
+#
+#discovery.zen.minimum_master_nodes: 1
+
+# Set the time to wait for ping responses from other nodes when discovering.
+# Set this option to a higher value on a slow or congested network
+# to minimize discovery failures:
+#
+#discovery.zen.ping.timeout: 3s
+
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
+
+# Unicast discovery allows to explicitly control which nodes will be used
+# to discover the cluster. It can be used when multicast is not present,
+# or to restrict the cluster communication-wise.
+#
+# 1. Disable multicast discovery (enabled by default):
+#
+#discovery.zen.ping.multicast.enabled: false
+#
+# 2. Configure an initial list of master nodes in the cluster
+#    to perform discovery when new nodes (master or data) are started:
+#
+#discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
+
+# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
+#
+# You have to install the cloud-aws plugin for enabling the EC2 discovery.
+#
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
+#
+# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
+# for a step-by-step tutorial.
+
+# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
+#
+# You have to install the cloud-gce plugin for enabling the GCE discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
+
+# Azure discovery allows to use Azure API in order to perform discovery.
+#
+# You have to install the cloud-azure plugin for enabling the Azure discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
+
+################################## Slow Log ##################################
+
+# Shard level query and fetch threshold logging.
+
+#index.search.slowlog.threshold.query.warn: 10s
+#index.search.slowlog.threshold.query.info: 5s
+#index.search.slowlog.threshold.query.debug: 2s
+#index.search.slowlog.threshold.query.trace: 500ms
+
+#index.search.slowlog.threshold.fetch.warn: 1s
+#index.search.slowlog.threshold.fetch.info: 800ms
+#index.search.slowlog.threshold.fetch.debug: 500ms
+#index.search.slowlog.threshold.fetch.trace: 200ms
+
+#index.indexing.slowlog.threshold.index.warn: 10s
+#index.indexing.slowlog.threshold.index.info: 5s
+#index.indexing.slowlog.threshold.index.debug: 2s
+#index.indexing.slowlog.threshold.index.trace: 500ms
+
+################################## GC Logging ################################
+
+#monitor.jvm.gc.young.warn: 1000ms
+#monitor.jvm.gc.young.info: 700ms
+#monitor.jvm.gc.young.debug: 400ms
+
+#monitor.jvm.gc.old.warn: 10s
+#monitor.jvm.gc.old.info: 5s
+#monitor.jvm.gc.old.debug: 2s
+
+################################## Security ################################
+
+# Uncomment if you want to enable JSONP as a valid return transport on the
+# http server. With this enabled, it may pose a security risk, so disabling
+# it unless you need it is recommended (it is disabled by default).
+#
+#http.jsonp.enable: true

data/lib/tasks/elasticsearch/install.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+SCRIPT_BASE=`dirname $0`
+VERSION="1.4.0"
+URL=https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${VERSION}.tar.gz
+URL_SW=https://github.com/elasticsearch/elasticsearch-servicewrapper/tarball/master
+
+mkdir -p tmp
+pushd tmp
+  if [ -e elasticsearch-${VERSION}.tar.gz ]; then
+    echo "elasticsearch-${VERSION}.tar.gz はダウンロード済みです。"
+  else
+    wget ${URL}
+  fi
+
+  if [ -e elasticsearch-servicewrapper.tar.gz ]; then
+    echo "elasticsearch-servicewrapper.tar.gz はダウンロード済みです。"
+  else
+    wget ${URL_SW} -O elasticsearch-servicewrapper.tar.gz
+  fi
+
+  rm -Rf elasticsearch-${VERSION}
+  tar zxf elasticsearch-${VERSION}.tar.gz
+  sudo rm -Rf /opt/elasticsearch-${VERSION}
+  sudo mv elasticsearch-${VERSION} /opt/
+  sudo ln -snf /opt/elasticsearch-${VERSION} /opt/elasticsearch
+  sudo cp -f elasticsearch.yml /opt/elasticsearch/config/
+  
+  rm -Rf elasticsearch-elasticsearch-servicewrapper*
+  tar zxf elasticsearch-servicewrapper.tar.gz
+  sudo mv elasticsearch-elasticsearch-servicewrapper*/service /opt/elasticsearch/bin/
+  sudo cp -f elasticsearch.conf /opt/elasticsearch/bin/service
+  sudo /opt/elasticsearch/bin/service/elasticsearch remove
+  sudo /opt/elasticsearch/bin/service/elasticsearch install
+  sudo chkconfig elasticsearch on
+popd

data/lib/tasks/fluentd.rake

@@ -1,6 +1,3 @@
-# coding: UTF-8
-
-require 'rake'
 require_relative 'task_helper'
 
 namespace :dad do

data/lib/tasks/kibana.rake

@@ -1,4 +1,3 @@
-require 'rake'
 require_relative 'task_helper'
 
 namespace :dad do
@@ -6,10 +5,15 @@ namespace :dad do
 
     desc "Kibanaをインストールします。"
     task :install do
-      FileUtils.mkdir_p(File.join(rails_root, 'tmp'))
+      @options = {
+        :version => ask('version', :default => '3.1.2'),
+        :server => ask('server', :default => 'localhost')
+      }
+      render(task_file('kibana', 'config.js.erb'), :to => 'tmp/config.js')
+      render(task_file('kibana', 'nginx.conf.erb'), :to => 'tmp/nginx/kibana.conf')
 
-      script = File.join(File.dirname(__FILE__), 'kibana', 'install.sh')
-      fail unless system("bash -x #{script}")
+      run "bash -ex #{task_file('kibana', 'configure.sh')} #{@options[:version]}"
+      run "bash -ex #{task_file('kibana', 'install.sh')} #{@options[:version]}" unless ENV['DRY_RUN']
     end
 
   end

data/lib/tasks/kibana/{config.js → config.js.erb}

@@ -6,7 +6,7 @@
  */
 define(['settings'],
 function (Settings) {
-  "use strict";
+  
 
   /** @scratch /configuration/config.js/2
    *
@@ -29,7 +29,7 @@ function (Settings) {
      *  +elasticsearch: {server: "http://localhost:9200", withCredentials: true}+
      *
      */
-    elasticsearch: "https://"+window.location.hostname,
+    elasticsearch: "https://<%= @options[:server] %>",
 
     /** @scratch /configuration/config.js/5
      *
@@ -77,4 +77,4 @@ function (Settings) {
       'sparklines'
     ]
   });
-});
+});

data/lib/tasks/kibana/configure.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+SCRIPT_BASE=`dirname $0`
+VERSION=$1
+
+mkdir -p tmp
+pushd tmp
+  if [ -e kibana-${VERSION}.tar.gz ]; then
+    echo "kibana-${VERSION}.tar.gz はダウンロード済みです。"
+  else
+    wget https://download.elasticsearch.org/kibana/kibana/kibana-${VERSION}.tar.gz
+  fi
+
+  rm -Rf kibana-${VERSION}
+  tar zxf kibana-${VERSION}.tar.gz
+popd

data/lib/tasks/kibana/install.sh

@@ -1,20 +1,11 @@
 #!/bin/bash
 
 SCRIPT_BASE=`dirname $0`
-VERSION="3.1.0"
+VERSION=$1
 
-mkdir -p tmp
-pushd tmp
-  if [ -e kibana-${VERSION}.tar.gz ]; then
-    echo "kibana-${VERSION}.tar.gz はダウンロード済みです。"
-  else
-    wget https://download.elasticsearch.org/kibana/kibana/kibana-${VERSION}.tar.gz
-  fi
+sudo rm -Rf /opt/kibana-${VERSION}
+sudo mv tmp/kibana-${VERSION} /opt/
+sudo ln -snf /opt/kibana-${VERSION} /opt/kibana
 
-  tar zxf kibana-${VERSION}.tar.gz
-  sudo rm -Rf /opt/kibana-${VERSION}
-  sudo mv kibana-${VERSION} /opt/
-  sudo ln -snf /opt/kibana-${VERSION} /opt/kibana
-popd
-
-cp -f ${SCRIPT_BASE}/config.js /opt/kibana/
+cp -f tmp/config.js /opt/kibana/
+sudo cp -f tmp/nginx/kibana.conf /etc/nginx/conf.d/servers/

data/lib/tasks/kibana/nginx.conf.erb

@@ -0,0 +1,57 @@
+#
+# Nginx proxy for Elasticsearch + Kibana
+#
+# In this setup, we are password protecting the saving of dashboards. You may
+# wish to extend the password protection to all paths.
+#
+# Even though these paths are being called as the result of an ajax request, the
+# browser will prompt for a username/password on the first request
+#
+# If you use this, you'll want to point config.js at http://FQDN:80/ instead of
+# http://FQDN:9200
+#
+server {
+  listen 443;
+  server_name           <%= @options[:server] %>;
+  #access_log            /var/log/nginx/kibana.access.log ltsv;
+  ssl_certificate /etc/pki/tls/certs/nginx.pem;
+  ssl_certificate_key /etc/pki/tls/certs/nginx.pem;
+
+  auth_basic "<%= @options[:server] %>";
+  auth_basic_user_file conf.d/.htpasswd;
+
+  location / {
+    root  /opt/kibana;
+    index  index.html  index.htm;
+  }
+
+  location ~ ^/_aliases$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/.*/_aliases$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/_nodes$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/.*/_search$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/.*/_mapping {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+
+  location ~ ^/kibana-int/dashboard/.*$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+  location ~ ^/kibana-int/temp.*$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
+}

data/lib/tasks/task_helper.rb

@@ -18,13 +18,18 @@ def self.template_dir
   File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'templates')
 end
 
+def self.task_file(*path)
+  File.join(File.dirname(__FILE__), *path)
+end
+
 def self.render(template, options = {})
+  FileUtils.mkdir_p(File.dirname(options[:to]))
   File.write(options[:to], ERB.new(File.read(template), 0, '-').result)
 end
 
 def self.ask(prompt, options = {})
   if options[:default]
-    print prompt + "[#{options[:default]}]: "
+    print prompt + " [#{options[:default]}]: "
   else
     print prompt + ": "
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - ichy
@@ -313,7 +313,6 @@ files:
 - lib/daddy/version.rb
 - lib/prefecture.rb
 - lib/sql_builder.rb
-- lib/ssl/cert.pem
 - lib/tasks/app_base_dir.rake
 - lib/tasks/cucumber.rake
 - lib/tasks/cucumber_install.rake
@@ -324,6 +323,10 @@ files:
 - lib/tasks/db_create.rake
 - lib/tasks/db_fixtures.rake
 - lib/tasks/diary.rake
+- lib/tasks/elasticsearch.rake
+- lib/tasks/elasticsearch/elasticsearch.conf.erb
+- lib/tasks/elasticsearch/elasticsearch.yml.erb
+- lib/tasks/elasticsearch/install.sh
 - lib/tasks/fluentd.conf
 - lib/tasks/fluentd.rake
 - lib/tasks/fluentd.repo
@@ -340,8 +343,10 @@ files:
 - lib/tasks/jenkins/jenkins
 - lib/tasks/jenkins/nginx.conf.erb
 - lib/tasks/kibana.rake
-- lib/tasks/kibana/config.js
+- lib/tasks/kibana/config.js.erb
+- lib/tasks/kibana/configure.sh
 - lib/tasks/kibana/install.sh
+- lib/tasks/kibana/nginx.conf.erb
 - lib/tasks/nginx.app.conf.erb
 - lib/tasks/nginx.rake
 - lib/tasks/nginx/nginx.conf.erb
@@ -358,6 +363,7 @@ files:
 - lib/tasks/unicorn.erb
 - lib/tasks/unicorn.rake
 - lib/tasks/unicorn.rb.erb
+- ssl/cert.pem
 - templates/Gemfile.erb
 - templates/app/controllers/controller.rb.erb
 - templates/app/views/_form.html.erb