Merge "Make sure only monitor the service logs per role."

chef/cookbooks/rsyslog/attributes/default.rb

@@ -22,17 +22,16 @@ default["rsyslog"]["server"]      = false
 default["rsyslog"]["protocol"]    = "tcp"
 default["rsyslog"]["port"]        = "514"
 default["rsyslog"]["server_role"] = "loghost"
-
-default["rsyslog"]["openstacklog"] = {:"keystone"=>"/var/log/keystone/keystone.log",
-                                      :"glance-api"=>"/var/log/glance/api.log",
-                                      :"glance-reg"=>"/var/log/glance/registry.log",
-                                      :"nova-api"=>"/var/log/nova/api.log",
-                                      :"nova-conductor"=>"/var/log/nova/conductor.log",
-                                      :"nova-compute"=>"/var/log/nova/compute.log",
-                                      :"nova-scheduler"=>"/var/log/nova/scheduler.log",
-                                      :"cinder-api"=>"/var/log/cinder/api.log",
-                                      :"cinder-scheduler"=>"/var/log/cinder/scheduler.log",
-                                      :"cinder-volume"=>"/var/log/cinder/volume.log",
-                                      :"quantum-server"=>"/var/log/quantum/server.log",
-                                      :"quantum-dhcp"=>"/var/log/quantum/dhcp-agent.log",
-                                      :"quantum-l3agent"=>"/var/log/quantum/l3-agent.log"}
+default["rsyslog"]["novalog"] = {:"nova-api"=>"/var/log/nova/api.log",                         
+                                 :"nova-conductor"=>"/var/log/nova/conductor.log",
+                                 :"nova-compute"=>"/var/log/nova/compute.log",
+                                 :"nova-scheduler"=>"/var/log/nova/scheduler.log"}
+default["rsyslog"]["glancelog"] = {:"glance-api"=>"/var/log/glance/api.log",
+                                   :"glance-reg"=>"/var/log/glance/registry.log"}
+default["rsyslog"]["cinderlog"] = {:"cinder-api"=>"/var/log/cinder/api.log",
+                                   :"cinder-scheduler"=>"/var/log/cinder/scheduler.log",
+                                   :"cinder-volume"=>"/var/log/cinder/volume.log"}
+default["rsyslog"]["quantumlog"] = {:"quantum-server"=>"/var/log/quantum/server.log",
+                                 :"quantum-dhcp"=>"/var/log/quantum/dhcp-agent.log",
+                                 :"quantum-l3agent"=>"/var/log/quantum/l3-agent.log"}
+default["rsyslog"]["keystonelog"] = {:"keystone"=>"/var/log/keystone/keystone.log"}

chef/cookbooks/rsyslog/recipes/client.rb

@@ -18,15 +18,62 @@
 #
 
 include_recipe "rsyslog"
-  template "/etc/rsyslog.d/openstack.conf" do
+roles="#{node[:roles]}"
+if roles.gsub("\n",",").strip =~ /os-compute/
+  template "/etc/rsyslog.d/nova.conf" do
     source "openstack.conf.erb"
     backup false
     owner "root"
     group "root"
     mode 0644
-    variables :loglist => node['rsyslog']['openstacklog']
+    variables :loglist => node['rsyslog']['novalog']
     notifies :restart, "service[rsyslog]"
   end
+end
+if roles.gsub("\n",",").strip =~ /os-identity/
+  template "/etc/rsyslog.d/keystone.conf" do
+    source "openstack.conf.erb"
+    backup false
+    owner "root"
+    group "root"
+    mode 0644
+    variables :loglist => node['rsyslog']['keystonelog']
+    notifies :restart, "service[rsyslog]"
+  end
+end
+if roles.gsub("\n",",").strip =~ /os-image/
+  template "/etc/rsyslog.d/glance.conf" do
+    source "openstack.conf.erb"
+    backup false
+    owner "root"
+    group "root"
+    mode 0644
+    variables :loglist => node['rsyslog']['glancelog']
+    notifies :restart, "service[rsyslog]"
+  end
+end
+if roles.gsub("\n",",").strip =~ /os-block-storage/
+  template "/etc/rsyslog.d/cinder.conf" do
+    source "openstack.conf.erb"
+    backup false
+    owner "root"
+    group "root"
+    mode 0644
+    variables :loglist => node['rsyslog']['cinderlog']
+    notifies :restart, "service[rsyslog]"
+  end
+end
+if roles.gsub("\n",",").strip =~ /os-network/
+  template "/etc/rsyslog.d/quantum.conf" do
+    source "openstack.conf.erb"
+    backup false
+    owner "root"
+    group "root"
+    mode 0644
+    variables :loglist => node['rsyslog']['quantumlog']
+    notifies :restart, "service[rsyslog]"
+  end
+end
 
   file "/etc/rsyslog.d/server.conf" do
     action :delete

chef/cookbooks/rsyslog/templates/default/openstack.conf.erb

@@ -6,7 +6,7 @@ $Modload imfile
   $InputFileTag <%= service %>
   $InputFileSeverity notice
   $InputFileFacility local4
-  $InputFileStateFile <%= service %> 
+  $InputFileStateFile <%= service %>
   $InputRunFileMonitor
-  $InputFilePollInterval 1
+  $InputFilePollInterval 2
 <% end -%>