Skip to content

Commit 85e4ecd

Browse files
committed
manpages: further updates
Signed-off-by: Hofi <[email protected]>
1 parent 73b5a37 commit 85e4ecd

13 files changed

+463
-461
lines changed

.github/workflows/jekyll-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
popd
117117
rm -Rf ./_work
118118
119-
# Generate final manpages from the pre-generated special markdown files
119+
# Generate final manpages from the generate_tooltips.rb pre-generated special markdown files
120120
#
121121
echo "Generating manpages"
122122
INPUT_DIRECTORY=./_data/manpages

doc/_admin-guide/190_The_syslog-ng_manual_pages/001_dqtool_manual.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ manid: 1
1111
manname: dqtool
1212
id: adm-man-dqtool
1313
description: >-
14-
dqtool --- Display the contents of a disk-buffer file created with
14+
dqtool - Display the contents of a disk-buffer file created with
1515
{{ site.product.short_name }}.
1616
---
1717

1818
## SYNOPSIS
1919

20-
dqtool [command] [options]
20+
**dqtool [command] [options]**
2121

2222
## DESCRIPTION
2323

@@ -28,16 +28,11 @@ format the messages stored in a disk-buffer file.
2828

2929
## THE CAT COMMAND
3030

31-
```shell
32-
cat [options] [file]
33-
```
31+
**cat [options] [file]**
3432

3533
Use the cat command to display the log messages stored in the
3634
disk-buffer (also called disk-queue) file, and also information from the
37-
header of the disk queue file. The messages are printed to the standard
38-
output (stdout), so it is possible to use grep and other tools to find
39-
particular log messages, for example, **dqtool cat /var/log/messages.lgs
40-
\|grep 192.168.1.1**.
35+
header of the disk queue file.
4136

4237
The cat command has the following options:
4338

@@ -56,26 +51,33 @@ The cat command has the following options:
5651
`--version` or `-V`
5752
Display version information.
5853

59-
### EXAMPLE:
54+
### EXAMPLES
6055

61-
```bash
56+
```shell
6257
dqtool cat ../var/syslog-ng-00000.qf
6358
```
6459

6560
The output looks like:
61+
6662
```config
67-
>Disk-buffer state loaded;
68-
>filename='../var/syslog-ng-00000.qf', qout_length='65', qbacklog_length='0', qoverflow_length='9205', qdisk_length='0'
69-
>Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011630, runid: 1267609923, stamp: 2010-03-03T10:52:05 PADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADD
70-
>Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, stamp: 2010-03-03T10:52:05 PADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADD
63+
Disk-buffer state loaded;
64+
filename='../var/syslog-ng-00000.qf', qout_length='65', qbacklog_length='0', qoverflow_length='9205', qdisk_length='0'
65+
Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011630, runid: 1267609923, stamp: 2010-03-03T10:52:05 PADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADD
66+
Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, stamp: 2010-03-03T10:52:05 PADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADDPADD
7167
```
7268

73-
## THE RELOCATE COMMAND
69+
The messages are printed to the standard
70+
output (stdout), so it is possible to use grep and other tools to find
71+
particular log messages, for example
7472

7573
```shell
76-
relocate [options] [files]
74+
dqtool cat /var/log/messages.lgs | grep 192.168.1.1
7775
```
7876

77+
## THE RELOCATE COMMAND
78+
79+
**relocate [options] [files]**
80+
7981
Use the relocate command to move or rename disk-buffer (also called
8082
disk-queue) files. Note that this option modifies the persist file. Stop
8183
{{ site.product.short_name }} before using this command.
@@ -95,23 +97,23 @@ The relocate command has the following options:
9597
automatically updates the entries of the disk-buffer files in the
9698
persist file.
9799

98-
### EXAMPLES:
100+
### EXAMPLES
99101

100102
Relocate a single queue file:
101103

102-
```bash
104+
```shell
103105
dqtool relocate --new_path /tmp/dq --persist var/syslog-ng.persist /tmp/syslog-ng-00000.rqf
104106
```
105107

106108
Relocate multiple queue files:
107109

108-
```bash
110+
```shell
109111
dqtool relocate --new_path /tmp/dq --persist var/syslog-ng.persist /tmp/syslog-ng-00000.rqf /tmp/syslog-ng-00001.rqf
110112
```
111113

112114
Relocate every queue file:
113115

114-
```bash
116+
```shell
115117
dqtool relocate --new_path /tmp/dq --persist var/syslog-ng.persist --all
116118
```
117119

doc/_admin-guide/190_The_syslog-ng_manual_pages/002_loggen_manual.md

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ id: adm-man-loggen
1111
manid: 1
1212
manname: loggen
1313
description: >-
14-
loggen --- Generate syslog messages at a specified rate
14+
loggen - Generate syslog messages at a specified rate
1515
---
1616

1717
## SYNOPSIS
1818

19-
loggen [options]
20-
21-
target [port]
19+
**loggen [options] target [port]**
2220

2321
## DESCRIPTION
2422

@@ -86,10 +84,11 @@ statistics:
8684
`--interval <seconds>` or `-I <seconds>`
8785
The number of seconds loggen will run. Default value: 10
8886

89-
NOTE: When `--interval` and `--number` are used together, loggen will
90-
send messages until the period set in `--interval` expires or the
91-
amount of messages set in `--number` is reached, whichever happens
92-
first.
87+
**NOTE:** When `--interval` and `--number` are used together, loggen will
88+
send messages until the period set in `--interval` expires or the
89+
amount of messages set in `--number` is reached, whichever happens
90+
first.
91+
{: .notice--info}
9392

9493
`--ipv6` or `-6`
9594
Specify the destination using its IPv6 address. Note that the
@@ -103,10 +102,11 @@ statistics:
103102
`--number <number-of-messages>` or `-n <number-of-messages>`
104103
Number of messages to generate.
105104

106-
NOTE: When `--interval` and `--number` are used together, loggen will
107-
send messages until the period set in `--interval` expires or the
108-
amount of messages set in `--number` is reached, whichever happens
109-
first.
105+
**NOTE:** When `--interval` and `--number` are used together, loggen will
106+
send messages until the period set in `--interval` expires or the
107+
amount of messages set in `--number` is reached, whichever happens
108+
first.
109+
{: .notice--info}
110110

111111
`--no-framing` or `-F`
112112
Do not use the framing of the IETF-syslog protocol style, even if
@@ -123,29 +123,38 @@ statistics:
123123
The number of messages generated per second for every active
124124
connection. Default value: 1000
125125

126-
If you want to change the message rate while loggen is running, send
127-
SIGUSR1 to double the message rate, or SIGUSR2 to halve it:
126+
**NOTE:** If you want to change the message rate while loggen is running, send
127+
SIGUSR1 to double the message rate, or SIGUSR2 to halve it.
128+
For example:
129+
{: .notice--info}
128130

129-
kill `-USR1 <loggen-pid>kill` `-USR2 <loggen-pid>`
131+
```shell
132+
kill -USR1 <loggen-pid>kill -USR2 <loggen-pid>
133+
```
130134

131135
`--read-file <filename>` or `-R <filename>`
132136
Read the messages from a file and send them to the target. See also
133137
the `--skip-tokens` option.
134138
Specify - as the input file to read messages from the standard input
135-
(stdio). Note that when reading messages from the standard input,
136-
loggen can only use a single thread. The -R -parameters must be
137-
placed at end of command, like: loggen 127.0.0.1 1061 `--read-file` -
139+
(stdio).
140+
141+
**NOTE:** When reading messages from the standard input,
142+
loggen can only use a single thread. The -R -parameters must be
143+
placed at end of command, like:
144+
{: .notice--info}
145+
146+
```shell
147+
loggen 127.0.0.1 1061 `--read-file` -
148+
```
138149

139150
`--sdata <data-to-send>` or `-p <data-to-send>`
140151
Send the argument of the `--sdata` option as the `SDATA` part of
141152
IETF-syslog (RFC-5424 formatted) messages. Use it together with the
142-
`--syslog-proto` option.
143-
144-
For example:
153+
`--syslog-proto` option, for example:
145154

146-
```config
147-
--sdata "[test name=\"value\"]
148-
```
155+
```config
156+
--syslog-proto --sdata "[test name=\"value\"]"
157+
```
149158

150159
`--size <message-size>` or `-s <message-size>`
151160
The size of a syslog message in bytes. Default value: 256. Minimum
@@ -165,7 +174,7 @@ statistics:
165174
`--syslog-proto` or `-P`
166175
Use the new IETF-syslog message format. By
167176
default, loggen uses the legacy BSD-syslog message format.
168-
See also the \--no-framing option.
177+
See also the --no-framing option.
169178

170179
`--unix </path/to/socket>` or `-x </path/to/socket>`
171180
Use a UNIX domain socket to send the messages to the target.
@@ -178,45 +187,45 @@ statistics:
178187
`--version` or `-V`
179188
Display version number of syslog-ng.
180189

181-
### EXAMPLES:
190+
### EXAMPLES
182191

183192
The following command generates 100 messages per second for ten minutes,
184193
and sends them to port 2010 of the localhost via TCP. Each message is
185194
300 bytes long.
186195

187-
```bash
196+
```shell
188197
loggen --size 300 --rate 100 --interval 600 127.0.0.1 2010
189198
```
190199

191200
The following command is similar to the one above, but uses the UDP
192201
protocol.
193202

194-
```bash
203+
```shell
195204
loggen --inet --dgram --size 300 --rate 100 --interval 600 127.0.0.1 2010
196205
```
197206

198207
Send a single message on TCP6 to the ::1 IPv6 address, port 1061:
199208

200-
```bash
209+
```shell
201210
loggen --ipv6 --number 1 ::1 1061
202211
```
203212

204213
Send a single message on UDP6 to the ::1 IPv6 address, port 1061:
205214

206-
```bash
215+
```shell
207216
loggen --ipv6 --dgram --number 1 ::1 1061
208217
```
209218

210219
Send a single message using a unix domain-socket:
211220

212-
```bash
221+
```shell
213222
loggen --unix --stream --number 1 </path/to/socket>
214223
```
215224

216225
Read messages from the standard input (stdio) and send them to the
217226
localhost:
218227

219-
```bash
228+
```shell
220229
loggen 127.0.0.1 1061 --read-file -
221230
```
222231

0 commit comments

Comments
 (0)