diff --git a/manifests/site.pp b/manifests/site.pp
index 6afec75daea7607f29f427e89fc1f2080ad4ff5a..53e00ecb2aa1792b02a459f704ca898496f34084 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -69,26 +69,35 @@ node 'elk-server.openstacklocal' {
   file {'/etc/filebeat/filebeat.yml':
     ensure => present,
     source => 'puppet:///modules/beats_conf/filebeat.yml',
+    require => Package['filebeat'],
+    notify => Service['filebeat'],
   }
 
   package {'filebeat':
     ensure => present,
+#    require => File['/etc/filebeat/filebeat.yml'],
   }
 
   file { '/etc/filebeat/modules.d/nginx.yml':
-      ensure => file,
-      source => '/etc/filebeat/modules.d/nginx.yml.disabled',
+      ensure => link,
+      target => '/etc/filebeat/modules.d/nginx.yml.disabled',
+      require => Package['filebeat'],
+      notify => Service['filebeat'],
   }
 
   file { '/etc/filebeat/modules.d/system.yml':
-      ensure => file,
-      source => '/etc/filebeat/modules.d/system.yml.disabled',
+      ensure => link,
+      target => '/etc/filebeat/modules.d/system.yml.disabled',
+      require => Package['filebeat'],
+      notify => Service['filebeat'],
   }
 
   service {'filebeat':
     ensure => running,
     enable => true,
-    require => Package['filebeat'],
+    # require => File['/etc/filebeat/filebeat.yml'],
+    # require => File['/etc/filebeat/modules.d/system.yml'],
+    # require => File['/etc/filebeat/modules.d/nginx.yml'],
   }