Add Nginx configuration override

Author: tgross

makefile

@@ -10,12 +10,15 @@ PHONY: *
 
 build:
 	docker-compose -f local-compose.yml -p elk build kibana logstash
+	cd nginx && docker build -t="elk_nginx_demo" .
 
 ship:
 	docker tag -f elk_kibana autopilotpattern/kibana
 	docker tag -f elk_logstash autopilotpattern/logstash
+	docker tag -f elk_nginx_demo autopilotpattern/elk-nginx-demo
 	docker push autopilotpattern/kibana
 	docker push autopilotpattern/logstash
+	docker push autopilotpattern/elk-nginx-demo
 
 
 # -------------------------------------------

nginx/Dockerfile

@@ -0,0 +1,2 @@
+FROM autopilotpattern/nginx
+COPY nginx.conf.ctmpl /etc/nginx/

nginx/nginx.conf.ctmpl

@@ -0,0 +1,65 @@
+# This is an example Nginx configuration template file.
+# Adjust the values below as required for your application.
+
+user  nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    {{ if service "kibana" }}
+    upstream backend {
+        # write the address:port pairs for each healthy backend instance
+        {{range service "kibana" }}
+        server {{.Address}}:{{.Port}};
+        {{end}}
+        least_conn;
+    }{{ end }}
+
+    server {
+        listen       80;
+        server_name  _;
+
+        location /health {
+            stub_status;
+            allow 127.0.0.1;
+            deny all;
+        }
+
+        location / {
+            root /usr/share/nginx/html;
+            index index.html index.htm;
+        }
+
+        {{ if service "kibana" }}
+        location /kibana {
+            # strip '/kibana' from the request before passing
+            # it along to the Kibana upstream
+            rewrite ^/kibana(/.*)$ $1 break;
+            proxy_pass http://backend;
+            proxy_redirect off;
+        }{{ end }}
+    }
+}

test.sh

@@ -78,7 +78,6 @@ test() {
 
     echo 'Starting Nginx log source...'
 
-    local consul=$(getPrivateIpPort consul 8500 tcp)
     local logstash=$(getPrivateIpPort logstash $port $protocol)
 
     docker run -d -m 128m -p 80 \
@@ -88,11 +87,11 @@ test() {
            --log-driver=${logtype} \
            --log-opt ${logtype}-address=${protocol}://${logstash} \
            --link ${COMPOSE_PROJECT_NAME}_consul_1:consul \
-           -e CONSUL="${consul}" \
-           -e BACKEND=none \
-           autopilotpattern/nginx
+           -e CONSUL=consul \
+           -e BACKEND=kibana \
+           autopilotpattern/elk-nginx-demo
 
-    poll-for-page "http://$(getPublicUrl nginx-$logtype 80)" \
+    poll-for-page "http://$(getPublicUrl nginx-${logtype} 80)" \
                   'Waiting for Nginx to register as healthy...' \
                   'Opening web page.'
 }