Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docker-kibana-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM devopsil/nginx
ADD default.conf /etc/nginx/conf.d/default.conf
VOLUME /var/log/nginx
4 changes: 4 additions & 0 deletions docker-kibana-proxy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
docker-kibana-proxy
=============

Dockerfile for a container based on nginx to proxy Kibana + ElasticSearch
4 changes: 4 additions & 0 deletions docker-kibana-proxy/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
set -e
pushd $(dirname $0)
docker build -t devopsil/kibana-proxy .
19 changes: 19 additions & 0 deletions docker-kibana-proxy/default.conf
Original file line number Diff line number Diff line change
@@ -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; }
}
3 changes: 2 additions & 1 deletion docker-kibana/run.sh
Original file line number Diff line number Diff line change
@@ -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