Merge branch 'release/0.8.0'

Author: pblittle

Dockerfile

@@ -1,11 +1,9 @@
-FROM ubuntu:14.04
+FROM debian:jessie
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com>
 
-# Download latest package lists
-RUN apt-get update
-
-# Install dependencies
-RUN DEBIAN_FRONTEND=noninteractive \
+# Download latest package lists & install dependencies
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
     apt-get install -yq \
     openjdk-7-jre-headless \
     wget

Makefile

@@ -1,5 +1,5 @@
 NAME = pblittle/docker-logstash
-VERSION = 0.7.1
+VERSION = 0.8.0
 
 # Set the LOGSTASH_CONFIG_URL env var to your logstash.conf file.
 # We will use our basic config if the value is empty.

Procfile

@@ -0,0 +1,26 @@
+#
+# Usage Notes
+# -----------
+#
+# Install Go
+# sudo apt-get install golang
+#
+# Set GOPATH and PATH
+# mkdir $HOME/go
+# export GOPATH=$HOME/go
+# export PATH=$PATH:$GOPATH/bin
+#
+# Download the Go implementation of Foreman
+# go get github.com/mattn/goreman
+#
+# Start Logstash with a linked Elasticsearch container
+# goreman start
+#
+# Get your log on
+# http://<your_kibana_ip>:9292/index.html#/dashboard/file/logstash.json
+
+# Build the Elasticsearch container you are linking to
+elasticsearch: docker run -d --name elasticsearch barnybug/elasticsearch:1.1.1
+
+# Build the Logstash server and link to the new Elasticsearch container
+logstash: docker run -d --link elasticsearch:es -p 9292:9292 -p 9200:9200 pblittle/docker-logstash

README.md

@@ -10,7 +10,9 @@ If you prefer to build from source rather than use the [pblittle/docker-logstash
 
 ## Running Logstash
 
-To run this logstash image, you have to first choose one of three Elasticsearch configuration options.
+### First, choose an Elasticsearch configuration
+
+To run this logstash image, you have to first choose one of three Elasticsearch configurations.
 
  * Use the embedded Elasticsearch server
  * Use a linked container running Elasticsearch
@@ -20,13 +22,21 @@ To run this logstash image, you have to first choose one of three Elasticsearch
 
 To fetch and start a container running logstash and the embedded Elasticsearch server, simply execute:
 
+    $ docker run -d -p 9292:9292 -p 9200:9200 pblittle/docker-logstash
+
+Or, if you are working from the project source directory:
+
     $ make run
 
 ### Use a linked container running Elasticsearch
 
 If you want to link to another container running elasticsearch rather than the embedded server, set the `ES_CONTAINER` environment variable to your existing elasticsearch container name.
 
-    $ export ES_CONTAINER=<your_es_container>
+    $ docker run -d --link <your_es_container_name>:es -p 9292:9292 -p 9200:9200 pblittle/docker-logstash
+
+Or, if you are working from the project source directory:
+
+    $ export ES_CONTAINER=<your_es_container_name>
     $ make run
 
 In addition to the link, if you want your elasticsearch node's `bind_host` and `port` automatically detected, you will need to set the `ES_HOST` and `ES_PORT` placeholders in your `elasticsearch` definition in your logstash config file. For example:
@@ -42,8 +52,8 @@ In addition to the link, if you want your elasticsearch node's `bind_host` and `
 
 If you are using an external elasticsearch server rather than an embedded or linked server, simply set the `ES_HOST` and `ES_PORT` environment variables.
 
-    $ export ES_HOST=<your_es_host>
-    $ export ES_PORT=<your_es_port>
+    $ export ES_HOST=<your_es_server_host>
+    $ export ES_PORT=<your_es_server_port>
     $ make run
 
 ## Logstash configuration