diff --git a/elk/Dockerfile b/elk/Dockerfile
new file mode 100644
index 0000000..0813e95
--- /dev/null
+++ b/elk/Dockerfile
@@ -0,0 +1,4 @@
+FROM sebp/elk
+
+# overwrite existing file
+ADD logback.conf /etc/logstash/conf.d/01-gallerymine.conf
diff --git a/elk/enter_linux.sh b/elk/enter_linux.sh
new file mode 100644
index 0000000..e1d60b1
--- /dev/null
+++ b/elk/enter_linux.sh
@@ -0,0 +1 @@
+screen ~/Library/Containers/com.docker.docker/Data/com.docker.driver.amd64-linux/tty
\ No newline at end of file
diff --git a/elk/logback.conf b/elk/logback.conf
new file mode 100644
index 0000000..13ac3ae
--- /dev/null
+++ b/elk/logback.conf
@@ -0,0 +1,16 @@
+input {
+ file {
+ path => "/mnt/app-logs/*.log"
+ codec => "json"
+ type => "logback"
+ }
+}
+
+output {
+ if [type]=="logback" {
+ elasticsearch {
+ hosts => [ "localhost:9200" ]
+ index => "logback-%{+YYYY.MM.dd}"
+ }
+ }
+}
\ No newline at end of file
diff --git a/elk/setup.sh b/elk/setup.sh
new file mode 100644
index 0000000..9b04b32
--- /dev/null
+++ b/elk/setup.sh
@@ -0,0 +1,8 @@
+echo "From https://elk-docker.readthedocs.io/"
+echo "http://www.baeldung.com/java-application-logs-to-elastic-stack"
+echo "Kibana local: http://localhost:5601/app/kibana#/home/tutorial_directory/logging?_g=()"
+sudo docker pull sebp/elk
+export MAX_MAP_COUNT=262144
+#sudo docker run -p 5601:5601 -p 9200:9200 -p 5044:5044 -it --name elk sebp/elk
+docker build . -t elkgallerymine
+sudo docker-compose up elk
\ No newline at end of file
diff --git a/elk/start.sh b/elk/start.sh
new file mode 100644
index 0000000..a7978f2
--- /dev/null
+++ b/elk/start.sh
@@ -0,0 +1,5 @@
+
+# MAX_MAP_COUNT = 262144
+export MAX_MAP_COUNT = 262144
+sudo docker run -p 5601:5601 -p 9200:9200 -p 5044:5044 -it --name elk sebp/elk
+sudo docker start elk
\ No newline at end of file
diff --git a/ui/web/pom.xml b/ui/web/pom.xml
index 57d2b8b..4ea156d 100644
--- a/ui/web/pom.xml
+++ b/ui/web/pom.xml
@@ -263,6 +263,12 @@
${cucumber.java.version}
test
+
+
+ net.logstash.logback
+ logstash-logback-encoder
+ 4.11
+
diff --git a/ui/web/src/main/resources/logback.xml b/ui/web/src/main/resources/logback.xml
index 0231faa..574a991 100644
--- a/ui/web/src/main/resources/logback.xml
+++ b/ui/web/src/main/resources/logback.xml
@@ -273,7 +273,17 @@
+
+ logs/galleryMine.log
+
+ logs/galleryMine.%d{yyyy-MM-dd}.log
+ 7
+
+
+
+
+