Option to preserve FQDN to remote syslog

README.md

@@ -57,6 +57,8 @@ See `attributes/default.rb` for default values.
    not.
 * `node['rsyslog']['max_message_size']` - Specify the maximum allowed
   message size. Default is 2k.
+* `node['rsyslog']['preserve_fqdn']` - Specify if the full host name
+  will be used. Default is off.
 * `node['rsyslog']['user']` - Who should own the configuration files and directories
 * `node['rsyslog']['group']` - Who should group-own the configuration files
   and directories

attributes/default.rb

@@ -26,6 +26,7 @@ default["rsyslog"]["server_search"]    = "role:loghost"
 default["rsyslog"]["remote_logs"]      = true
 default["rsyslog"]["per_host_dir"]     = "%$YEAR%/%$MONTH%/%$DAY%/%HOSTNAME%"
 default["rsyslog"]["max_message_size"] = "2k"
+default["rsyslog"]["preserve_fqdn"]    = "off"
 
 # The most likely platform-specific attributes
 default["rsyslog"]["service_name"]     = "rsyslog"

metadata.rb

@@ -78,6 +78,11 @@ attribute "rsyslog/max_message_size",
   :description => "Specifies the maximum size of allowable Rsyslog messages",
   :default => "2k"
 
+attribute "rsyslog/preserve_fqdn",
+  :display_name => "Preserve FQDN",
+  :description => "Specifies if the short or full host name will be used. The default off setting is more compatible.",
+  :default => "off"
+
 attribute "rsyslog/priv_seperation",
   :display_name => "Privilege separation",
   :description => "Whether or not to make use of Rsyslog privilege separation",

templates/default/rsyslog.conf.erb

@@ -8,6 +8,11 @@
 #
 $MaxMessageSize <%= node['rsyslog']['max_message_size'] %>
 
+#
+# Preserve FQDN
+#
+$PreserveFQDN <%= node['rsyslog']['preserve_fqdn'] %>
+
 #################
 #### MODULES ####
 #################