Commit 58d52b21 authored by Joshua Timberman's avatar Joshua Timberman
Browse files

Merge pull request #19 from retr0h/COOK-2831

[COOK-2831] toggling of high precision timestamps
parents 99115ecf 8a951bbf
...@@ -64,6 +64,8 @@ See `attributes/default.rb` for default values. ...@@ -64,6 +64,8 @@ See `attributes/default.rb` for default values.
* `node['rsyslog']['preserve_fqdn']` - Value of the `$PreserveFQDN` * `node['rsyslog']['preserve_fqdn']` - Value of the `$PreserveFQDN`
configuration directive in `/etc/rsyslog.conf`. Default is 'off' for configuration directive in `/etc/rsyslog.conf`. Default is 'off' for
compatibility purposes. compatibility purposes.
* `node['rsyslog']['high_precision_timestamps']` - Enable high precision
timestamps, instead of the "old style" format. Default is 'false'.
Recipes Recipes
======= =======
......
...@@ -17,16 +17,17 @@ ...@@ -17,16 +17,17 @@
# limitations under the License. # limitations under the License.
# #
default["rsyslog"]["log_dir"] = "/srv/rsyslog" default["rsyslog"]["log_dir"] = "/srv/rsyslog"
default["rsyslog"]["server"] = false default["rsyslog"]["server"] = false
default["rsyslog"]["protocol"] = "tcp" default["rsyslog"]["protocol"] = "tcp"
default["rsyslog"]["port"] = 514 default["rsyslog"]["port"] = 514
default["rsyslog"]["server_ip"] = nil default["rsyslog"]["server_ip"] = nil
default["rsyslog"]["server_search"] = "role:loghost" default["rsyslog"]["server_search"] = "role:loghost"
default["rsyslog"]["remote_logs"] = true default["rsyslog"]["remote_logs"] = true
default["rsyslog"]["per_host_dir"] = "%$YEAR%/%$MONTH%/%$DAY%/%HOSTNAME%" default["rsyslog"]["per_host_dir"] = "%$YEAR%/%$MONTH%/%$DAY%/%HOSTNAME%"
default["rsyslog"]["max_message_size"] = "2k" default["rsyslog"]["max_message_size"] = "2k"
default["rsyslog"]["preserve_fqdn"] = "off" default["rsyslog"]["preserve_fqdn"] = "off"
default["rsyslog"]["high_precision_timestamps"] = false
# The most likely platform-specific attributes # The most likely platform-specific attributes
default["rsyslog"]["service_name"] = "rsyslog" default["rsyslog"]["service_name"] = "rsyslog"
......
...@@ -37,11 +37,13 @@ $UDPServerRun <%= node['rsyslog']['port'] %> ...@@ -37,11 +37,13 @@ $UDPServerRun <%= node['rsyslog']['port'] %>
#### GLOBAL DIRECTIVES #### #### GLOBAL DIRECTIVES ####
########################### ###########################
<% unless node["rsyslog"]["high_precision_timestamps"] -%>
# #
# Use default timestamp format. # Use default timestamp format.
# To enable high precision timestamps, comment out the following line. # To enable high precision timestamps, comment out the following line.
# #
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
<% end -%>
# Filter duplicated messages # Filter duplicated messages
$RepeatedMsgReduction on $RepeatedMsgReduction on
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment