diff --git a/README.md b/README.md
index ee3b113..784e9c2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
:information_source: This repo contains questions and exercises on various technical topics, sometimes related to DevOps and SRE :)
-:bar_chart: There are currently **871** questions
+:bar_chart: There are currently **878** questions
:warning: You can use these for preparing for an interview but most of the questions and exercises don't represent an actual interview. Please read [Q&A](common-qa.md) for more details
@@ -400,7 +400,7 @@ You can describe the UI way to add new slaves but better to explain how to do in
How would you implement an option of a starting a build from a certain stage and not from the beginning?
-##### Jenkins Dev
+#### Jenkins Dev
Do you have experience with developing a Jenkins plugin? Can you describe this experience?
@@ -410,6 +410,14 @@ You can describe the UI way to add new slaves but better to explain how to do in
Have you written Jenkins scripts? If yes, what for and how they work?
+#### Jenkins Integration
+
+
+How would you collect logs from Jenkins builds (not master) and display them to user via Kibana? Describe the process, components, etc.
+
+
+
+
## Cloud
@@ -5708,8 +5716,6 @@ HTTP Header Injection vulnerabilities occur when user input is insecurely includ
Explain what is Buffer Overflow
A buffer overflow (or buffer overrun) occurs when the volume of data exceeds the storage capacity of the memory buffer. As a result, the program attempting to write the data to the buffer overwrites adjacent memory locations.
-
-
##### Containers
@@ -6642,6 +6648,7 @@ Below you can find several exercises
* [Writing a Dockerfile and running a container](exercises/write_dockerfile_run_container.md)
* [Elasticsearch & Kibana on AWS](exercises/elk_kibana_aws.md)
+* [ELK & Filebeat](exercises/eflk.md)
* [Ansible, Minikube and Docker](exercises/ansible_minikube_docker.md)
* [Cloud Slack bot](exercises/cloud_slack_bot.md)
* [Jenkins: writing scripts](exercises/jenkins_scripts.md)
diff --git a/exercises/eflk.md b/exercises/eflk.md
new file mode 100644
index 0000000..3c9bbfb
--- /dev/null
+++ b/exercises/eflk.md
@@ -0,0 +1,8 @@
+## ELK + Filebeat
+
+Set up the following using any log you would like:
+
+* Run the following: elasticsearch, logstash, kibana and filebeat (each running in its own containre)
+* Make filebeat transfer a log to logstash for process
+* Once logstash is done, index with elasticsearch
+* Finally, make sure data is available in Kibana
diff --git a/images/jenkins/jenkins-to-kibana.png b/images/jenkins/jenkins-to-kibana.png
new file mode 100644
index 0000000..97e2c87
Binary files /dev/null and b/images/jenkins/jenkins-to-kibana.png differ