From 20759a7c5c1f0fcd68d9a2652b24fe9e7722c5e5 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 26 Feb 2017 11:22:56 +0000 Subject: [PATCH] starting with elk5 --- installer/data/systemd/elk.service | 2 +- installer/etc/nginx/tpotweb.conf | 6 +++++- installer/usr/share/nginx/html/navbar.html | 4 ++-- installer/usr/share/nginx/html/tpotweb.html | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/installer/data/systemd/elk.service b/installer/data/systemd/elk.service index 62f0b4ed..053a9c86 100644 --- a/installer/data/systemd/elk.service +++ b/installer/data/systemd/elk.service @@ -8,7 +8,7 @@ Restart=always ExecStartPre=-/usr/bin/docker stop elk ExecStartPre=-/usr/bin/docker rm -v elk ExecStartPre=/bin/bash -c '/usr/bin/clean.sh elk' -ExecStart=/usr/bin/docker run --name=elk -v /data:/data -v /var/log:/data/host/log -p 127.0.0.1:64296:5601 -p 127.0.0.1:64298:9200 --rm=true dtagdevsec/elk:latest1610 +ExecStart=/usr/bin/docker run --cap-add=IPC_LOCK --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" --name=elk -v /data:/data -p 127.0.0.1:64296:5601 -p 127.0.0.1:64302:9100 -p 127.0.0.1:64298:9200 --rm=true dtagdevsec/elk:latest1610 ExecStop=/usr/bin/docker stop elk [Install] diff --git a/installer/etc/nginx/tpotweb.conf b/installer/etc/nginx/tpotweb.conf index 28266416..b4990cc2 100644 --- a/installer/etc/nginx/tpotweb.conf +++ b/installer/etc/nginx/tpotweb.conf @@ -113,11 +113,15 @@ server { ### Head plugin location /myhead/ { - proxy_pass http://localhost:64298/; + proxy_pass http://localhost:64302/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header Host $host; + proxy_redirect off; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-NginX-Proxy true; rewrite /myhead/(.*)$ /$1 break; } diff --git a/installer/usr/share/nginx/html/navbar.html b/installer/usr/share/nginx/html/navbar.html index e97eb19b..5d5b7439 100644 --- a/installer/usr/share/nginx/html/navbar.html +++ b/installer/usr/share/nginx/html/navbar.html @@ -10,8 +10,8 @@ Home - Kibana - ES Head Plugin + Kibana + ES Head Plugin UI-For-Docker WebSSH Netdata diff --git a/installer/usr/share/nginx/html/tpotweb.html b/installer/usr/share/nginx/html/tpotweb.html index 5afd0404..6f3a0146 100644 --- a/installer/usr/share/nginx/html/tpotweb.html +++ b/installer/usr/share/nginx/html/tpotweb.html @@ -8,7 +8,7 @@ - +