From 37712a288522871b9387e07aa4a044bb321d51b5 Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Thu, 30 Oct 2014 22:20:03 +0200 Subject: [PATCH 1/2] add nginx kibana/elasticsearch proxy container --- docker-kibana-proxy/Dockerfile | 3 +++ docker-kibana-proxy/README.md | 4 ++++ docker-kibana-proxy/build.sh | 4 ++++ docker-kibana-proxy/default.conf | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 docker-kibana-proxy/Dockerfile create mode 100644 docker-kibana-proxy/README.md create mode 100755 docker-kibana-proxy/build.sh create mode 100644 docker-kibana-proxy/default.conf diff --git a/docker-kibana-proxy/Dockerfile b/docker-kibana-proxy/Dockerfile new file mode 100644 index 0000000..34b9603 --- /dev/null +++ b/docker-kibana-proxy/Dockerfile @@ -0,0 +1,3 @@ +FROM devopsil/nginx +ADD default.conf /etc/nginx/conf.d/default.conf +VOLUME /var/log/nginx diff --git a/docker-kibana-proxy/README.md b/docker-kibana-proxy/README.md new file mode 100644 index 0000000..90304f5 --- /dev/null +++ b/docker-kibana-proxy/README.md @@ -0,0 +1,4 @@ +docker-kibana-proxy +============= + +Dockerfile for a container based on nginx to proxy Kibana + ElasticSearch diff --git a/docker-kibana-proxy/build.sh b/docker-kibana-proxy/build.sh new file mode 100755 index 0000000..17275eb --- /dev/null +++ b/docker-kibana-proxy/build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +pushd $(dirname $0) +docker build -t devopsil/kibana-proxy . diff --git a/docker-kibana-proxy/default.conf b/docker-kibana-proxy/default.conf new file mode 100644 index 0000000..cb36b16 --- /dev/null +++ b/docker-kibana-proxy/default.conf @@ -0,0 +1,19 @@ +# +# Nginx proxy for Elasticsearch + Kibana +# +server { + listen 80 default deferred; + + server_name kibana; + access_log /var/log/nginx/kibana.access.log; + + proxy_read_timeout 90; + + location / { proxy_pass http://kibana:5601; } + location ~ ^/_aliases$ { proxy_pass http://elastic:9200; } + location ~ ^/.*/_aliases$ { proxy_pass http://elastic:9200; } + location ~ ^/_nodes$ { proxy_pass http://elastic:9200; } + location ~ ^/.*/_search$ { proxy_pass http://elastic:9200; } + location ~ ^/.*/_mapping { proxy_pass http://elastic:9200; } + location ~ ^/kibana-int/.* { proxy_pass http://elastic:9200; } +} From 3fee1bce8ae7ec2c6dde345966298f3bf89ef03b Mon Sep 17 00:00:00 2001 From: Evgeny Zislis Date: Sat, 13 Dec 2014 00:35:32 +0200 Subject: [PATCH 2/2] forward elasticsearch and kibana ports outside the vm --- Vagrantfile | 7 +------ docker-kibana/run.sh | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index c39bd24..7f283ef 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,9 +1,5 @@ -ENV['VAGRANT_NO_PLUGINS'] = 'true' - VAGRANT_VBOX_MEMORY = ENV.fetch 'VBOX_MEMORY', '2048' VAGRANT_VBOX_CPUS = ENV.fetch 'VBOX_CPUS', '2' -VAGRANT_VBOX_NET = ENV.fetch 'VBOX_NET', '172.16.0.0/24' -VAGRANT_VBOX_IP = ENV.fetch 'VBOX_IP', '172.19.69.15' VAGRANT_VBOX_NAME = ENV.fetch 'VBOX_NAME', 'boot2docker' # don't load any vagrant plugins @@ -12,13 +8,12 @@ ENV['VAGRANT_NO_PLUGINS'] = 'true' Vagrant.configure('2') do |v| v.vm.box = "yungsang/boot2docker" v.vm.box_check_update = false - v.vm.network :private_network, ip: VAGRANT_VBOX_IP + v.vm.network "forwarded_port", guest: 9200, host: 9200 v.vm.provider :virtualbox do |vb| vb.memory = VAGRANT_VBOX_MEMORY vb.cpus = VAGRANT_VBOX_CPUS vb.name = VAGRANT_VBOX_NAME - vb.customize [ "modifyvm", :id, "--natnet1", VAGRANT_VBOX_NET ] end # mount puppet into boot2docker at /vagrant/puppet diff --git a/docker-kibana/run.sh b/docker-kibana/run.sh index 8ac551d..ecf2f30 100755 --- a/docker-kibana/run.sh +++ b/docker-kibana/run.sh @@ -1,4 +1,5 @@ #!/bin/sh # Run ES and dependent kibana docker run -d --name elastic devopsil/elasticsearch:1.4.0beta1 -docker run -d -p 5601:5601 --name kibana --link elastic:elastic -t devopsil/kibana:4.0.0beta1 +docker run -d -p 80:5601 --link elastic:elastic --name kibana devopsil/kibana:4.0.0beta1 +# docker run -d -p 80:80 --name kibana-proxy --link elastic:elastic --link kibana:kibana devopsil/kibana-proxy