From 773524c189d4518e6c1cbb6b914a6a9a35555fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Sat, 18 May 2024 17:31:40 +0200 Subject: [PATCH 1/2] all: fixup naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- COPYING | 20 ++--- Makefile.am | 2 +- dbld/generate-debian-directory | 2 +- dbld/shell | 2 +- docker/python-modules/webhook/source.py | 2 +- modules/python-modules/README.md | 100 ++++++++++++------------ scl/discord/discord.conf | 2 +- scl/elasticsearch/elastic-http.conf | 2 +- scl/elasticsearch/elastic-java.conf | 2 +- scl/google/google-pubsub.conf | 4 +- scl/logscale/logscale.conf | 2 +- scl/openobserve/openobserve.conf | 4 +- scl/opensearch/opensearch.conf | 2 +- scl/slack/slack.conf | 2 +- scl/snmptrap/snmptrapd-source.conf | 2 +- scl/splunk/splunk.conf | 8 +- scl/sumologic/sumologic.conf | 2 +- scl/telegram/telegram.conf | 2 +- 18 files changed, 81 insertions(+), 81 deletions(-) diff --git a/COPYING b/COPYING index 92630933ab..8d714fd857 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Copyright (c) 2002-2015 Balabit Copyright (c) 1996-2015 Balázs Scheidler Copyright (c) 2023-2024 Axoflow -syslog-ng is licensed under the combination of the GPL and LGPL licenses. +AxoSyslog is licensed under the combination of the GPL and LGPL licenses. Our intention with the choice of our licenses is to: 1) license reusable/extendable code under the LGPL, @@ -21,7 +21,7 @@ Alternatively, you can also use the contents of the `tests/copyright/policy` file, this is an input to our automated test suite that checks licenses against our intents. -The syslog-ng core contained in the following subdirectories +The AxoSyslog core contained in the following subdirectories is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -35,7 +35,7 @@ syslog-ng-ctl/ persist-tool/ tests/loggen/ -The syslog-ng modules (modules/, docker/, charts/, and scl/ subdirectories, +The AxoSyslog modules (modules/, docker/, charts/, and scl/ subdirectories, except the ones that declare LGPL-2.1-or-later in their license notices) is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the @@ -48,8 +48,8 @@ FAQ: The questions and answers below try to summarize the intentions behind this licensing scheme. -Q: Is it possible to create derived works of syslog-ng under the GPL/LGPL -licenses? +Q: Is it possible to create derived works of AxoSyslog/syslog-ng under the +GPL/LGPL licenses? A: Yes, that's exactly the point of open source. Works derived from the plugins will have to use the GPL license, but you can choose to use LGPL for @@ -61,16 +61,16 @@ contribution to be accepted? A: No, starting with syslog-ng 3.2, you don't need to sign a CLA in order to have your contributions accepted. -Q: Is it possible to create non-free plugins for syslog-ng? +Q: Is it possible to create non-free plugins for AxoSyslog/syslog-ng? A: Yes. It is our understanding that plugins are derived works of the -syslog-ng core but not derived works of other plugins. Thus, non-free +AxoSyslog core but not derived works of other plugins. Thus, non-free plugins are possible, provided they do not link to any of the GPLd plugins -explicitly and the only connection between two plugins is via the syslog-ng +explicitly and the only connection between two plugins is via the AxoSyslog core. -Q: Who is permitted to create non-free plugins for syslog-ng? Is it just -BalaBit (the current copyright holder as of the initial 3.2 release)? +Q: Who is permitted to create non-free plugins for AxoSyslog/syslog-ng? +Is it just BalaBit (the current copyright holder as of the initial 3.2 release)? A: No, everyone including BalaBit. diff --git a/Makefile.am b/Makefile.am index 9d2f571b5f..a23fd0a375 100644 --- a/Makefile.am +++ b/Makefile.am @@ -219,7 +219,7 @@ style-format: $(top_srcdir)/scripts/style-checker.sh format $(top_srcdir) help: - @echo "Welcome to the syslog-ng build system!" + @echo "Welcome to the AxoSyslog build system!" @echo @echo "All of the standard targets are available:" @echo " all, check, install, dist, distcheck, and clean" diff --git a/dbld/generate-debian-directory b/dbld/generate-debian-directory index d7f966c7a3..3bad257661 100755 --- a/dbld/generate-debian-directory +++ b/dbld/generate-debian-directory @@ -7,7 +7,7 @@ MODE=$1 cp -r /source/packaging/debian . if [ $MODE = "snapshot" ]; then echo "Generating snapshot version in debian/" - DEBEMAIL="dev@null" DEBFULLNAME="syslog-ng snapshot" debchange --force-bad-version --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}" + DEBEMAIL="dev@null" DEBFULLNAME="axosyslog snapshot" debchange --force-bad-version --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}" elif [ $MODE = "release" ]; then echo "Validating if your debian/ directory matches current version" DEB_VERSION=`dpkg-parsechangelog -S Version | cut -d - -f1` diff --git a/dbld/shell b/dbld/shell index 4d452054f9..eebd204000 100755 --- a/dbld/shell +++ b/dbld/shell @@ -1,6 +1,6 @@ #!/bin/bash -echo -e "\n\nWelcome to the syslog-ng developer's shell... ($IMAGE_PLATFORM)\n" +echo -e "\n\nWelcome to the AxoSyslog developer's shell... ($IMAGE_PLATFORM)\n" echo -e "You can find the source in /source, you can build the source using:\n" echo -e "\t\$ cd /build" diff --git a/docker/python-modules/webhook/source.py b/docker/python-modules/webhook/source.py index 29d0613d65..22bcadda48 100644 --- a/docker/python-modules/webhook/source.py +++ b/docker/python-modules/webhook/source.py @@ -66,7 +66,7 @@ def _construct_msg(self, request, path_arguments) -> LogMessage: return msg def set_default_headers(self) -> None: - self.set_header("Server", "syslog-ng"); + self.set_header("Server", "axosyslog"); def get_current_user(self): if not self.source.auth_token: diff --git a/modules/python-modules/README.md b/modules/python-modules/README.md index 08495bed70..79afc4eb54 100644 --- a/modules/python-modules/README.md +++ b/modules/python-modules/README.md @@ -1,13 +1,13 @@ -# syslog-ng Python modules +# AxoSyslog Python modules -syslog-ng has a quite comprehensive support for implementing various logging +AxoSyslog has a quite comprehensive support for implementing various logging components in Python. The goal of this file is to document how to use this functionality. ## When to use Python These Python bindinds are useful if the facilities provided by the -syslog-ng configuration language is not sufficient, that is: +AxoSyslog configuration language is not sufficient, that is: * if there's no native functionality that would implement the integration with a specific service (e.g. API based log sources or information sources that @@ -20,7 +20,7 @@ syslog-ng configuration language is not sufficient, that is: While Python is very powerful and you can produce clean and production ready solutions using it, the drawback is usually performance. Python code tends -to be slower than the native functionality that syslog-ng provides. +to be slower than the native functionality that AxoSyslog provides. To offset this impact of performance degradation, it's a good strategy to only process a subset of the incoming log stream via Python code and to use @@ -30,10 +30,10 @@ Python code. ## Creating and Storing the Python code -syslog-ng is able to work with both Python code directly embedded into its +AxoSyslog is able to work with both Python code directly embedded into its main configuration file or to work with Python modules. -### Embedding Python into syslog-ng configuration +### Embedding Python into AxoSyslog configuration You can simply use a top-level `python {}` block to embed your Python code, @@ -58,7 +58,7 @@ log { ### Using Python modules You can also put your code into a proper Python module and then use it -from there. syslog-ng automatically adds `${sysconfdir}/python` to your +from there. AxoSyslog automatically adds `${sysconfdir}/python` to your PYTHONPATH (normally `/etc/syslog-ng/python`), with that in mind add the following code to `/etc/syslog-ng/python/mytemplate.py`: @@ -68,8 +68,8 @@ def template_function(msg): return b"Hello World from Python! Original message: " + msg['MSGHDR'] + msg['MESSAGE'] ``` -The Python glue in syslog-ng will automatically import modules when it -encounters an identifier in dotted notation, so if you use this syslog-ng +The Python glue in AxoSyslog will automatically import modules when it +encounters an identifier in dotted notation, so if you use this AxoSyslog config: ``` @@ -81,16 +81,16 @@ log { }; ``` -syslog-ng would recognize that `mytemplate.template_function` is a qualified +AxoSyslog would recognize that `mytemplate.template_function` is a qualified name and would attempt to import `mytemplate` as a module and then look up `template_function` within that module. Please note that modules are only imported once, e.g. you will need to -restart syslog-ng for a change to take effect. +restart AxoSyslog for a change to take effect. -### syslog-ng reload and Python +### AxoSyslog reload and Python -When you reload syslog-ng (with syslog-ng-ctl reload or systemctl reload +When you reload AxoSyslog (with syslog-ng-ctl reload or systemctl reload syslog-ng) then the `python` block in your configuration is reloaded along with the rest of the configuration file. @@ -101,12 +101,12 @@ reloads in your `python {}` block. The same behaviour is however not the case with code you import from modules. Modules are only imported once and kept across reloads, even if the -syslog-ng configuration is reloaded in the meanwhile. +AxoSyslog configuration is reloaded in the meanwhile. This means that global state can be stored in modules and they will be kept, -even as syslog-ng reinitializes the configuration. +even as AxoSyslog reinitializes the configuration. -In case you want to reload a module every time syslog-ng config is +In case you want to reload a module every time AxoSyslog config is reinitialized, you need to do this explicitly with a code similar to this: ```python @@ -115,7 +115,7 @@ python { import mymodule import importlib -# reload mymodule every time syslog-ng reloads +# reload mymodule every time AxoSyslog reloads importlib.reload(mymodule) }; @@ -143,7 +143,7 @@ The interface of the `LogDestination` class is documented in the `modules/python/pylib/syslogng/dest.py` of the source tree. Once all required methods are implemented, you can use this using the -"python" destination in the syslog-ng configuration language. +"python" destination in the AxoSyslog configuration language. ``` destination whatever { @@ -159,11 +159,11 @@ production deployment. ### Template Function plugin -Template functions extend the syslog-ng template language. They get a +Template functions extend the AxoSyslog template language. They get a `LogMessage` object and return a string which gets embedded into the output of the template. -You can have syslog-ng call a Python function from the template language +You can have AxoSyslog call a Python function from the template language using the `$(python)` template function, as you have seen in the previous chapter. @@ -217,7 +217,7 @@ There are two kinds of source plugins that can be implemented in Python: (a) `syslogng.source` module. The main entry point that you will need to implement for a `LogFetcher` -class is the `fetch()` method, which is automatically invoked by syslog-ng, +class is the `fetch()` method, which is automatically invoked by AxoSyslog, whenever it is able to consume incoming messages. ``` @@ -254,7 +254,7 @@ method. As you can see we were sleeping 1 second between invocations of our method, thereby limiting the rate the source is producing messages. If that sleep wasn't there, we would be producing somewhere between 100-110k messages per second, depending on the speed of your CPU, the performance of -the Python interpreter and the syslog-ng core. +the Python interpreter and the AxoSyslog core. Usually, when our fetcher would be connecting to an external API, the sleep would not be needed and the response times of the API would be the limiting @@ -264,14 +264,14 @@ factor. Usually, if we are fetching messages from an API, we will need to keep track where we are in fetching messages. If we were to store the position in a -variable, that value would be lost when syslog-ng is reloaded or restarted +variable, that value would be lost when AxoSyslog is reloaded or restarted (depending on where we store that variable, in our `python {}` block or in a module). -A better option is to use the `Persist()` class that ties into syslog-ng's +A better option is to use the `Persist()` class that ties into AxoSyslog's own persistent state handling functionality. This allows you to store variables persisted in a file that gets stored in -`${localstatedir}/syslog-ng.persist` along with the rest of syslog-ng's +`${localstatedir}/syslog-ng.persist` along with the rest of AxoSyslog's states. ```python @@ -301,13 +301,13 @@ them (using an `mmap()`-ped file), so no need to care about committing them to disk explicitly. Albeit you can store position information in a `Persist()` entry, it's not -always the best choice. In syslog-ng, producing of messages and their +always the best choice. In AxoSyslog, producing of messages and their delivery is decoupled: sometimes a message is still in-flight for a while before being delivered. This time can be significant, if a destination consumes messages at a slow rate. In this case, if you store the position once fetched, the message would still be sitting in a queue waiting to be delivered. If the queue is not backed by disk (e.g. disk-buffer), then these -messages would be lost, once syslog-ng is restarted. +messages would be lost, once AxoSyslog is restarted. To anticipate this case, you will need to use bookmarks, as described in the next section. @@ -327,18 +327,18 @@ indicating the position of each journal record. The cursor can then be used to restart the reading of the log stream. Once you identified what mechanism the source offers that would map to the -bookmark concept, you can decide how you want syslog-ng to track these +bookmark concept, you can decide how you want AxoSyslog to track these bookmarks. -Which one you will need from syslog-ng's selection of bookmark +Which one you will need from AxoSyslog's selection of bookmark tracking strategies is again up to the API specifics. Sometimes an API is sequential in nature, thus you can only acknowledge the "last fetch position" in that sequence. In other cases the API allows you -to acknowledge messages individually. These are both supported by syslog-ng. +to acknowledge messages individually. These are both supported by AxoSyslog. But first, here's a Python example that only updates the current position in -a source stream when the messages in sequence were acknowledged by syslog-ng +a source stream when the messages in sequence were acknowledged by AxoSyslog destinations (e.g. they were properly sent). ```python @@ -355,7 +355,7 @@ class MyFetcher(LogFetcher): return True def message_acked(self, acked_message_bookmark): - # update current persisted position when syslog-ng delivered the + # update current persisted position when AxoSyslog delivered the # message, but only then. self.persist['position'] = acked_message_bookmark @@ -378,7 +378,7 @@ class MyFetcher(LogFetcher): As mentioned some APIs will provide simple others somewhat more complex ways to track messages that are processed. There are three strategies within -syslog-ng to cope with them. +AxoSyslog to cope with them. * instant tracking (`InstantAckTracker`): messages are considered delivered as soon as our destination driver (or the disk based queue) acknowledges @@ -498,12 +498,12 @@ a `Dict[str, bool]`, for example: } ``` -### Creating a syslog-ng LogSource based Source plugin +### Creating a AxoSyslog LogSource based Source plugin While `LogFetcher` gives us a convinient interface for fetching messages from backend services via blocking APIs, it is limited to performing the fetching operation in a sequential manner: you fetch a batch of messages, feed the -syslog-ng pipeline with those messages and then repeat. +AxoSyslog pipeline with those messages and then repeat. `LogSource` is more low-level but allows the use of an asynchronous framework (`asyncio`, etc) to perform message fetching along multiple threads of @@ -514,7 +514,7 @@ one is generated every second, the other is every 1.5 seconds, running concurrently via an `asyncio` event loop. It is also pretty easy to create a source that implements a HTTP server, -and which injects messages coming via HTTP to the syslog-ng pipeline. +and which injects messages coming via HTTP to the AxoSyslog pipeline. ```python @@ -562,7 +562,7 @@ destination whatever { }; ``` -while this works, this syntax is a bit foreign from a syslog-ng perspective +while this works, this syntax is a bit foreign from a AxoSyslog perspective and somewhat hard to read. The usual syntax for referencing regular drivers is something like this: @@ -572,7 +572,7 @@ destination whatever { }; ``` -To make the syntax more native, you can use syslog-ng's block functionality +To make the syntax more native, you can use AxoSyslog's block functionality to wrap your Python driver, hide that it's actually Python and provide a syntax to users of your code that is more convinient to use. @@ -590,17 +590,17 @@ fact that the implementation is Python based, concentrating on functionality. You should add this wrapper to your Python module in an "scl" subdirectory -as a file with a .conf extension. syslog-ng will automatically include these +as a file with a .conf extension. AxoSyslog will automatically include these files along the rest of the SCL. -## Adding the code to syslog-ng +## Adding the code to AxoSyslog -To add Python based modules to syslog-ng, create a Python package (e.g. a +To add Python based modules to AxoSyslog, create a Python package (e.g. a directory with `__init__.py` and anything that file references). Add these files to `modules/python-modules/` and open a pull request. With that a "make install" command should install your module along the -rest of the syslog-ng binaries. +rest of the AxoSyslog binaries. You will also need to add your files to the source tarball by listing them in the EXTRA_DIST variable of the `modules/python-modules/Makefile.am` file. @@ -619,13 +619,13 @@ In rpm this means adding the right package as a Requires line in the .spec file. If you would like to use pip/requirements.txt to deploy dependencies, you -can choose to: invoke pip at "make install" time so that syslog-ng's private +can choose to: invoke pip at "make install" time so that AxoSyslog's private Python directory would contain all the dependencies that you require. -## Adding Python code to syslog-ng deb package +## Adding Python code to AxoSyslog deb package -To add your module to the syslog-ng deb package, create a new file in -`packaging/debian/` with a name like `syslog-ng-mod-.install`. +To add your module to the AxoSyslog deb package, create a new file in +`packaging/debian/` with a name like `axosyslog-mod-.install`. Populate this file with wildcard patterns that capture the files of your package after installation. @@ -638,10 +638,10 @@ usr/lib/syslog-ng/python/syslogng/modules//* You will also need to add an entry to `packaging/debian/control`: ``` -Package: syslog-ng-mod- +Package: axosyslog-mod- Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, syslog-ng-core (>= ${source:Version}), syslog-ng-core (<< ${source:Version}.1~), syslog-ng-mod-python +Depends: ${shlibs:Depends}, ${misc:Depends}, axosyslog-core (>= ${source:Version}), axosyslog-core (<< ${source:Version}.1~), axosyslog-mod-python Description: The short description of the package This is a longer description with dots separating paragraphs. . @@ -651,10 +651,10 @@ Description: The short description of the package Make sure that your .install file is included in the tarball by adding it to EXTRA_DIST in the Makefile.am -## Adding Python code to syslog-ng RPM package +## Adding Python code to AxoSyslog RPM package The RPM package is less modular than the Debian one and it automatically -captures all Python modules in the `syslog-ng-python` package without having +captures all Python modules in the `axosyslog-python` package without having to list them explicitly. If you need to customize installation, you can find our spec file in diff --git a/scl/discord/discord.conf b/scl/discord/discord.conf index a6758bd4be..15908760d1 100644 --- a/scl/discord/discord.conf +++ b/scl/discord/discord.conf @@ -39,7 +39,7 @@ block destination discord( ...) { -@requires http "The discord() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The discord() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url('`url`') diff --git a/scl/elasticsearch/elastic-http.conf b/scl/elasticsearch/elastic-http.conf index 107c82b3ed..ca5f649d5c 100644 --- a/scl/elasticsearch/elastic-http.conf +++ b/scl/elasticsearch/elastic-http.conf @@ -36,7 +36,7 @@ block destination elasticsearch-http( ...) { -@requires http "The elasticsearch-http() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The elasticsearch-http() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url(`url`) diff --git a/scl/elasticsearch/elastic-java.conf b/scl/elasticsearch/elastic-java.conf index e9db6e2665..7c7272f9fc 100644 --- a/scl/elasticsearch/elastic-java.conf +++ b/scl/elasticsearch/elastic-java.conf @@ -51,7 +51,7 @@ block destination elasticsearch2( ) { -@requires mod-java "The elasticsearch2() driver depends on the syslog-ng java module, please install the syslog-ng-mod-java (Debian & derivatives) or the syslog-ng-java (RHEL & co) package" +@requires mod-java "The elasticsearch2() driver depends on the AxoSyslog java module, please install the axosyslog-mod-java (Debian & derivatives) or the axosyslog-java (RHEL & co) package" java( diff --git a/scl/google/google-pubsub.conf b/scl/google/google-pubsub.conf index 713f15fe8f..e55210cb52 100644 --- a/scl/google/google-pubsub.conf +++ b/scl/google/google-pubsub.conf @@ -38,8 +38,8 @@ block destination google_pubsub( ...) { -@requires http "The google-pubsub() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" -@requires cloud_auth "The google-pubsub() driver depends on the syslog-ng Cloud Auth module, please install the syslog-ng-mod-cloud-auth (Debian & derivatives) or the syslog-ng-cloud-auth (RHEL & co) package" +@requires http "The google-pubsub() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" +@requires cloud_auth "The google-pubsub() driver depends on the AxoSyslog Cloud Auth module, please install the axosyslog-mod-cloud-auth (Debian & derivatives) or the axosyslog-cloud-auth (RHEL & co) package" http( url("`service_endpoint`/v1/projects/`project`/topics/`topic`:publish") diff --git a/scl/logscale/logscale.conf b/scl/logscale/logscale.conf index 74204ec491..b76baf3219 100644 --- a/scl/logscale/logscale.conf +++ b/scl/logscale/logscale.conf @@ -47,7 +47,7 @@ block destination logscale( ...) { -@requires http "The logscale() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The logscale() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url("`url`/api/v1/ingest/humio-structured") diff --git a/scl/openobserve/openobserve.conf b/scl/openobserve/openobserve.conf index a139074ba6..c41576efb8 100644 --- a/scl/openobserve/openobserve.conf +++ b/scl/openobserve/openobserve.conf @@ -41,7 +41,7 @@ block destination openobserve-log( ...) { -@requires http "The openobserve-log() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The openobserve-log() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url("`url`:`port`/api/`organization`/`stream`/_json") @@ -58,4 +58,4 @@ block destination openobserve-log( body("$(format-json --scope none `record`)") `__VARARGS__` ); -}; \ No newline at end of file +}; diff --git a/scl/opensearch/opensearch.conf b/scl/opensearch/opensearch.conf index 7a600f837c..1ad6757f50 100644 --- a/scl/opensearch/opensearch.conf +++ b/scl/opensearch/opensearch.conf @@ -37,7 +37,7 @@ block destination opensearch( ...) { -@requires http "The opensearch() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The opensearch() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url(`url`) diff --git a/scl/slack/slack.conf b/scl/slack/slack.conf index 6d4e27dcf1..3b3297a062 100644 --- a/scl/slack/slack.conf +++ b/scl/slack/slack.conf @@ -45,7 +45,7 @@ block destination slack( ...) { -@requires http "The slack() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The slack() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url('`hook-url`') diff --git a/scl/snmptrap/snmptrapd-source.conf b/scl/snmptrap/snmptrapd-source.conf index a02d6871cf..0062666b8f 100644 --- a/scl/snmptrap/snmptrapd-source.conf +++ b/scl/snmptrap/snmptrapd-source.conf @@ -28,7 +28,7 @@ block source snmptrap( ) { -@requires afsnmp "The snmptrap() driver depends on the syslog-ng afsnmp module, please install the syslog-ng-mod-snmptrapd-parser (Debian & derivatives) or the syslog-ng-afsnmp (RHEL & co) package" +@requires afsnmp "The snmptrap() driver depends on the AxoSyslog afsnmp module, please install the axosyslog-mod-snmptrapd-parser (Debian & derivatives) or the axosyslog-afsnmp (RHEL & co) package" channel { source { diff --git a/scl/splunk/splunk.conf b/scl/splunk/splunk.conf index d5bf16bece..013c8b1d8f 100644 --- a/scl/splunk/splunk.conf +++ b/scl/splunk/splunk.conf @@ -29,7 +29,7 @@ block destination splunk_hec_raw( channel() default_index("main") - default_source("syslog-ng") + default_source("axosyslog") default_sourcetype("syslog") template("${S_ISODATE} ${HOST} ${MSGHDR}${MSG}\n") @@ -47,7 +47,7 @@ block destination splunk_hec_raw( ...) { -@requires http "The splunk-hec-raw() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The splunk-hec-raw() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url("`url`/services/collector/raw/1.0?channel=`channel`&index=`default_index`&source=`default_source`&sourcetype=`default_sourcetype``extra_queries`") @@ -74,7 +74,7 @@ block destination splunk_hec_event( token() default_index("main") - default_source("syslog-ng") + default_source("axosyslog") default_sourcetype("nix:syslog") index("") @@ -99,7 +99,7 @@ block destination splunk_hec_event( ...) { -@requires http "The splunk-hec-event() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The splunk-hec-event() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url("`url`/services/collector/event/1.0?index=`default_index`&source=`default_source`&sourcetype=`default_sourcetype``extra_queries`") diff --git a/scl/sumologic/sumologic.conf b/scl/sumologic/sumologic.conf index 6b951deee5..3cb645eda2 100644 --- a/scl/sumologic/sumologic.conf +++ b/scl/sumologic/sumologic.conf @@ -83,7 +83,7 @@ block destination sumologic-http( ...) { -@requires http "The http() driver is required for sumologic-http(), please install syslog-ng-mod-http (Debian) or syslog-ng-http (RHEL) package" +@requires http "The http() driver is required for sumologic-http(), please install axosyslog-mod-http (Debian) or axosyslog-http (RHEL) package" http( url("https://collectors.`deployment`.sumologic.com/receiver/v1/http/`collector`") diff --git a/scl/telegram/telegram.conf b/scl/telegram/telegram.conf index a53465fc21..91bddd6426 100644 --- a/scl/telegram/telegram.conf +++ b/scl/telegram/telegram.conf @@ -36,7 +36,7 @@ block destination telegram( ...) { -@requires http "The telegram() driver depends on the syslog-ng http module, please install the syslog-ng-mod-http (Debian & derivatives) or the syslog-ng-http (RHEL & co) package" +@requires http "The telegram() driver depends on the AxoSyslog http module, please install the axosyslog-mod-http (Debian & derivatives) or the axosyslog-http (RHEL & co) package" http( url("https://api.telegram.org/bot`bot-id`/sendMessage") From deedcf53d6a569a2b78a159dd835b12521e81052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Sat, 18 May 2024 18:02:08 +0200 Subject: [PATCH 2/2] otel: rename syslog-ng-otlp() to axosyslog-otlp() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- modules/grpc/otel/otel-grammar.ym | 6 +++--- modules/grpc/otel/otel-parser.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/grpc/otel/otel-grammar.ym b/modules/grpc/otel/otel-grammar.ym index 0ff2c63187..c553100a04 100644 --- a/modules/grpc/otel/otel-grammar.ym +++ b/modules/grpc/otel/otel-grammar.ym @@ -69,7 +69,7 @@ GrpcClientCredentialsBuilderW *last_grpc_client_credentials_builder; %token KW_URL %token KW_TARGET_SERVICE_ACCOUNTS %token KW_ADC -%token KW_SYSLOG_NG_OTLP +%token KW_AXOSYSLOG_OTLP %token KW_COMPRESSION %token KW_BATCH_BYTES %token KW_CONCURRENT_REQUESTS @@ -93,7 +93,7 @@ start kw_opentelemetry_or_syslog_ng_otlp : KW_OPENTELEMETRY - | KW_SYSLOG_NG_OTLP + | KW_AXOSYSLOG_OTLP ; source_otel @@ -182,7 +182,7 @@ destination_otel_channel_arg ; destination_syslog_ng_otlp - : KW_SYSLOG_NG_OTLP + : KW_AXOSYSLOG_OTLP { last_driver = *instance = syslog_ng_otlp_dd_new(configuration); } diff --git a/modules/grpc/otel/otel-parser.c b/modules/grpc/otel/otel-parser.c index fb30fdd990..6cd6ceee79 100644 --- a/modules/grpc/otel/otel-parser.c +++ b/modules/grpc/otel/otel-parser.c @@ -47,7 +47,8 @@ static CfgLexerKeyword otel_keywords[] = { "url", KW_URL }, { "target_service_accounts", KW_TARGET_SERVICE_ACCOUNTS }, { "adc", KW_ADC }, - { "syslog_ng_otlp", KW_SYSLOG_NG_OTLP }, + { "axosyslog_otlp", KW_AXOSYSLOG_OTLP }, + { "syslog_ng_otlp", KW_AXOSYSLOG_OTLP }, { "compression", KW_COMPRESSION }, { "batch_bytes", KW_BATCH_BYTES }, { "concurrent_requests", KW_CONCURRENT_REQUESTS },