diff --git a/files/elasticsearch.conf b/files/elasticsearch.conf
new file mode 100644
index 0000000000000000000000000000000000000000..1f2ae11059d7e4ea2fdd36486ebd04daa77d1bd8
--- /dev/null
+++ b/files/elasticsearch.conf
@@ -0,0 +1,5 @@
+local:
+  host: '127.0.0.1'
+  port: '9200'
+  cluster_health: True
+  cluster_stats: True
diff --git a/tasks/elasticsearch.yml b/tasks/elasticsearch.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6bc6c3509c21c9e7b95b6e168cdab9d72d23dd44
--- /dev/null
+++ b/tasks/elasticsearch.yml
@@ -0,0 +1,10 @@
+---
+# file: roles/netdata/tasks/elasticsearch.yml
+
+- name: "Configure ElasticSearch Plugin"
+  copy:
+    src: 'elasticsearch.conf'
+    dest: '/etc/netdata/python.d/elasticsearch.conf'
+    owner: 'netdata'
+    group: 'netdata'
+    mode: '660'
diff --git a/tasks/main.yml b/tasks/main.yml
index 96b543f24664366233c96e36369cfb2cc0087d6c..62c13446f883471856ec2b4485adfe755bce705d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,6 +16,9 @@
   - include: apache.yml
     when: groups['webserver'] is defined and inventory_hostname in groups['webserver']
 
+  - include: elasticsearch.yml
+    when: groups['logserver'] is defined and inventory_hostname in groups['logserver']
+
   - include: haproxy.yml
     when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']