diff --git a/.gitignore b/.gitignore
index fce0fd4c959a03147aca015f41ec4e8cd07bd231..3d6b3a0698440d17f142ce0b0c8bfcc22c263dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /modules/
 # Include custom module
 !/modules/logstash_conf
+!/modules/beats_conf
diff --git a/Puppetfile b/Puppetfile
index 2b8030238a2d45f387e2430f1692e94282f07b51..9461d8a29ffc418d20a888238287b19b62031eb8 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -17,6 +17,7 @@ forge 'https://forge.puppet.com'
 #  branch: 'docs_experiment'
 
 mod 'logstash_conf', :local => true
+mod 'beats_conf', :local => true
 
 mod 'puppetlabs-stdlib', '8.1.0'
 mod 'puppetlabs-apt', '8.3.0'
diff --git a/manifests/site.pp b/manifests/site.pp
index e3dc182552607e36a7ce71d7785e14e6ddb700ef..f5642f121247661bb1c2c8a1aa88b814d3c9a61a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -66,6 +66,11 @@ node 'elk-server.openstacklocal' {
     require => Package['heartbeat-elastic'],
   }
 
+  file {'/etc/heartbeat/heartbeat.yml':
+    ensure => present,
+    source => 'puppet:///modules/beat_conf/heartbeat.yml',
+  }
+
   logstash::configfile { 'beats':
       content => 'input { beats { port => 5044 } }',
       path => '/etc/logstash/conf.d/02-beats-input.conf',