Skip to content

Commit

Permalink
Merge pull request #189 from axoflow/version/4.8.0
Browse files Browse the repository at this point in the history
Version: 4.8.0
  • Loading branch information
MrAnno authored Jul 10, 2024
2 parents c9b4f99 + e1a67e5 commit 8c07fa1
Show file tree
Hide file tree
Showing 38 changed files with 153 additions and 368 deletions.
331 changes: 89 additions & 242 deletions NEWS.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[![Binary packages](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml)

AxoSyslog started as a syslog-ng [[1]](#r1) fork, branched right after
syslog-ng v4.7.1 with the following focus:
syslog-ng v4.8.0 with the following focus:
* cloud native (containers, helm charts, kubernetes integration),
* security data tailored parsing and transformation (filterx, app-parser, app-transform, etc)
* performance (eBPF, memory allocator, etc),
Expand Down Expand Up @@ -45,7 +45,7 @@ A simple example is to ingest syslog traffic on tcp/514 and write it to a
file:

```
@version: 4.7
@version: 4.8
@include "scl.conf"
log {
Expand Down Expand Up @@ -85,7 +85,7 @@ docker pull ghcr.io/axoflow/axosyslog:nightly
> 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:
>
> ```shell
> docker pull ghcr.io/axoflow/axosyslog:4.7.1
> docker pull ghcr.io/axoflow/axosyslog:4.8.0
> ```
The container images contain a default configuration file which you probably
Expand Down Expand Up @@ -163,7 +163,7 @@ on the [Axoflow website](https://axoflow.com/).
## Difference from syslog-ng
The original founder of syslog-ng forked off AxoSyslog from the original
syslog-ng after the 4.7.1 release. AxoSyslog is a drop in replacement, retaining
syslog-ng after the 4.8.0 release. AxoSyslog is a drop in replacement, retaining
the original license, release schedule and processes.
## Contact and support
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.7.1
4.8.0
2 changes: 1 addition & 1 deletion contrib/openbsd-packaging/syslog-ng.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This should provide behavior similar to OpenBSD's syslog.conf(5).
# 2021-05-24 millert@openbsd.org

@version: 4.7
@version: 4.8
@requires openbsd

options {
Expand Down
4 changes: 2 additions & 2 deletions doc/man/dqtool.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>dqtool</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -117,7 +117,7 @@ Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, sta
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/loggen.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>loggen</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -280,7 +280,7 @@
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
6 changes: 3 additions & 3 deletions doc/man/pdbtool.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>pdbtool</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -377,7 +377,7 @@
</term>
<listitem>
<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>
<para>Default value: <parameter>4.7</parameter></para>
<para>Default value: <parameter>4.8</parameter></para>
</listitem>
</varlistentry>
<varlistentry version="5.0">
Expand Down Expand Up @@ -467,7 +467,7 @@
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/persist-tool.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>persist-tool</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -130,7 +130,7 @@ affile_sd_curpos(/var/aaa.txt) OK</synopsis>
<para><link linkend="syslog-ng.conf.5"> <command>syslog-ng.conf</command>(5)</link></para>
<para><link linkend="syslog-ng.8"> <command>syslog-ng</command>(8)</link></para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/secure-logging.7.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>secure-logging</refentrytitle>
<manvolnum>7</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -190,7 +190,7 @@ AgAAAAAAAAA=:5UVybnKL1EAbgC4CLfd8HpgurjREf4LEN61/yWHSD2hbXjRD4QmQdtbwguT1chzdItK
# entries will be logged to a single file called /var/log/messages.slog
#
@version: 4.7
@version: 4.8
@include "scl.conf"
source s_local {
Expand Down
2 changes: 1 addition & 1 deletion doc/man/slogencrypt.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>slogencrypt</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down
2 changes: 1 addition & 1 deletion doc/man/slogkey.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>slogkey</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down
2 changes: 1 addition & 1 deletion doc/man/slogverify.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>slogverify</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/syslog-ng-ctl.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>syslog-ng-ctl</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -178,7 +178,7 @@ destination;df_facility_dot_err;;a;processed;0</synopsis>
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/syslog-ng-debun.1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>syslog-ng-debun</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -242,7 +242,7 @@
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
6 changes: 3 additions & 3 deletions doc/man/syslog-ng.8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>syslog-ng</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -306,7 +306,7 @@
</indexterm>
</term>
<listitem>
<para>Sets the number of worker threads can use, including the main thread. Note that certain operations in can use threads that are not limited by this option. This setting has effect only when is running in multithreaded mode. Available only in and later. See <command>The 4.7 Administrator Guide</command> for details.</para>
<para>Sets the number of worker threads can use, including the main thread. Note that certain operations in can use threads that are not limited by this option. This setting has effect only when is running in multithreaded mode. Available only in and later. See <command>The 4.8 Administrator Guide</command> for details.</para>
</listitem>
</varlistentry>
</variablelist>
Expand All @@ -326,7 +326,7 @@
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions doc/man/syslog-ng.conf.5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<refmeta>
<refentrytitle>syslog-ng.conf</refentrytitle>
<manvolnum>5</manvolnum>
<refmiscinfo class="version">4.7</refmiscinfo>
<refmiscinfo class="version">4.8</refmiscinfo>
<refmiscinfo class="source"/>
</refmeta>
<refnamediv>
Expand Down Expand Up @@ -461,7 +461,7 @@ log { source(s_localhost); destination(d_tcp); };</synopsis>
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
</para>
<note version="5.0">
<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.7 Administrator Guide</command></link></para>
<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.8 Administrator Guide</command></link></para>
<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>
<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>
</note>
Expand Down
4 changes: 2 additions & 2 deletions docker/apkbuild/axoflow/axosyslog/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Contributor: jv <jens@eisfair.org>
# Maintainer: László Várady <laszlo.varady@axoflow.com>
pkgname=axosyslog
pkgver=4.7.1
pkgver=4.8.0
pkgrel=0
pkgdesc="Next generation logging daemon"
url="https://axoflow.com/docs/axosyslog/"
Expand Down Expand Up @@ -174,5 +174,5 @@ _submv() {
}

sha512sums="
SKIP axosyslog-4.7.1.tar.gz
SKIP axosyslog-4.8.0.tar.gz
"
8 changes: 5 additions & 3 deletions lib/versioning.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
#define VERSION_4_5 "syslog-ng 4.5"
#define VERSION_4_6 "syslog-ng 4.6"
#define VERSION_4_7 "syslog-ng 4.7"
#define VERSION_4_8 "syslog-ng 4.8"

/* VERSION_VALUE_* references versions as integers to be compared against stuff like cfg->user_version */
/* VERSION_STR_* references versions as strings to be shown to the user */
Expand Down Expand Up @@ -193,11 +194,12 @@
#define VERSION_VALUE_4_5 0x0405
#define VERSION_VALUE_4_6 0x0406
#define VERSION_VALUE_4_7 0x0407
#define VERSION_VALUE_4_8 0x0408

/* config version code, in the same format as GlobalConfig->version */
#define VERSION_VALUE_CURRENT VERSION_VALUE_4_7
#define VERSION_STR_CURRENT "4.7"
#define VERSION_PRODUCT_CURRENT VERSION_4_7
#define VERSION_VALUE_CURRENT VERSION_VALUE_4_8
#define VERSION_STR_CURRENT "4.8"
#define VERSION_PRODUCT_CURRENT VERSION_4_8

/* this value points to the last syslog-ng version where we changed the
* meaning of any setting in the configuration file. Basically, it is the
Expand Down
3 changes: 0 additions & 3 deletions news/bugfix-128.md

This file was deleted.

1 change: 0 additions & 1 deletion news/bugfix-129-2.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/bugfix-129.md

This file was deleted.

1 change: 0 additions & 1 deletion news/bugfix-160.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/bugfix-162.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/bugfix-169.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/bugfix-4947.md

This file was deleted.

Loading

0 comments on commit 8c07fa1

Please sign in to comment.