Skip to content

Commit 63e4b1c

Browse files
Merge pull request #168 from axoflow/doc-fixes-251016
Doc fixes 251016
2 parents 4d0f386 + 5989ceb commit 63e4b1c

File tree

33 files changed

+196
-162
lines changed

33 files changed

+196
-162
lines changed

config/_default/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ description = "Documentation for AxoSyslog, the scalable security data processor
173173
name = "AxoSyslog"
174174
abbrev = "AxoSyslog"
175175
version = "4.18"
176+
# techversion includes patch version number, needed for install/image commands
177+
# configversion is needed in the config file examples
176178
techversion = "4.18.0"
177179
configversion = "4.18"
178180
syslog-ng = "syslog-ng"

content/chapter-configuration-file/configuration-syntax/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ weight: 300
77
Every `syslog-ng.conf` configuration file must begin with a line containing version information. For `syslog-ng` version {{% param "product.version" %}}, this line looks like:
88

99
```shell
10-
@version: {{% param "product.techversion" %}}
10+
@version: {{% param "product.configversion" %}}
1111
```
1212

1313
- If the configuration file does not contain the version information, `syslog-ng` assumes that the file is for version 2.x. In this case it interprets the configuration and sends warnings about the parts of the configuration that should be updated. Version 3.0 and later can operate with configuration files of version 2.x, but the default values of certain parameters have changed since 3.0.
@@ -18,7 +18,7 @@ Every `syslog-ng.conf` configuration file must begin with a line containing vers
1818
The following is a very simple configuration file for `syslog-ng`: it collects the internal messages of `syslog-ng` and the messages from `/dev/log` into the `/var/log/messages_syslog-ng.log` file.
1919

2020
```shell
21-
@version: {{% param "product.techversion" %}}
21+
@version: {{% param "product.configversion" %}}
2222
source s_local {
2323
unix-dgram("/dev/log"); internal();
2424
};

content/chapter-configuration-file/large-configs/config-blocks/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Suppose you are running an application on your hosts that logs into the `/opt/va
4646
Include this file in your main `syslog-ng.conf` configuration file, reference the block, and use it in a logpath:
4747

4848
```shell
49-
@version: {{% param "product.techversion" %}}
49+
@version: {{% param "product.configversion" %}}
5050
@include "<correct/path>/myblocks.conf"
5151
source s_myappsource { myappsource(); };
5252
...

content/chapter-configuration-file/large-configs/including-config-files/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ When including configuration files, consider the following points:
2929
- Include statements can only be used at top level of the configuration file. For example, the following is correct:
3030

3131
```shell
32-
@version: {{% param "product.techversion" %}}
32+
@version: {{% param "product.configversion" %}}
3333
@include "example.conf"
3434

3535
```

content/chapter-destinations/azure-monitor/_index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ linktitle: "azure-monitor: Azure Monitor and Sentinel"
44
weight: 150
55
driver: "azure-monitor()"
66
short_description: "Send messages to Azure Monitor and Sentinel"
7+
type: http
78
---
89
<!-- This file is under the copyright of Axoflow, and licensed under Apache License 2.0, except for using the Axoflow and AxoSyslog trademarks. -->
910

@@ -30,6 +31,9 @@ For details, see the [Tutorial: Send data to Azure Monitor Logs with Logs ingest
3031
The `azure-monitor()` driver sends data to the built-in tables of Azure Monitor. The body of the message (`${MESSAGE}`) must be in JSON format. The keys in the JSON array must have the same names as the columns of the table (you can use [`format-json`]({{< relref "/chapter-manipulating-messages/customizing-message-format/reference-template-functions/_index.md#template-function-format-json" >}}) or ['FilterX`]({{< relref "/filterx/_index.md" >}})). If a field is empty, or Azure cannot parse it, it will be blank. The following example sends data to the [syslog table](https://learn.microsoft.com/en-us/azure/azure-monitor/reference/tables/syslog).
3132

3233
```sh
34+
@include "scl.conf"
35+
# ...
36+
3337
destination d_azure {
3438
azure-monitor(
3539
stream-name("syslog")

content/chapter-destinations/configuring-destinations-redis/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following destination counts the number of log messages received per host.
4141
The following example creates a statistic from Apache webserver logs about the browsers that the visitors use (per minute)
4242

4343
```shell
44-
@version: {{% param "product.techversion" %}}
44+
@version: {{% param "product.configversion" %}}
4545

4646
source s_apache {
4747
file("/var/log/apache2/access.log");

content/chapter-destinations/configuring-destinations-riemann/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For the list of available parameters, see {{% xref "/chapter-destinations/config
2828
The following destination sends the value of the SEQNUM macro (the number of messages sent to this destination) as a metric to the Riemann server.
2929

3030
```shell
31-
@version: {{% param "product.techversion" %}}
31+
@version: {{% param "product.configversion" %}}
3232

3333
source s_network {
3434
network(port(12345));

content/chapter-destinations/configuring-destinations-telegram/_index.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,41 @@ title: "telegram: Send messages to Telegram"
33
weight: 7100
44
driver: "telegram()"
55
short_description: "Send messages to Telegram"
6+
type: http
67
---
78
<!-- DISCLAIMER: This file is based on the syslog-ng Open Source Edition documentation https://github.com/balabit/syslog-ng-ose-guides/commit/2f4a52ee61d1ea9ad27cb4f3168b95408fddfdf2 and is used under the terms of The syslog-ng Open Source Edition Documentation License. The file has been modified by Axoflow. -->
89

910
The `telegram()` destination sends log messages to [Telegram](https://core.telegram.org/ "https://core.telegram.org"), which is a secure, cloud-based mobile and desktop messaging app.
1011

1112
Note that this destination automatically uses the certificate store of the system (for details, see the [curl documentation](https://curl.se/docs/sslcerts.html)).
1213

13-
1414
## Declaration:
1515

1616
```shell
17-
telegram(parameters);
18-
```
17+
@include "scl.conf"
18+
# ...
1919

20+
telegram(parameters);
21+
```
2022

2123
{{% include-headless "chunk/destination-http-proxy-settings.md" %}}
2224

23-
2425
## Example: Using the telegram() driver {#example-destination-mongodb}
2526

2627
The following example creates a `telegram()` destination.
2728

2829
```shell
29-
destination d_telegram {
30-
telegram(
31-
template("${MESSAGE}")
32-
throttle(1)
33-
parse-mode("markdown")
34-
disable-web-page-preview("true")
35-
bot-id("<bot id>")
36-
chat-id("<chat id>")
37-
);
38-
};
30+
@include "scl.conf"
31+
# ...
32+
33+
destination d_telegram {
34+
telegram(
35+
template("${MESSAGE}")
36+
throttle(1)
37+
parse-mode("markdown")
38+
disable-web-page-preview("true")
39+
bot-id("<bot id>")
40+
chat-id("<chat id>")
41+
);
42+
};
3943
```
40-

content/chapter-destinations/crowdstrike-falcon/_index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ linktitle: "logscale: Send messages to Falcon LogScale"
44
weight: 2950
55
driver: "logscale()"
66
short_description: "Send messages to Falcon LogScale"
7+
type: http
78
---
89
<!-- This file is under the copyright of Axoflow, and licensed under Apache License 2.0, except for using the Axoflow and AxoSyslog trademarks. -->
910

@@ -20,6 +21,9 @@ The `logscale()` destination feeds LogScale via the [Ingest Structured Data API]
2021
Minimal configuration:
2122

2223
```sh
24+
@include "scl.conf"
25+
# ...
26+
2327
destination d_logscale {
2428
logscale(
2529
token("your-logscale-ingest-token")

content/chapter-destinations/destination-discord/_index.md

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,52 @@ title: "discord: Send alerts and notifications to Discord"
33
weight: 500
44
driver: "discord()"
55
short_description: "Send alerts and notifications to Discord"
6+
type: http
67
---
78
<!-- DISCLAIMER: This file is based on the syslog-ng Open Source Edition documentation https://github.com/balabit/syslog-ng-ose-guides/commit/2f4a52ee61d1ea9ad27cb4f3168b95408fddfdf2 and is used under the terms of The syslog-ng Open Source Edition Documentation License. The file has been modified by Axoflow. -->
89

910
The `discord()` destination driver sends messages to [Discord](https://discord.com/) using [Discord Webhook](https://discord.com/developers/resources/webhook). For the list of available optional parameters, see Discord destination options.
1011

1112
Available in {{% param "product.abbrev" %}} version 3.33 and later.
1213

13-
1414
## Declaration:
1515

1616
```shell
17-
destination {
18-
discord(url("https://discord.com/api/webhooks/x/y"));
19-
};
17+
@include "scl.conf"
18+
# ...
19+
20+
destination {
21+
discord(url("https://discord.com/api/webhooks/x/y"));
22+
};
2023
```
2124

2225
By default the message sending is throttled to 5 message/sec, see [Discord: Rate Limits](https://discord.com/developers/topics/rate-limits#global-rate-limit). To change this, use the `throttle()` option.
2326

2427
To use this destination, the `scl.conf` file must be included in your {{% param "product.abbrev" %}} configuration:
2528

2629
```shell
27-
@include "scl.conf"
30+
@include "scl.conf"
2831
```
2932

3033
The `discord()` driver is actually a reusable configuration snippet configured to send log messages using the `http()` driver. For details on using or writing such configuration snippets, see Reusing configuration blocks. You can find the source of this configuration snippet on GitHub.
3134

32-
33-
3435
## Prerequisites
3536

3637
To send messages to Discord, you must setup webhooks. For details, see: [Discord: Intro to Webhooks](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks).
3738

38-
39-
4039
## Example: Using the discord() driver {#example-destination-collectd}
4140

4241
The following example sends messages with custom avatar, and text-to-speech enabled.
4342

4443
```shell
45-
@include "scl.conf"
46-
destination d_discord {
47-
discord(
48-
url("https://discord.com/api/webhooks/x/y")
49-
avatar-url("https://example.domain/any_image.png")
50-
username("$HOST-bot") # Custom bot name, accepts macros
51-
tts(true) # Text-to-Speech message
52-
template("${MSG:-[empty message]}") # Message to send, can't be empty
53-
);
54-
ó}
44+
@include "scl.conf"
45+
destination d_discord {
46+
discord(
47+
url("https://discord.com/api/webhooks/x/y")
48+
avatar-url("https://example.domain/any_image.png")
49+
username("$HOST-bot") # Custom bot name, accepts macros
50+
tts(true) # Text-to-Speech message
51+
template("${MSG:-[empty message]}") # Message to send, can't be empty
52+
);
53+
}
5554
```
56-

0 commit comments

Comments
 (0)