Skip to content

Commit 7d80c52

Browse files
authored
Merge pull request #744 from axoflow/version/4.15.0
Version: 4.15.0
2 parents b41049c + 945782c commit 7d80c52

36 files changed

+171
-160
lines changed

NEWS.md

Lines changed: 124 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
4.14.0
1+
4.15.0
22
======
33

44
AxoSyslog is binary-compatible with syslog-ng [1] and serves as a drop-in replacement.
@@ -11,42 +11,144 @@ Check out the [AxoSyslog documentation](https://axoflow.com/docs/axosyslog-core/
1111

1212
## Features
1313

14-
* `cisco-parser()`: Added support for Cisco Nexus NXOS 9.3 syslog format
15-
([#713](https://github.com/axoflow/axosyslog/pull/713))
14+
* `http`: Added templating support to `body-prefix()`
1615

17-
* `loggen`: Added `--client-port` option to set the outbound (client) port
18-
([#709](https://github.com/axoflow/axosyslog/pull/709))
16+
In case of batching the templates in `body-prefix()` will be calculated
17+
from the first message. Make sure to use `worker-partition-key()` to
18+
group similar messages together.
1919

20+
Literal dollar signs (`$`) used in `body-prefix()` must be escaped like `$$`.
2021

21-
## FilterX features
22+
Example usage:
23+
```
24+
http(
25+
...
26+
body-prefix('{"log_type": "$log_type", "entries": [')
27+
body('"$MSG"')
28+
delimiter(",")
29+
body-suffix("]}")
30+
31+
batch-lines(1000)
32+
batch-timeout(1000)
33+
worker-partition-key("$log_type")
34+
);
35+
```
36+
([#731](https://github.com/axoflow/axosyslog/pull/731))
37+
38+
* `cloud-auth()`: Added `scope()` option for `gcp(service-account())`
2239
23-
* `format_xml()` and `format_windows_eventlog_xml()`: new functions added
40+
Can be used for authentications using scope instead of audiance.
41+
For more info, see: https://google.aip.dev/auth/4111#scope-vs-audience
2442
2543
Example usage:
2644
```
27-
$MSG = format_xml({"a":{"b":"foo"}});
45+
http(
46+
...
47+
cloud-auth(
48+
gcp(
49+
service-account(
50+
key("/path/to/secret.json")
51+
scope("https://www.googleapis.com/auth/example-scope")
52+
)
53+
)
54+
)
55+
);
2856
```
29-
([#684](https://github.com/axoflow/axosyslog/pull/684))
57+
([#738](https://github.com/axoflow/axosyslog/pull/738))
3058
59+
* affile: Add ability to refine the `wildcard-file()` `filename-pattern()` option with `exclude-pattern()`, to exclude some matching files. For example, match all `*.log` but exclude `*.?.log`.
60+
([#719](https://github.com/axoflow/axosyslog/pull/719))
3161
32-
## FilterX bugfixes
62+
* bigquery(), google-pubsub-grpc(): add service-account-key option to ADC auth mode
63+
64+
Example usage:
65+
```
66+
destination {
67+
google-pubsub-grpc(
68+
project("test")
69+
topic("test")
70+
auth(adc(service-account-key("absolute path to file")))
71+
);
72+
};
73+
```
74+
75+
Note: File path must be the absolute path.
76+
([#732](https://github.com/axoflow/axosyslog/pull/732))
77+
78+
79+
## Bugfixes
80+
81+
* gRPC based destinations: Gracefully stop if field name is not valid.
82+
([#739](https://github.com/axoflow/axosyslog/pull/739))
83+
84+
* `clickhouse()`: Fixed setting `UINT8` protobuf type.
85+
([#739](https://github.com/axoflow/axosyslog/pull/739))
86+
87+
* `disk-buffer()` metrics: fix showing used buffers as both active and abandoned
88+
([#726](https://github.com/axoflow/axosyslog/pull/726))
89+
90+
91+
## FilterX features
92+
93+
* Add `str_replace()` function
94+
95+
For example:
96+
```
97+
filterx {
98+
dal = "érik a szőlő, hajlik a vessző";
99+
str_replace(dal, "a", "egy") == "érik egy szőlő, hegyjlik egy vessző";
100+
101+
dal = "érik a szőlő, hajlik a vessző";
102+
str_replace(dal, "a", "egy", 1) == "érik egy szőlő, hajlik a vessző";
103+
};
104+
```
105+
([#725](https://github.com/axoflow/axosyslog/pull/725))
106+
107+
* Support string slicing
108+
109+
For example:
110+
```
111+
filterx {
112+
str = "example";
113+
idx = 3;
114+
str[idx..5] == "mp";
115+
str[..idx] == "exa";
116+
str[idx..] == "mple";
117+
};
118+
```
119+
([#720](https://github.com/axoflow/axosyslog/pull/720))
33120
34-
* `metrics_labels()`: Fixed a bug where `update_metrics()` did not omit `null` values.
35-
([#711](https://github.com/axoflow/axosyslog/pull/711))
121+
* Null and error-safe dict elements
36122
123+
For example, the following fields won't be set:
124+
```
125+
$MSG = {
126+
"nullidontwant":?? null,
127+
"erroridontwant":?? nonexistingvar,
128+
};
129+
```
130+
([#736](https://github.com/axoflow/axosyslog/pull/736))
37131
38-
## Other changes
39132
40-
* `syslog-ng-ctl stats prometheus`: show orphan metrics
133+
## FilterX bugfixes
134+
135+
* `format_xml()`: Fixed an occasionally occurring crash
41136
42-
Stale counters will be shown in order not to lose information, for example,
43-
when messages are sent using short-lived connections and metrics are scraped in
44-
minute intervals.
137+
In case the input was not a `dict`, a crash could occour during logging the error.
138+
([#730](https://github.com/axoflow/axosyslog/pull/730))
45139
46-
We recommend using `syslog-ng-ctl stats --remove-orphans` during each configuration reload,
47-
but only after the values of those metrics have been scraped by all scrapers.
48-
([#715](https://github.com/axoflow/axosyslog/pull/715))
140+
* `parse_windows_eventlog_xml()`: Fixed a `Data` misparsing
49141
142+
"<Data Name="key" />" is now parsed correctly, identical to "<Data Name="key"></Data>"
143+
([#722](https://github.com/axoflow/axosyslog/pull/722))
144+
145+
* `format_xml()`, `format_windows_eventlog_xml()`: Fixed escaping in element values
146+
147+
Example:
148+
```
149+
<b> -> &lt;b&gt;
150+
```
151+
([#743](https://github.com/axoflow/axosyslog/pull/743))
50152
51153
52154
[1] syslog-ng is a trademark of One Identity.
@@ -68,5 +170,5 @@ of AxoSyslog, contribute.
68170
69171
We would like to thank the following people for their contribution:
70172
71-
Andras Mitzki, Attila Szakacs, Balazs Scheidler, Hofi, László Várady,
72-
Szilard Parrag, Tamás Kosztyu, shifter, Shiraz McClennon
173+
Andras Mitzki, Attila Szakacs, Balazs Scheidler, László Várady,
174+
Ross Williams, Szilard Parrag, Tamás Kosztyu

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ A simple example is to ingest syslog traffic on tcp/514 and write it to a
4545
file:
4646

4747
```
48-
@version: 4.14
48+
@version: 4.15
4949
@include "scl.conf"
5050
5151
log {
@@ -85,7 +85,7 @@ docker pull ghcr.io/axoflow/axosyslog:nightly
8585
> Note: These named packages are automatically updated when a new AxoSyslog package is released. To install a specific version, run `docker pull ghcr.io/axoflow/axosyslog:<version-number>`, for example:
8686
>
8787
> ```shell
88-
> docker pull ghcr.io/axoflow/axosyslog:4.14.0
88+
> docker pull ghcr.io/axoflow/axosyslog:4.15.0
8989
> ```
9090
9191
The container images contain a default configuration file which you probably

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.14.0
1+
4.15.0

contrib/openbsd-packaging/syslog-ng.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This should provide behavior similar to OpenBSD's syslog.conf(5).
33
# 2021-05-24 millert@openbsd.org
44

5-
@version: 4.14
5+
@version: 4.15
66
@requires openbsd
77

88
options {

doc/man/dqtool.1.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>dqtool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -117,7 +117,7 @@ Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, sta
117117
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
118118
</para>
119119
<note version="5.0">
120-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.14 Administrator Guide</command></link></para>
120+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.15 Administrator Guide</command></link></para>
121121
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
122122
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
123123
</note>

doc/man/loggen.1.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>loggen</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -280,7 +280,7 @@
280280
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
281281
</para>
282282
<note version="5.0">
283-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.14 Administrator Guide</command></link></para>
283+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.15 Administrator Guide</command></link></para>
284284
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
285285
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
286286
</note>

doc/man/pdbtool.1.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>pdbtool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -377,7 +377,7 @@
377377
</term>
378378
<listitem>
379379
<para>A pattern is added to the output pattern database if at least the specified percentage of log messages from the input logfile match the pattern. For example, if the input logfile contains 1000 log messages and the <parameter>--support=3.0</parameter> option is used, a pattern is created only if the pattern matches at least 3 percent of the log messages (that is, 30 log messages). If patternize does not create enough patterns, try to decrease the support value.</para>
380-
<para>Default value: <parameter>4.14</parameter></para>
380+
<para>Default value: <parameter>4.15</parameter></para>
381381
</listitem>
382382
</varlistentry>
383383
<varlistentry version="5.0">
@@ -467,7 +467,7 @@
467467
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
468468
</para>
469469
<note version="5.0">
470-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.14 Administrator Guide</command></link></para>
470+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.15 Administrator Guide</command></link></para>
471471
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
472472
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
473473
</note>

doc/man/persist-tool.1.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>persist-tool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -130,7 +130,7 @@ affile_sd_curpos(/var/aaa.txt) OK</synopsis>
130130
<para><link linkend="syslog-ng.conf.5"> <command>syslog-ng.conf</command>(5)</link></para>
131131
<para><link linkend="syslog-ng.8"> <command>syslog-ng</command>(8)</link></para>
132132
<note version="5.0">
133-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.14 Administrator Guide</command></link></para>
133+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.15 Administrator Guide</command></link></para>
134134
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
135135
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
136136
</note>

doc/man/secure-logging.7.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>secure-logging</refentrytitle>
3232
<manvolnum>7</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -190,7 +190,7 @@ AgAAAAAAAAA=:5UVybnKL1EAbgC4CLfd8HpgurjREf4LEN61/yWHSD2hbXjRD4QmQdtbwguT1chzdItK
190190
# entries will be logged to a single file called /var/log/messages.slog
191191
#
192192
193-
@version: 4.14
193+
@version: 4.15
194194
@include "scl.conf"
195195
196196
source s_local {

doc/man/slogencrypt.1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>slogencrypt</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.14</refmiscinfo>
33+
<refmiscinfo class="version">4.15</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>

0 commit comments

Comments
 (0)