Merge pull request pblittle#21 from pblittle/feature/build-fixes-and-basic-test

Feature/build fixes and basic test

Author: P. Barrett Little

Dockerfile

@@ -5,7 +5,8 @@ MAINTAINER P. Barrett Little <barrett@barrettlittle.com>
 RUN apt-get update
 
 # Install dependencies
-RUN apt-get install -yq \
+RUN DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
     openjdk-7-jre-headless \
     wget
 
@@ -23,10 +24,10 @@ RUN /opt/logstash/bin/plugin install contrib
 RUN mkdir /app
 ADD . /app
 
-# Elasticsearch HTTP port
+# Elasticsearch HTTP
 EXPOSE 9200
 
-# Elasticsearch transport port
+# Elasticsearch transport
 EXPOSE 9300
 
 # Kibana

Makefile

@@ -3,6 +3,7 @@ VERSION = 0.7.0
 
 # Set the LOGSTASH_CONFIG_URL env var to your logstash.conf file.
 # We will use our basic config if the value is empty.
+#
 LOGSTASH_CONFIG_URL ?= https://gist.github.com/pblittle/8778567/raw/logstash.conf
 
 # This default host and port are for using the embedded elasticsearch
@@ -20,12 +21,12 @@ LF_SSL_CERT_URL ?= https://gist.github.com/pblittle/8994726/raw/insecure-logstas
 
 define docker_run_flags
 -e LOGSTASH_CONFIG_URL=${LOGSTASH_CONFIG_URL} \
--e LF_SSL_CERT_URL=${LF_SSL_CERT_URL} \
--e LF_SSL_CERT_KEY_URL=${LF_SSL_CERT_KEY_URL} \
 -e ES_HOST=${ES_HOST} \
 -e ES_PORT=${ES_PORT} \
--p 9292:9292 \
--v /dev/log:/dev/log
+-e LF_SSL_CERT_URL=${LF_SSL_CERT_URL} \
+-e LF_SSL_CERT_KEY_URL=${LF_SSL_CERT_KEY_URL} \
+-p ${ES_PORT}:${ES_PORT} \
+-p 9292:9292
 endef
 
 ifdef ES_CONTAINER
@@ -40,14 +41,18 @@ build:
 run:
 	docker run -d $(docker_run_flags) --name logstash $(NAME):$(VERSION)
 
+.PHONY: shell
+shell:
+	docker run -t -i --rm $(NAME):$(VERSION) /bin/bash
+
+.PHONY: test
+test:
+	/bin/bash tests/logstash.sh
+
 .PHONY: tag
 tag:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 .PHONY: release
 release:
 	docker push $(NAME)
-
-.PHONY: shell
-shell:
-	docker run -t -i --rm $(NAME):$(VERSION) bash

Vagrantfile

@@ -24,8 +24,6 @@ Vagrant.configure('2') do |config|
 
   config.vm.network :private_network, ip: MACHINE_IP
   config.vm.network :forwarded_port, guest: 9292, host: 9292
-  config.vm.network :forwarded_port, guest: 9200, host: 9200
-  config.vm.network :forwarded_port, guest: 9300, host: 9300
 
   config.vm.synced_folder './', '/vagrant'
 

bin/boot

@@ -8,7 +8,7 @@ set -eo pipefail
 
 LOGSTASH_CONFIG_FILE="/opt/logstash.conf"
 
-# Download default conf is none present
+# Download default conf if none present
 if [ ! -f $LOGSTASH_CONFIG_FILE ]; then
     # Use the LOGSTASH_CONFIG_URL env var to download and use your
     # logstash.conf file.
@@ -20,12 +20,13 @@ if [ ! -f $LOGSTASH_CONFIG_FILE ]; then
         LOGSTASH_CONFIG_URL="https://gist.github.com/pblittle/8778567/raw/logstash.conf"
     fi
 
-    echo "Downloading default configuration file"
+    echo "Downloading default configuration file ..."
     wget $LOGSTASH_CONFIG_URL -O $LOGSTASH_CONFIG_FILE
 
     # This magic will replace ES_HOST and ES_PORT in your logstash.conf
     # file if they exist with the IP and port dynamically generated
     # by docker. Take a look at the readme for more details.
+    #
     # Note: Don't use this on a file mounting using a docker
     # volume, as the inode switch will cause `device or resource busy`
     # Instead download your file as normal
@@ -55,7 +56,7 @@ wget $LF_SSL_CERT_KEY_URL -O $LF_SSL_CERT_KEY_FILE
 
 # Fire up logstash!
 exec /opt/logstash/bin/logstash \
-     agent \
-     --config $LOGSTASH_CONFIG_FILE \
-     -- \
-     web
+    agent \
+    --config $LOGSTASH_CONFIG_FILE \
+    -- \
+    web

tests/logstash.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -eo pipefail
+
+function print_pass()
+{
+    echo "Pass: ${1}"
+}
+
+function print_fail()
+{
+    echo "Fail: ${1}"
+}
+
+port_check=`netstat -an | grep ':9292\|:9200'`
+port_status=$?
+
+if [[ $port_status != 0 || $port_check = '' ]]; then
+    print_fail port_check
+else
+    print_pass port_check
+fi
+
+process_check=`ps -ef | grep 'logstash' | grep -v grep`
+process_status=$?
+
+if [[ $process_status != 0 || $process_check = '' ]]; then
+    print_fail process_check
+else
+    print_pass process_check
+fi
+
+curl_check=`curl -s -S localhost:9200/_nodes?pretty=true`
+curl_status=$?
+
+if [[ $curl_status != 0 || $curl_check = '' ]]; then
+    print_fail curl_check
+else
+    print_pass curl_check
+fi