map-plugins: 1.2.7

fluent-bit/Makefile

@@ -56,7 +56,7 @@ CMAKE_OPTIONS+= \
 	-DFLB_BACKTRACE=No \
 	-DFLB_KAFKA=No \
 	-DFLB_WASM=No \
-	-DFLB_LUAJIT=Yes
+	-DFLB_LUAJIT=No
 
 # In plugins
 CMAKE_OPTIONS += \
@@ -107,7 +107,7 @@ CMAKE_OPTIONS += \
 	-DFLB_FILTER_AWS=No \
 	-DFLB_FILTER_ECS=No \
 	-DFLB_FILTER_KUBERNETES=No \
-	-DFLB_FILTER_LUA=Yes \
+	-DFLB_FILTER_LUA=No \
 	-DFLB_FILTER_NEST=No \
 	-DFLB_FILTER_RECORD_MODIFIER=No \
 	-DFLB_FILTER_THROTTLE=No \

logmngr/Makefile

@@ -65,9 +65,7 @@ define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/lib/logmngr
 ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
 	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_DIR) $(1)/etc/fluent-bit
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp/
-	$(INSTALL_BIN) ./files/etc/fluent-bit/syslog_facility.lua $(1)/etc/fluent-bit/syslog_facility.lua
 	$(INSTALL_BIN) ./files/logread $(1)/sbin/
 	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/ntp/20-reload_fluent_bit $(1)/etc/hotplug.d/ntp/

logmngr/files/etc/config/logmngr

@@ -8,7 +8,7 @@ config source 'default_source'
 
 config template 'default_template'
 	option name 'default_template'
-	option expression '{time} {hostname} {facility}.{severity} {ident}[{pid}]: {message}'
+	option expression '{time} {hostname} {ident}[{pid}]: {message}'
 
 config action 'default_action'
 	option name 'default_action'

logmngr/files/etc/fluent-bit/syslog_facility.lua

@@ -1,30 +0,0 @@
-function map_facility_severity(tag, timestamp, record)
-    local priority = record["priority"] or record["pri"]
-    
-    if not priority then
-        record["facility"] = "user"
-        record["severity"] = "info"
-        return 2, timestamp, record
-    end
-    
-    local facility_map = {
-        [0] = "kern", [1] = "user", [2] = "mail", [3] = "daemon",
-        [4] = "auth", [5] = "syslog", [6] = "lpr", [7] = "news",
-        [8] = "uucp", [9] = "cron", [10] = "authpriv", [11] = "ftp",
-        [16] = "local0", [17] = "local1", [18] = "local2", [19] = "local3",
-        [20] = "local4", [21] = "local5", [22] = "local6", [23] = "local7"
-    }
-    
-    local severity_map = {
-        [0] = "emerg", [1] = "alert", [2] = "crit", [3] = "err",
-        [4] = "warn", [5] = "notice", [6] = "info", [7] = "debug"
-    }
-    
-    local facility_num = math.floor(priority / 8)
-    local severity_num = priority % 8
-    
-    record["facility"] = facility_map[facility_num] or "user"
-    record["severity"] = severity_map[severity_num] or "info"
-    
-    return 2, timestamp, record
-end

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -88,12 +88,6 @@ create_default_filters() {
 	append_conf "    match           *"
 	append_conf "    hostname_key    hostname"
 	append_conf ""
-
-	append_conf "[FILTER]"
-	append_conf "    name            lua"
-	append_conf "    match           *"
-	append_conf "    script          /etc/fluent-bit/syslog_facility.lua"
-	append_conf "    call            map_facility_severity"
 }
 
 create_input_section() {

map-agent/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.7.17
+PKG_VERSION:=6.3.7.19
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7f71fafbec49fa4b25d1e8d07cfc1fee5b4bbab0
+PKG_SOURCE_VERSION:=5fbcb1c110e82a8788e359d947ec099328e13164
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-plugins/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-plugins
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dd873ca4e2cb321302dae1955da24d1be271b2b1
+PKG_SOURCE_VERSION:=5ac759ae1f8cbedc539053d940f2e7d3652e4531
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-plugins.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip