Release 7.10.12 - See CHANGELOG.md

tiredofit · Sep 2, 2024 · fd88150 · fd88150
1 parent 1bfa414
commit fd88150
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.12 2024-09-02 <dave at tiredofit dot ca>
+
+   ### Added
+      - Fluent-bit 3.1.7
+
+
 ## 7.10.11 2024-08-22 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=edge
 
 FROM docker.io/alpine:${ALPINE_VERSION}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -11,7 +11,7 @@ ARG YQ_VERSION
 ARG ZABBIX_VERSION
 
 ### Set defaults
-ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.6"} \
+ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"3.1.7"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.2.0.0"} \
     YQ_VERSION=${YQ_VERSION:-"v4.44.2"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"7.0.3"} \
@@ -140,6 +140,7 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f
                 ${fts}-dev \
                 linux-headers \
                 openssl-dev \
+                snappy-dev \
                 yaml-dev \
                 && \
     \
@@ -245,52 +246,101 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f
         -DFLB_DEBUG=No \
         -DFLB_EXAMPLES=No \
         -DFLB_FILTER_AWS=No \
+        -DFLB_FILTER_ECS=No \
+        -DFLB_FILTER_NIGHTFALL=No \
+        -DFLB_FILTER_GEOIP2=No \
         -DFLB_FILTER_KUBERNETES=No \
+        -DFLB_FILTER_TENSORFLOW=No \
+        -DFLB_FILTER_WASM=No \
         -DFLB_HTTP_SERVER=Yes \
+        -DFLB_IN_CALYPTIA_FLEET=No \
         -DFLB_IN_COLLECTD=No \
         -DFLB_IN_CPU=No \
+        -DFLB_IN_DISK=No \
         -DFLB_IN_DOCKER=No \
         -DFLB_IN_DOCKER_EVENTS=No \
+        -DFLB_IN_EMITTER=Ywa \
+        -DFLB_IN_EXEC=Yes \
+        -DFLB_IN_EXEC_WASI=No \
+        -DFLB_IN_ELASTICSEARCH=No \
+        -DFLB_IN_HEALTH=No \
+        -DFLB_IN_KAFKA=Yes \
         -DFLB_IN_KMSG=No \
+        -DFLB_IN_KUBERNETES_EVENTS=No \
         -DFLB_IN_MEM=No \
         -DFLB_IN_MQTT=No \
         -DFLB_IN_NETIF=No \
+        -DFLB_IN_NGINX_EXPORTER_METRICS=No \
+        -DFLB_IN_NODE_EXPORTER_METRICS=No \
+        -DFLB_IN_OPENTELEMETRY=No \
+        -DFLB_IN_PODMAN_METRICS=No \
+        -DFLB_IN_PROCESS_EXPORTER_METRICS=No \
+        -DFLB_IN_PROC=No \
+        -DFLB_IN_PROMETHEUS_REMOTE_WRITE=Yes \
+        -DFLB_IN_PROMETHEUS_SCRAPE=No \
         -DFLB_IN_SERIAL=No \
+        -DFLB_IN_SPLUNK=No \
+        -DFLB_IN_STATSD=No \
         -DFLB_IN_SYSTEMD=No \
+        -DFLB_IN_SYSLOG=No \
         -DFLB_IN_TCP=No \
+        -DFLB_IN_UDP=No \
+        -DFLB_IN_UNIX_SOCKET=No \
         -DFLB_IN_THERMAL=No \
         -DFLB_IN_WINLOG=No \
+        -DFLB_IN_WINDOWS_EXPORTER_METRICS=No \
         -DFLB_IN_WINSTAT=No \
         -DFLB_JEMALLOC=Yes \
         -DFLB_LUAJIT=No \
+        -DFLB_PROCESSOR_OPENTELEMETRY_ENVELOPE=No \
+        -DFLB_PROCESSOR_SQL=No \
         -DFLB_OUT_AZURE=No \
         -DFLB_OUT_AZURE_BLOB=No \
+        -DFLB_OUT_AZURE_KUSTO=No \
+        -DFLB_OUT_AZURE_LOGS_INGESTION=No \
         -DFLB_OUT_BIGQUERY=No \
         -DFLB_OUT_CALYPTIA=No \
+        -DFLB_OUT_CHRONICLE=No \
         -DFLB_OUT_CLOUDWATCH_LOGS=No \
         -DFLB_OUT_COUNTER=No \
         -DFLB_OUT_DATADOG=No \
+        -DFLB_OUT_ES=No \
+        -DFLB_OUT_FLOWCOUNTER=No \
         -DFLB_OUT_GELF=No \
         -DFLB_OUT_INFLUXDB=No \
         -DFLB_OUT_KAFKA=No \
         -DFLB_OUT_KAFKA_REST=No \
         -DFLB_OUT_KINESIS_FIREHOSE=No \
         -DFLB_OUT_KINESIS_STREAMS=No \
+        -DFLB_OUT_LIB=No \
         -DFLB_OUT_LOGDNA=No \
         -DFLB_OUT_NATS=No \
         -DFLB_OUT_NRLOGS=No \
+        -DFLB_OUT_OPENSEARCH=No \
+        -DFLB_OUT_ORACLE_LOG_ANALYTICS=No \
+        -DFLB_OUT_OPENTELEMETRY=No \
+        -DFLB_OUT_PROMETHEUS_EXPORTER=No \
+        -DFLB_OUT_PROMETHEUS_REMOTE_WRITE=No \
         -DFLB_OUT_PGSQL=No \
+        -DFLB_OUT_PLOT=No \
         -DFLB_OUT_S3=No \
+        -DFLB_OUT_SKYWALKING=No \
         -DFLB_OUT_SLACK=No \
         -DFLB_OUT_SPLUNK=No \
         -DFLB_OUT_STACKDRIVER=No \
         -DFLB_OUT_TCP=No \
         -DFLB_OUT_TD=No \
+        -DFLB_OUT_UDP=No \
+        -DFLB_OUT_VIVO_EXPORTER=No \
+        -DFLB_OUT_WEBSOCKET=No \
         -DFLB_RELEASE=Yes \
         -DFLB_SHARED_LIB=No \
         -DFLB_SIGNV4=No \
         -DFLB_SMALL=Yes \
-        . && \
+        -DFLB_WASM=No \
+        . \
+        && \
+    \
     if [ "$fluentbit_make" = "true" ] ; then if [ "$apkArch" = "x86_64" ] ; then make -j"$(nproc)" ; make install ; mv /usr/etc/fluent-bit /etc/fluent-bit ; mkdir -p /etc/fluent-bit/parsers.d; mkdir -p /etc/fluent-bit/conf.d ; strip /usr/bin/fluent-bit ; if [ "$apkArch" = "x86_64" ] && [ "$no_upx" != "true" ]; then upx /usr/bin/fluent-bit ; fi ; fi ; fi ;\
     \
     ### Promtail (Disabled)

diff --git a/install/etc/cont-init.d/02-permissions b/install/etc/cont-init.d/02-permissions
@@ -26,8 +26,8 @@ if var_true "${CONTAINER_ENABLE_PERMISSIONS}" ; then
     unames+="$(set -o posix ; set | sort | grep -e '^CONTAINER_USER_' | sed "s|^CONTAINER_USER_||g" | tr '[:upper:]' '[:lower:]' | tr ' ' '\n')"
 
     for upair in $unames; do
-        uname=$(echo $upair | cut -d = -f 1)
-        uid=$(echo $upair | cut -d = -f 2)
+        uname=$(echo "${upair}" | cut -d = -f 1)
+        uid=$(echo "${upair}" | cut -d = -f 2)
         if grep -e "^${uname}" /etc/passwd > /dev/null; then
            _userexists=true
         elif grep -e "^${uname/_/-}" /etc/passwd > /dev/null; then
@@ -47,8 +47,8 @@ if var_true "${CONTAINER_ENABLE_PERMISSIONS}" ; then
     groups+="$(set -o posix ; set | sort | grep -e '^CONTAINER_GROUP_' | sed "s|^CONTAINER_GROUP_||g" | tr '[:upper:]' '[:lower:]' | tr ' ' '\n' | sed '/add_.*/d' ) "
 
     for gpair in $groups; do
-        gname=$(echo $gpair | cut -d = -f 1)
-        gid=$(echo $gpair | cut -d = -f 2)
+        gname=$(echo "${gpair}" | cut -d = -f 1)
+        gid=$(echo "${gpair}" | cut -d = -f 2)
         if grep -e "^${gname}" /etc/group > /dev/null; then
            _groupexists=true
         elif grep -e "^${gname/_/-}" /etc/group > /dev/null; then
@@ -57,12 +57,9 @@ if var_true "${CONTAINER_ENABLE_PERMISSIONS}" ; then
         fi
 
         if [ "${_groupexists}" = true ] ; then
-            opu=$(grep -e "^${gname}" /etc/passwd | awk -F: '{print $1}')
-            opuid=$(grep -e "^${gname}" /etc/passwd | awk -F: '{print $3}')
             opgid=$(grep -e "^${gname}" /etc/passwd | awk -F: '{print $4}')
             og=$(grep -e "^${gname}" /etc/group | awk -F: '{print $1}')
             oggid=$(grep -e "^${gname}" /etc/group | awk -F: '{print $3}')
-
             print_debug "Changing group '${gname}' to gid '${gid}' from '${oggid}'"
             sed -i "s|\(.*\):\(.*\):\(.*\):${opgid}:|\1:\2:\3:${gid}:|g" /etc/passwd
             sed -i "s|${og}:x:${oggid}|${og}:x:${gid}|g" /etc/group
@@ -73,8 +70,8 @@ if var_true "${CONTAINER_ENABLE_PERMISSIONS}" ; then
     groupsadd="$(set -o posix ; set | sort | grep -e '^GROUP_ADD_' | sed 's|^GROUP_ADD_||g' | tr '[:upper:]' '[:lower:]' ) "
     groupsadd+="$(set -o posix ; set | sort | grep -e '^CONTAINER_GROUP_ADD_' | sed 's|^CONTAINER_GROUP_ADD_||g' | tr '[:upper:]' '[:lower:]' )"
 
-    for gau in $groupsadd; do
-        gname=$(echo ${gau} | cut -d = -f1 )
+    for gapair in $groupsadd; do
+        gname=$(echo "${gapair}" | cut -d = -f1 )
         if grep -e "^${gname}" /etc/group > /dev/null; then
            _groupexists=true
         elif grep -e "^${gname/_/-}" /etc/group > /dev/null; then
@@ -83,8 +80,7 @@ if var_true "${CONTAINER_ENABLE_PERMISSIONS}" ; then
         fi
 
         if [ "${_groupexists}" = true ] ; then
-            uta=$(echo ${gau} | cut -d = -f2 | tr ',' '\n')
-
+            uta=$(echo ${gapair} | cut -d = -f2 | tr ',' '\n')
             for userstogroup in ${uta} ; do
                 print_debug "Adding user '${userstogroup}' to '${gname}'"
                 os=$(cat /etc/os-release |grep ^ID= | cut -d = -f2)