This is an automated cherry-pick of pingcap#6372

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

tikv-configuration-file.md

@@ -13,7 +13,11 @@ This document only describes the parameters that are not included in command-lin
 
 ## Global configuration
 
+<<<<<<< HEAD
 ### abort-on-panic <span class="version-mark">New in v5.0.2</span>
+=======
+### `abort-on-panic`
+>>>>>>> f4df9ba2f (TiKV config: add 7 log-related congifurations (#6372))
 
 + Sets whether to call `abort()` to exit the process when TiKV panics. This option affects whether TiKV allows the system to generate core dump files.
 
@@ -22,7 +26,45 @@ This document only describes the parameters that are not included in command-lin
 
 + Default value: `false`
 
-### server
+### `log-level`
+
++ The log level
++ Value options: "trace", "debug", "info", "warning", "error", "critical"
++ Default value: "info"
+
+### `log-file`
+
++ The log file. If this configuration is not set, logs are output to "stderr" by default.
++ Default value: ""
+
+### `log-format`
+
++ The log format
++ Value options: "json", "text"
++ Default value: "text"
+
+### `log-rotation-timespan`
+
++ The timespan between log rotations. When this timespan passes, log files are rotated, that is, a timestamp is appended to the file name of the current log file, and a new file is created.
++ Default value: "24h"
+
+### `log-rotation-size`
+
++ The size of a log file that triggers log rotation. Once the size of a log file is bigger than the specified threshold value, log files are rotated. The old log file is placed into the new file, and the new file name is the old file name with a timestamp suffix.
++ Default value: "300MB"
+
+### `slow-log-file`
+
++ The file to store slow logs
++ If this configuration is not set but `log-file` is set, slow logs are output to the log file specified by `log-file`. If neither `slow-log-file` nor `log-file` are set, all logs are output to "stderr".
++ Default value: ""
+
+### `slow-log-threshold`
+
++ The threshold for outputing slow logs. If the processing time is longer than this threshold, slow logs are output.
++ Default value: "1s"
+
+## server
 
 + Configuration items related to the server
 
@@ -115,7 +157,7 @@ This document only describes the parameters that are not included in command-lin
 
 ### `end-point-slow-log-threshold`
 
-+ The time threshold for a TiDB's push down request to print slow log
++ The time threshold for a TiDB's push-down request to output slow log. If the processing time is longer than this threshold, the slow logs are output.
 + Default value: `"1s"`
 + Minimum value: `0`