[COOK-2831] toggling of high precision timestamps

README.md

@@ -64,6 +64,8 @@ See `attributes/default.rb` for default values.
 * `node['rsyslog']['preserve_fqdn']` - Value of the `$PreserveFQDN`
   configuration directive in `/etc/rsyslog.conf`. Default is 'off' for
   compatibility purposes.
+* `node['rsyslog']['high_precision_timestamps']` -  Enable high precision
+  timestamps, instead of the "old style" format.  Default is 'false'.
 
 Recipes
 =======

attributes/default.rb

@@ -17,16 +17,17 @@
 # limitations under the License.
 #
 
-default["rsyslog"]["log_dir"]          = "/srv/rsyslog"
-default["rsyslog"]["server"]           = false
-default["rsyslog"]["protocol"]         = "tcp"
-default["rsyslog"]["port"]             = 514
-default["rsyslog"]["server_ip"]        = nil
-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"
+default["rsyslog"]["log_dir"]                   = "/srv/rsyslog"
+default["rsyslog"]["server"]                    = false
+default["rsyslog"]["protocol"]                  = "tcp"
+default["rsyslog"]["port"]                      = 514
+default["rsyslog"]["server_ip"]                 = nil
+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"
+default["rsyslog"]["high_precision_timestamps"] = false
 
 # The most likely platform-specific attributes
 default["rsyslog"]["service_name"]     = "rsyslog"

templates/default/rsyslog.conf.erb

@@ -37,11 +37,13 @@ $UDPServerRun <%= node['rsyslog']['port'] %>
 #### GLOBAL DIRECTIVES ####
 ###########################
 
+<% unless node["rsyslog"]["high_precision_timestamps"] -%>
 #
 # Use default timestamp format.
 # To enable high precision timestamps, comment out the following line.
 #
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+<% end -%>
 
 # Filter duplicated messages
 $RepeatedMsgReduction on