syslog-ng: add webhook() and webhook-json() sources

.github/workflows/syslog-ng-docker.yml

@@ -9,6 +9,9 @@ on:
       tarball-artifact:
         required: false
         type: string
+      axosyslog-modules-artifact:
+        required: true
+        type: string
       snapshot-version:
         required: false
         type: string
@@ -34,6 +37,12 @@ jobs:
           name: ${{ inputs.tarball-artifact }}
           path: syslog-ng/apkbuild/axoflow/syslog-ng
 
+      - name: Download axosyslog-modules tarball artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.axosyslog-modules-artifact }}
+          path: syslog-ng/apkbuild/axoflow/syslog-ng
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx

.github/workflows/syslog-ng-snapshot.yml

@@ -59,9 +59,29 @@ jobs:
           name: source-tarball
           path: dbld/build/*.tar.*
 
+  axosyslog-modules:
+    name: axosyslog-modules
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Create AxoSyslog modules tarball
+        working-directory: syslog-ng
+        run: |
+          tar -czvf python-modules.tar.gz python-modules/
+
+      - name: Store axosyslog-modules tarball as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: axosyslog-modules-tarball
+          path: syslog-ng/python-modules.tar.gz
+
   build-and-test:
     runs-on: ubuntu-latest
-    needs: tarball
+    needs:
+      - tarball
+      - axosyslog-modules
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -72,7 +92,13 @@ jobs:
           name: source-tarball
           path: syslog-ng/apkbuild/axoflow/syslog-ng
 
-      - name: Build and export Docker image
+      - name: Download axosyslog-modules tarball artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: axosyslog-modules-tarball
+          path: syslog-ng/apkbuild/axoflow/syslog-ng
+
+      - name: Build Docker image
         uses: docker/build-push-action@v5
         with:
           context: syslog-ng
@@ -93,10 +119,11 @@ jobs:
   publish-image:
     if: github.ref == 'refs/heads/main'
     uses: ./.github/workflows/syslog-ng-docker.yml
-    needs: [tarball, build-and-test]
+    needs: [tarball, build-and-test, axosyslog-modules]
     with:
       pkg-type: nightly
       tarball-artifact: source-tarball
+      axosyslog-modules-artifact: axosyslog-modules-tarball
       snapshot-version: ${{ needs.tarball.outputs.snapshot-version }}
 
   # https://github.com/actions/delete-package-versions/issues/90

.github/workflows/syslog-ng-stable.yml

@@ -23,6 +23,24 @@ jobs:
     outputs:
       version: ${{ steps.unpack_tag.outputs.group1 }}
 
+  axosyslog-modules:
+    name: axosyslog-modules
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Create AxoSyslog modules tarball
+        working-directory: syslog-ng
+        run: |
+          tar -czvf python-modules.tar.gz python-modules/
+
+      - name: Store axosyslog-modules tarball as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: axosyslog-modules-tarball
+          path: syslog-ng/python-modules.tar.gz
+
   publish-packages:
     uses: ./.github/workflows/syslog-ng-packages.yml
     needs:
@@ -33,5 +51,9 @@ jobs:
 
   publish-image:
     uses: ./.github/workflows/syslog-ng-docker.yml
+    needs:
+      - prepare
+      - axosyslog-modules
     with:
       pkg-type: stable
+      axosyslog-modules-artifact: axosyslog-modules-tarball

syslog-ng/alpine.dockerfile

@@ -26,11 +26,11 @@ RUN mkdir packages \
     && printf 'export JOBS=$(nproc)\nexport MAKEFLAGS=-j$JOBS\n' >> .abuild/abuild.conf \
     && cd axoflow/syslog-ng \
     && if [ "$PKG_TYPE" = "nightly" ]; then \
-        tarball_filename="$(ls *.tar.*)"; \
+        tarball_filename="$(ls syslog-ng-*.tar.*)"; \
         [ -z "$tarball_filename" ] && echo "Tarball for nightly can not be found" && exit 1; \
         tarball_name="${tarball_filename/\.tar.*}"; \
         sed -i -e "s|^pkgver=.*|pkgver=$SNAPSHOT_VERSION|" -e "s|^builddir=.*|builddir=\"\$srcdir/$tarball_name\"|" APKBUILD; \
-        sed -i -e "s|^source=.*|source=\"$tarball_filename\"|" APKBUILD; \
+        sed -i -e "s|^source=.*|source=\"$tarball_filename|" APKBUILD; \
        fi \
     && abuild checksum \
     && abuild -r

syslog-ng/apkbuild/axoflow/syslog-ng/APKBUILD

@@ -51,7 +51,9 @@ subpackages="
 	$pkgname-python3:_python3
 	$pkgname-grpc:_grpc
 	"
-source="https://github.com/syslog-ng/syslog-ng/releases/download/syslog-ng-$pkgver/syslog-ng-$pkgver.tar.gz"
+source="https://github.com/syslog-ng/syslog-ng/releases/download/syslog-ng-$pkgver/syslog-ng-$pkgver.tar.gz
+	python-modules.tar.gz
+	"
 builddir="$srcdir/$pkgname-$pkgver"
 
 _modules="
@@ -145,6 +147,9 @@ _python3() {
 	depends="$pkgname=$pkgver-r$pkgrel python3"
 	install="$subpkgname.post-install"
 
+	cat $srcdir/python-modules/requirements.txt >> $pkgdir/usr/lib/syslog-ng/python/requirements.txt
+	rm $srcdir/python-modules/requirements.txt
+	mv $srcdir/python-modules/* $pkgdir/usr/lib/syslog-ng/python/syslogng/modules
 	_submv usr/lib/syslog-ng/libmod-python.so usr/lib/syslog-ng/python usr/bin/syslog-ng-update-virtualenv
 }
 
@@ -174,4 +179,5 @@ _submv() {
 
 sha512sums="
 2f1e0dea4c0ecfc3c77df7e6ac231ee8436c9c78fcb4df8ccdc417fea7d56791fdeb0844ac35f0342ce7c2bea5618d8723b6b54319c556120099eb809873082e  syslog-ng-4.7.1.tar.gz
+SKIP  python-modules.tar.gz
 "

syslog-ng/python-modules/requirements.txt

@@ -0,0 +1 @@
+tornado==6.4

syslog-ng/python-modules/webhook/__init__.py

@@ -0,0 +1,5 @@
+from .source import HTTPSource
+
+__all__ = [
+    "HTTPSource"
+]

syslog-ng/python-modules/webhook/scl/webhook.conf

@@ -0,0 +1,86 @@
+#############################################################################
+# Copyright (c) 2024 László Várady
+#
+# This program 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 Free Software Foundation, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# As an additional exemption you are allowed to compile & link against the
+# OpenSSL libraries as published by the OpenSSL project. See the file
+# COPYING for details.
+#
+#############################################################################
+
+block source webhook(
+    port("")
+    auth_token("")
+    tls_key_file("")
+    tls_cert_file("")
+
+    # for client authentication
+    tls_peer_verify(no)
+    tls_use_system_cert_store(no)
+    tls_ca_file("")
+    tls_ca_dir("")
+    ...
+)
+{
+    python(
+        class("syslogng.modules.webhook.HTTPSource")
+        options(
+            "port" => "`port`"
+            "auth_token" => "`auth_token`"
+            "tls_key_file" => "`tls_key_file`"
+            "tls_cert_file" => "`tls_cert_file`"
+
+            "tls_peer_verify" => `tls_peer_verify`
+            "tls_use_system_cert_store" => `tls_use_system_cert_store`
+            "tls_ca_file" => "`tls_ca_file`"
+            "tls_ca_dir" => "`tls_ca_dir`"
+        )
+        `__VARARGS__`
+    );
+};
+
+block source webhook-json(
+    port("")
+    auth_token("")
+    prefix("")
+    tls_key_file("")
+    tls_cert_file("")
+
+    # for client authentication
+    tls_peer_verify(no)
+    tls_use_system_cert_store(no)
+    tls_ca_file("")
+    tls_ca_dir("")
+    ...
+)
+{
+    channel {
+        source {
+            webhook(
+                port("`port`") auth_token("`auth_token`")
+                tls_key_file("`tls_key_file`") tls_cert_file("`tls_cert_file`")
+
+                tls_peer_verify(`tls_peer_verify`)
+                tls_use_system_cert_store(`tls_use_system_cert_store`)
+                tls_ca_file("`tls_ca_file`") tls_ca_dir("`tls_ca_dir`")
+                `__VARARGS__`
+            );
+        };
+
+        parser {
+            json-parser(prefix("`prefix`"));
+        };
+    };
+};