diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index 48a8613b0f55..44e5720b06d0 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	fluent-bit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.2
+DISTVERSION=	3.2.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Fast and lightweight data forwarder
 WWW=		https://fluentbit.io/
 
 LICENSE=	APACHE20
 
 BROKEN_mips=	fails to build: conflicting types for 'restrict'
 BROKEN_mips64=	fails to build: conflicting types for 'restrict'
 
 LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 USES=		bison cmake:noninja compiler:c11 gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	fluent
 USE_RC_SUBR=	${PORTNAME}
 
 CMAKE_ARGS=	-DFLB_DEBUG=Off \
 		-DFLB_TRACE=Off
 LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=		LUA_FILTER PGSQL SSL
 OPTIONS_DEFAULT=	LUA_FILTER PGSQL SSL
 LUA_FILTER_DESC=	Support for modifying incoming records using Lua scripts
 
 LUA_FILTER_USES=	luajit:luajit-devel pkgconfig
 LUA_FILTER_CMAKE_ON=	-DFLB_FILTER_LUA=On \
 			-DFLB_LUAJIT=On \
 			-DFLB_PREFER_SYSTEM_LIB_LUAJIT=On
 LUA_FILTER_CMAKE_OFF=	-DFLB_LUAJIT=Off
 
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_ON=		-DFLB_OUT_PGSQL=On
 PGSQL_CMAKE_OFF=	-DFLB_OUT_PGSQL=Off
 
 SSL_USES=	ssl
 SSL_CMAKE_ON=	-DFLB_TLS=On
 SSL_CMAKE_OFF=	-DFLB_TLS=Off
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/parsers.conf ${STAGEDIR}${ETCDIR}/parsers.conf.sample
 
 do-test-LUA_FILTER-on:
 	${STAGEDIR}${PREFIX}/bin/fluent-bit --help 2>/dev/null | grep -w -q lua
 
 .include <bsd.port.mk>
diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo
index 949f4967c279..ffff5334f4cf 100644
--- a/sysutils/fluent-bit/distinfo
+++ b/sysutils/fluent-bit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732805491
-SHA256 (fluent-fluent-bit-v3.2.2_GH0.tar.gz) = 3abcd7eda1a26fe79f1d715491bafcca77d0186cc46d1d8465157790358f827d
-SIZE (fluent-fluent-bit-v3.2.2_GH0.tar.gz) = 28368154
+TIMESTAMP = 1734733314
+SHA256 (fluent-fluent-bit-v3.2.3_GH0.tar.gz) = 6a533d7f0f488d5fb707fead07f3ad147b300fb87cbd7b8ec461cc1de3607d80
+SIZE (fluent-fluent-bit-v3.2.3_GH0.tar.gz) = 28775279
diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist
index 62cbac88cf41..f08ec220f37b 100644
--- a/sysutils/fluent-bit/pkg-plist
+++ b/sysutils/fluent-bit/pkg-plist
@@ -1,187 +1,190 @@
 bin/fluent-bit
 @sample %%ETCDIR%%/fluent-bit.conf.sample
 @sample %%ETCDIR%%/parsers.conf.sample
 %%ETCDIR%%/plugins.conf
 include/fluent-bit.h
+include/fluent-bit/calyptia_constants.h
 include/fluent-bit/config_format/flb_cf.h
 include/fluent-bit/config_format/flb_cf_fluentbit.h
 include/fluent-bit/config_format/flb_cf_yaml.h
 include/fluent-bit/flb_api.h
 include/fluent-bit/flb_avro.h
 include/fluent-bit/flb_aws_credentials.h
 include/fluent-bit/flb_aws_util.h
 include/fluent-bit/flb_base64.h
 include/fluent-bit/flb_bits.h
 include/fluent-bit/flb_bucket_queue.h
 include/fluent-bit/flb_byteswap.h
 include/fluent-bit/flb_callback.h
+include/fluent-bit/flb_cfl_ra_key.h
+include/fluent-bit/flb_cfl_record_accessor.h
 include/fluent-bit/flb_chunk_trace.h
 include/fluent-bit/flb_compat.h
 include/fluent-bit/flb_compression.h
 include/fluent-bit/flb_config.h
 include/fluent-bit/flb_config_format.h
 include/fluent-bit/flb_config_map.h
 include/fluent-bit/flb_connection.h
 include/fluent-bit/flb_coro.h
 include/fluent-bit/flb_crypto.h
 include/fluent-bit/flb_crypto_constants.h
 include/fluent-bit/flb_csv.h
 include/fluent-bit/flb_custom.h
 include/fluent-bit/flb_custom_plugin.h
 include/fluent-bit/flb_dlfcn_win32.h
 include/fluent-bit/flb_downstream.h
 include/fluent-bit/flb_downstream_conn.h
 include/fluent-bit/flb_dump.h
 include/fluent-bit/flb_endian.h
 include/fluent-bit/flb_engine.h
 include/fluent-bit/flb_engine_dispatch.h
 include/fluent-bit/flb_engine_macros.h
 include/fluent-bit/flb_env.h
 include/fluent-bit/flb_error.h
 include/fluent-bit/flb_event.h
 include/fluent-bit/flb_event_loop.h
 include/fluent-bit/flb_file.h
 include/fluent-bit/flb_filter.h
 include/fluent-bit/flb_filter_plugin.h
 include/fluent-bit/flb_fstore.h
 include/fluent-bit/flb_gzip.h
 include/fluent-bit/flb_hash.h
 include/fluent-bit/flb_hash_table.h
 include/fluent-bit/flb_help.h
 include/fluent-bit/flb_hmac.h
 include/fluent-bit/flb_http_client.h
 include/fluent-bit/flb_http_client_debug.h
 include/fluent-bit/flb_http_client_http1.h
 include/fluent-bit/flb_http_client_http2.h
 include/fluent-bit/flb_http_common.h
 include/fluent-bit/flb_http_server.h
 include/fluent-bit/flb_info.h
 include/fluent-bit/flb_input.h
 include/fluent-bit/flb_input_blob.h
 include/fluent-bit/flb_input_chunk.h
 include/fluent-bit/flb_input_event.h
 include/fluent-bit/flb_input_log.h
 include/fluent-bit/flb_input_metric.h
 include/fluent-bit/flb_input_plugin.h
 include/fluent-bit/flb_input_thread.h
 include/fluent-bit/flb_input_trace.h
 include/fluent-bit/flb_intermediate_metric.h
 include/fluent-bit/flb_io.h
 include/fluent-bit/flb_jsmn.h
 include/fluent-bit/flb_kafka.h
 include/fluent-bit/flb_kernel.h
 include/fluent-bit/flb_kv.h
 include/fluent-bit/flb_langinfo.h
 include/fluent-bit/flb_lib.h
 include/fluent-bit/flb_lock.h
 include/fluent-bit/flb_log.h
 include/fluent-bit/flb_log_event.h
 include/fluent-bit/flb_log_event_decoder.h
 include/fluent-bit/flb_log_event_encoder.h
 include/fluent-bit/flb_log_event_encoder_body_macros.h
 include/fluent-bit/flb_log_event_encoder_dynamic_field.h
 include/fluent-bit/flb_log_event_encoder_metadata_macros.h
 include/fluent-bit/flb_log_event_encoder_primitives.h
 include/fluent-bit/flb_log_event_encoder_root_macros.h
 include/fluent-bit/flb_lua.h
 include/fluent-bit/flb_luajit.h
 include/fluent-bit/flb_macros.h
 include/fluent-bit/flb_mem.h
 include/fluent-bit/flb_meta.h
 include/fluent-bit/flb_metrics.h
 include/fluent-bit/flb_metrics_exporter.h
 include/fluent-bit/flb_motd.h
 include/fluent-bit/flb_mp.h
 include/fluent-bit/flb_mp_chunk.h
 include/fluent-bit/flb_msgpack_append_message.h
 include/fluent-bit/flb_net_dns.h
 include/fluent-bit/flb_network.h
 include/fluent-bit/flb_notification.h
 include/fluent-bit/flb_oauth2.h
 include/fluent-bit/flb_output.h
 include/fluent-bit/flb_output_plugin.h
 include/fluent-bit/flb_output_thread.h
 include/fluent-bit/flb_pack.h
 include/fluent-bit/flb_parser.h
 include/fluent-bit/flb_parser_decoder.h
 include/fluent-bit/flb_pipe.h
 include/fluent-bit/flb_plugin.h
 include/fluent-bit/flb_plugin_proxy.h
 include/fluent-bit/flb_processor.h
 include/fluent-bit/flb_processor_plugin.h
 include/fluent-bit/flb_pthread.h
 include/fluent-bit/flb_ra_key.h
 include/fluent-bit/flb_random.h
 include/fluent-bit/flb_record_accessor.h
 include/fluent-bit/flb_regex.h
 include/fluent-bit/flb_reload.h
 include/fluent-bit/flb_ring_buffer.h
 include/fluent-bit/flb_router.h
 include/fluent-bit/flb_routes_mask.h
 include/fluent-bit/flb_s3_local_buffer.h
 include/fluent-bit/flb_scheduler.h
 include/fluent-bit/flb_sds.h
 include/fluent-bit/flb_sds_list.h
 include/fluent-bit/flb_signv4.h
 include/fluent-bit/flb_signv4_ng.h
 include/fluent-bit/flb_simd.h
 include/fluent-bit/flb_slist.h
 include/fluent-bit/flb_snappy.h
 include/fluent-bit/flb_socket.h
 include/fluent-bit/flb_sosreport.h
 include/fluent-bit/flb_sqldb.h
 include/fluent-bit/flb_stacktrace.h
 include/fluent-bit/flb_storage.h
 include/fluent-bit/flb_str.h
 include/fluent-bit/flb_stream.h
 include/fluent-bit/flb_strptime.h
 include/fluent-bit/flb_task.h
 include/fluent-bit/flb_task_map.h
 include/fluent-bit/flb_thread_pool.h
 include/fluent-bit/flb_thread_storage.h
 include/fluent-bit/flb_time.h
 include/fluent-bit/flb_time_utils.h
 include/fluent-bit/flb_typecast.h
 include/fluent-bit/flb_unescape.h
 include/fluent-bit/flb_upstream.h
 include/fluent-bit/flb_upstream_conn.h
 include/fluent-bit/flb_upstream_ha.h
 include/fluent-bit/flb_upstream_node.h
 include/fluent-bit/flb_upstream_queue.h
 include/fluent-bit/flb_uri.h
 include/fluent-bit/flb_utf8.h
 include/fluent-bit/flb_utils.h
 include/fluent-bit/flb_version.h
 include/fluent-bit/flb_worker.h
 include/fluent-bit/tls/flb_tls.h
 include/fluent-bit/tls/flb_tls_info.h
 include/fluent-bit/wasm/flb_wasm.h
 include/libco.h
 include/monkey/mk_core.h
 include/monkey/mk_core/mk_dep_unistd.h
 include/monkey/mk_core/mk_dirent.h
 include/monkey/mk_core/mk_event.h
 include/monkey/mk_core/mk_event_epoll.h
 include/monkey/mk_core/mk_event_kqueue.h
 include/monkey/mk_core/mk_event_libevent.h
 include/monkey/mk_core/mk_event_select.h
 include/monkey/mk_core/mk_file.h
 include/monkey/mk_core/mk_getopt.h
 include/monkey/mk_core/mk_iov.h
 include/monkey/mk_core/mk_limits.h
 include/monkey/mk_core/mk_list.h
 include/monkey/mk_core/mk_macros.h
 include/monkey/mk_core/mk_memory.h
 include/monkey/mk_core/mk_pipe.h
 include/monkey/mk_core/mk_pthread.h
 include/monkey/mk_core/mk_rconf.h
 include/monkey/mk_core/mk_sleep.h
 include/monkey/mk_core/mk_string.h
 include/monkey/mk_core/mk_thread.h
 include/monkey/mk_core/mk_thread_channel.h
 include/monkey/mk_core/mk_uio.h
 include/monkey/mk_core/mk_unistd.h
 include/monkey/mk_core/mk_utils.h
 include/settings.h
 lib/fluent-bit/libfluent-bit.so
 @comment libdata/pkgconfig/msgpack.pc