Align ActionQueue rsyslog params in templates
The changes accepted in fix should be aligned with other templates we use for client.conf and server.conf then installing and configuring rsyslog. Related-bug: #1339659 Change-Id: I9108b0fb992f3dd5a68f3b9d39d78705e243d9fb Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
parent
4b085bfbf7
commit
df3ee5b1c3
@ -26,10 +26,6 @@ $ActionQueueDequeueSlowdown 1000
|
|||||||
$ActionQueueWorkerThreads 2
|
$ActionQueueWorkerThreads 2
|
||||||
$ActionQueueDequeueBatchSize 128
|
$ActionQueueDequeueBatchSize 128
|
||||||
$ActionResumeRetryCount -1
|
$ActionResumeRetryCount -1
|
||||||
$ActionQueueDequeueSlowdown 1000
|
|
||||||
$ActionQueueWorkerThreads 2
|
|
||||||
$ActionQueueDequeueBatchSize 128
|
|
||||||
$ActionResumeRetryCount -1
|
|
||||||
<% if rserver['remote_type'] == 'tcp' -%>
|
<% if rserver['remote_type'] == 'tcp' -%>
|
||||||
# Send messages we receive to master node via tcp
|
# Send messages we receive to master node via tcp
|
||||||
# Use an octet-counted framing (understood for rsyslog only) to ensure correct multiline messages delivery
|
# Use an octet-counted framing (understood for rsyslog only) to ensure correct multiline messages delivery
|
||||||
|
@ -32,6 +32,12 @@ $WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') %>
|
|||||||
$ActionQueueFileName acsdbq
|
$ActionQueueFileName acsdbq
|
||||||
$ActionQueueMaxDiskSpace 1g
|
$ActionQueueMaxDiskSpace 1g
|
||||||
$ActionQueueSaveOnShutdown on
|
$ActionQueueSaveOnShutdown on
|
||||||
|
$ActionQueueLowWaterMark 2000
|
||||||
|
$ActionQueueHighWaterMark 8000
|
||||||
|
$ActionQueueSize 1000000 # Reserve 500Mb memory, each queue element is 512b
|
||||||
|
$ActionQueueDiscardMark 950000 # If the queue looks like filling, start discarding to not block ssh/login/etc.
|
||||||
|
$ActionQueueDiscardSeverity 0 # When in discarding mode discard everything.
|
||||||
|
$ActionQueueTimeoutEnqueue 0 # When in discarding mode do not enable throttling.
|
||||||
$ActionQueueDequeueSlowdown 1000
|
$ActionQueueDequeueSlowdown 1000
|
||||||
$ActionQueueWorkerThreads 2
|
$ActionQueueWorkerThreads 2
|
||||||
$ActionQueueDequeueBatchSize 128
|
$ActionQueueDequeueBatchSize 128
|
||||||
@ -67,7 +73,7 @@ $Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>debug"
|
|||||||
$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>messages"
|
$Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>messages"
|
||||||
|
|
||||||
# Rules
|
# Rules
|
||||||
# Skip duplicates - all common debug, info, notice, warn go to
|
# Skip duplicates - all common debug, info, notice, warn go to
|
||||||
# debug & messages files respectively; others should go to syslog
|
# debug & messages files respectively; others should go to syslog
|
||||||
auth,authpriv.* ?dynAuthLog
|
auth,authpriv.* ?dynAuthLog
|
||||||
*.error;auth,authpriv.none,mail.none,cron.none -?dynSyslog
|
*.error;auth,authpriv.none,mail.none,cron.none -?dynSyslog
|
||||||
|
@ -15,13 +15,4 @@ $MainMsgQueueSaveOnShutdown on
|
|||||||
$MainMsgQueueDequeueSlowdown 1000
|
$MainMsgQueueDequeueSlowdown 1000
|
||||||
$MainMsgQueueWorkerThreads 2
|
$MainMsgQueueWorkerThreads 2
|
||||||
$MainMsgQueueDequeueBatchSize 128
|
$MainMsgQueueDequeueBatchSize 128
|
||||||
$ActionQueueType LinkedList
|
|
||||||
$WorkDirectory <%= scope.lookupvar('rsyslog::params::spool_dir') %>
|
|
||||||
$ActionQueueFileName acsdbq
|
|
||||||
$ActionQueueMaxDiskSpace 1g
|
|
||||||
$ActionQueueSaveOnShutdown on
|
|
||||||
$ActionQueueDequeueSlowdown 1000
|
|
||||||
$ActionQueueWorkerThreads 2
|
|
||||||
$ActionQueueDequeueBatchSize 128
|
|
||||||
$ActionResumeRetryCount -1
|
|
||||||
$SystemLogRateLimitInterval 0 # disable rate limits for rsyslog
|
$SystemLogRateLimitInterval 0 # disable rate limits for rsyslog
|
||||||
|
Loading…
Reference in New Issue
Block a user