diff --git a/monitoring/logging/fluentd/introduction/configurations/elastic-fluent.conf b/monitoring/logging/fluentd/introduction/configurations/elastic-fluent.conf
new file mode 100644
index 0000000..1a453f0
--- /dev/null
+++ b/monitoring/logging/fluentd/introduction/configurations/elastic-fluent.conf
@@ -0,0 +1,24 @@
+# This source gets incoming logs over HTTP and sends them to elastic search
+<source>
+  @type http
+  port 9880
+  bind 0.0.0.0
+  body_size_limit 32m
+  keepalive_timeout 10s
+</source>
+
+<match http-*.log>
+  @type elasticsearch
+  host elasticsearch
+  port 9200
+  index_name fluentd
+  type_name fluentd
+</match>
+
+<match file-myapp.log>
+  @type elasticsearch
+  host elasticsearch
+  port 9200
+  index_name fluentd
+  type_name fluentd
+</match>
\ No newline at end of file
diff --git a/monitoring/logging/fluentd/introduction/configurations/fluent.conf b/monitoring/logging/fluentd/introduction/configurations/fluent.conf
index 035fae0..8920e06 100644
--- a/monitoring/logging/fluentd/introduction/configurations/fluent.conf
+++ b/monitoring/logging/fluentd/introduction/configurations/fluent.conf
@@ -1,3 +1,6 @@
+@include elastic-fluent.conf
+################################################################
+
 # This source reads tail of a file
  <source>
   @type tail
diff --git a/monitoring/logging/fluentd/introduction/docker-compose.yaml b/monitoring/logging/fluentd/introduction/docker-compose.yaml
index 7eb3e3b..6c00516 100644
--- a/monitoring/logging/fluentd/introduction/docker-compose.yaml
+++ b/monitoring/logging/fluentd/introduction/docker-compose.yaml
@@ -3,7 +3,9 @@ services:
   fluentd:
     container_name: fluentd
     user: root
-    image: fluent/fluentd:v1.11-debian
+    build:
+      context: .
+    image: fluentd
     volumes:
     - /var/lib/docker/containers:/fluentd/log/containers # Example: Reading docker logs
     - ./file:/app/ #Example: Reading logs from a file
@@ -25,4 +27,23 @@ services:
     volumes:
     - ./file:/app
     command: [ /bin/sh , -c , "apk add --no-cache curl && chmod +x /app/write-file-log.sh && ./app/write-file-log.sh"]
-  
+  elasticsearch: # port 9200
+    image: elasticsearch:7.9.1
+    container_name: elasticsearch
+    environment:
+    - node.name=elasticsearch
+    - cluster.initial_master_nodes=elasticsearch
+    - bootstrap.memory_lock=true
+    - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+  kibana:
+    image: kibana:7.9.1
+    container_name: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+      ELASTICSEARCH_HOSTS: http://elasticsearch:9200
\ No newline at end of file
diff --git a/monitoring/logging/fluentd/introduction/dockerfile b/monitoring/logging/fluentd/introduction/dockerfile
new file mode 100644
index 0000000..2ab00f0
--- /dev/null
+++ b/monitoring/logging/fluentd/introduction/dockerfile
@@ -0,0 +1,5 @@
+FROM fluent/fluentd:v1.11-debian
+
+USER root
+RUN gem install fluent-plugin-elasticsearch
+USER fluent