saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2018.3' into replace-github-dead-link

Browse source
This commit is contained in:
Gareth J. Greenaway 2019-03-22 11:55:43 -07:00 • committed by GitHub
commit a2fbbe05e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
doc/ref/configuration/master.rst
View file

@ -5050,6 +5050,33 @@ This can be used to control logging levels more specifically. See also
:conf_log:`log_granular_levels`.
.. conf_master:: log_rotate_max_bytes
``log_rotate_max_bytes``
------------------------
Default: ``0``
The maximum number of bytes a single log file may contain before it is rotated.
A value of 0 disables this feature. Currently only supported on Windows. On
other platforms, use an external tool such as 'logrotate' to manage log files.
:conf_log:`log_rotate_max_bytes`
.. conf_master:: log_rotate_backup_count
``log_rotate_backup_count``
---------------------------
Default: ``0``
The number of backup files to keep when rotating log files. Only used if
:conf_master:`log_rotate_max_bytes` is greater than 0. Currently only supported
on Windows. On other platforms, use an external tool such as 'logrotate' to
manage log files.
:conf_log:`log_rotate_backup_count`
.. _node-groups:
Node Groups

28
doc/ref/configuration/minion.rst
View file

@ -2940,6 +2940,34 @@ Default: ``{}``
This can be used to control logging levels more specifically. See also
:conf_log:`log_granular_levels`.
.. conf_minion:: log_rotate_max_bytes
``log_rotate_max_bytes``
------------------------
Default: ``0``
The maximum number of bytes a single log file may contain before it is rotated.
A value of 0 disables this feature. Currently only supported on Windows. On
other platforms, use an external tool such as 'logrotate' to manage log files.
:conf_log:`log_rotate_max_bytes`
.. conf_minion:: log_rotate_backup_count
``log_rotate_backup_count``
---------------------------
Default: ``0``
The number of backup files to keep when rotating log files. Only used if
:conf_minion:`log_rotate_max_bytes` is greater than 0. Currently only supported
on Windows. On other platforms, use an external tool such as 'logrotate' to
manage log files.
:conf_log:`log_rotate_backup_count`
.. conf_minion:: zmq_monitor
``zmq_monitor``