diff --git a/chef/cookbooks/rsyslog/attributes/default.rb b/chef/cookbooks/rsyslog/attributes/default.rb
index 6372c29..bcdcd89 100644
--- a/chef/cookbooks/rsyslog/attributes/default.rb
+++ b/chef/cookbooks/rsyslog/attributes/default.rb
@@ -46,3 +46,4 @@ default["rsyslog"]["keystonelog"] = {:"keystone"=>"/var/log/keystone/keystone.lo
 default["rsyslog"]["messaginglog"] = {:"rabbitmq"=>"/var/log/rabbitmq/rabbit\@#{node['hostname']}.log"}
 default["rsyslog"]["mysqllog"] = {:"mysqld"=>"/var/log/mysqld.log"}
 default["rsyslog"]["debianmysqllog"] = {:"mysqld"=>"/var/log/mysql.log"}
+default["rsyslog"]["sysstatlog"] = {:"dstat"=>"/var/log/dstat.log"}
diff --git a/chef/cookbooks/rsyslog/recipes/client.rb b/chef/cookbooks/rsyslog/recipes/client.rb
index 591f912..abe863a 100644
--- a/chef/cookbooks/rsyslog/recipes/client.rb
+++ b/chef/cookbooks/rsyslog/recipes/client.rb
@@ -19,6 +19,16 @@
 
 include_recipe "rsyslog"
 roles="#{node[:roles]}"
+
+package "dstat" do
+  action :install
+end
+
+execute "dstat" do
+  command "dstat -tcmndp --top-cpu --freespace >>/var/log/dstat.log &"
+  action :run
+end
+
 if roles.gsub("\n",",").strip =~ /os-compute/
   template "/etc/rsyslog.d/nova.conf" do
     source "openstack.conf.erb"
@@ -112,8 +122,18 @@ if roles.gsub("\n",",").strip =~ /os-ops-database/
   end
 end
 
-  file "/etc/rsyslog.d/server.conf" do
-    action :delete
-    notifies :reload, "service[rsyslog]"
-    only_if do ::File.exists?("/etc/rsyslog.d/server.conf") end
-  end
+template "/etc/rsyslog.d/sysstat.conf" do
+  source "openstack.conf.erb"
+  backup false
+  owner "root"
+  group "root"
+  mode 0644
+  variables :loglist => node['rsyslog']['sysstatlog']
+  notifies :restart, "service[rsyslog]"
+end
+
+file "/etc/rsyslog.d/server.conf" do
+  action :delete
+  notifies :reload, "service[rsyslog]"
+  only_if do ::File.exists?("/etc/rsyslog.d/server.conf") end
+end
diff --git a/chef/cookbooks/rsyslog/templates/default/cinder.conf.erb b/chef/cookbooks/rsyslog/templates/default/cinder.conf.erb
deleted file mode 100644
index 83976f4..0000000
--- a/chef/cookbooks/rsyslog/templates/default/cinder.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Modload imfile
-<% @loglist.each do |service, path| -%>
-  # <%= service %>
-  $InputFileName <%= path %>
-  $InputFileReadMode 0
-  $InputFileTag <%= service %>
-  $InputFileSeverity notice
-  $InputFileFacility local4
-  $InputFileStateFile <%= service %>
-  $InputRunFileMonitor
-  $InputFilePollInterval 2
-<% end -%>
diff --git a/chef/cookbooks/rsyslog/templates/default/glance.conf.erb b/chef/cookbooks/rsyslog/templates/default/glance.conf.erb
deleted file mode 100644
index 83976f4..0000000
--- a/chef/cookbooks/rsyslog/templates/default/glance.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Modload imfile
-<% @loglist.each do |service, path| -%>
-  # <%= service %>
-  $InputFileName <%= path %>
-  $InputFileReadMode 0
-  $InputFileTag <%= service %>
-  $InputFileSeverity notice
-  $InputFileFacility local4
-  $InputFileStateFile <%= service %>
-  $InputRunFileMonitor
-  $InputFilePollInterval 2
-<% end -%>
diff --git a/chef/cookbooks/rsyslog/templates/default/keystone.conf.erb b/chef/cookbooks/rsyslog/templates/default/keystone.conf.erb
deleted file mode 100644
index 83976f4..0000000
--- a/chef/cookbooks/rsyslog/templates/default/keystone.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Modload imfile
-<% @loglist.each do |service, path| -%>
-  # <%= service %>
-  $InputFileName <%= path %>
-  $InputFileReadMode 0
-  $InputFileTag <%= service %>
-  $InputFileSeverity notice
-  $InputFileFacility local4
-  $InputFileStateFile <%= service %>
-  $InputRunFileMonitor
-  $InputFilePollInterval 2
-<% end -%>
diff --git a/chef/cookbooks/rsyslog/templates/default/nova.conf.erb b/chef/cookbooks/rsyslog/templates/default/nova.conf.erb
deleted file mode 100644
index 83976f4..0000000
--- a/chef/cookbooks/rsyslog/templates/default/nova.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Modload imfile
-<% @loglist.each do |service, path| -%>
-  # <%= service %>
-  $InputFileName <%= path %>
-  $InputFileReadMode 0
-  $InputFileTag <%= service %>
-  $InputFileSeverity notice
-  $InputFileFacility local4
-  $InputFileStateFile <%= service %>
-  $InputRunFileMonitor
-  $InputFilePollInterval 2
-<% end -%>
diff --git a/chef/cookbooks/rsyslog/templates/default/quantum.conf.erb b/chef/cookbooks/rsyslog/templates/default/quantum.conf.erb
deleted file mode 100644
index 83976f4..0000000
--- a/chef/cookbooks/rsyslog/templates/default/quantum.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Modload imfile
-<% @loglist.each do |service, path| -%>
-  # <%= service %>
-  $InputFileName <%= path %>
-  $InputFileReadMode 0
-  $InputFileTag <%= service %>
-  $InputFileSeverity notice
-  $InputFileFacility local4
-  $InputFileStateFile <%= service %>
-  $InputRunFileMonitor
-  $InputFilePollInterval 2
-<% end -%>