feat: upgrade deps (#2555)

* feat: upgrade deps Signed-off-by: Ilya Kheifets <[email protected]> * Updating version of certifi and urllib3 packages * fix: upgrade setuptools Signed-off-by: Ilya Kheifets <[email protected]> * fix: warning during startup Signed-off-by: Ilya Kheifets <[email protected]> --------- Signed-off-by: Ilya Kheifets <[email protected]> Co-authored-by: cwadhwani-splunk <[email protected]>
splunk · Aug 13, 2024 · 091acca · 091acca
1 parent 239f6c7
commit 091acca
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 34 deletions.
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -16,7 +16,7 @@
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.8.0
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 
@@ -41,7 +41,7 @@ RUN apk add -U --upgrade --no-cache \
       cargo \
       ca-certificates \
       poetry \
-    && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.7 sh \
+    && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.8 sh \
     && groupadd --gid 1024 syslog \
     && useradd -M -g 1024 -u 1024 syslog \
     && usermod -L syslog \

diff --git a/package/Dockerfile.lite b/package/Dockerfile.lite
@@ -16,7 +16,7 @@
 #work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.8.0
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 
@@ -41,7 +41,7 @@ RUN apk add -U --upgrade --no-cache \
       cargo \
       ca-certificates \
       poetry \
-    && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.7 sh \
+    && curl -fsSL https://goss.rocks/install | GOSS_VER=v0.4.8 sh \
     && groupadd --gid 1024 syslog \
     && useradd -M -g 1024 -u 1024 syslog \
     && usermod -L syslog \

diff --git a/package/etc/pylib/parser_cef.py b/package/etc/pylib/parser_cef.py
@@ -39,7 +39,7 @@ def parse(self, log_message):
                             del pairs[vk]
                         del pairs[k]
                 elif k == "rawEvent":
-                    pairs[k] = pairs[k].replace("\=", "=").replace("&&", "\n")
+                    pairs[k] = pairs[k].replace(r"\=", "=").replace("&&", "\n")
 
             for k, v in pairs.items():
                 kc = k.replace(" ", "_").replace(".", "_")

diff --git a/package/etc/syslog-ng.conf b/package/etc/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version:4.6
+@version:4.8
 
 
 # syslog-ng configuration file.

diff --git a/package/lite/etc/syslog-ng.conf.jinja b/package/lite/etc/syslog-ng.conf.jinja
@@ -1,4 +1,4 @@
-@version:4.6
+@version:4.8
 
 
 # syslog-ng configuration file.

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ sqlitedict = "^2.0.0"
 requests = "^2.28.1"
 shortuuid = "^1.0.11"
 pyyaml = "6.0.1"
-setuptools = ">=69.0"
+setuptools = "70.0.0"
 
 
 [tool.poetry.group.dev.dependencies]

diff --git a/tests/Dockerfile.nc b/tests/Dockerfile.nc
@@ -1,4 +1,4 @@
-ARG SYSLOGNG_VERSION=4.6.0
+ARG SYSLOGNG_VERSION=4.8.0
 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
 
 RUN apk add -U netcat-openbsd