diff --git a/sysutils/beats91/Makefile b/sysutils/beats91/Makefile
index 704dd04b6ded..a29db680f266 100644
--- a/sysutils/beats91/Makefile
+++ b/sysutils/beats91/Makefile
@@ -1,143 +1,143 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.19.12
+DISTVERSION=	9.1.10
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
-PKGNAMESUFFIX=	8
+PKGNAMESUFFIX=	91
 DISTFILES=	go.mod:gomod
 
 MAINTAINER=	elastic@FreeBSD.org
-COMMENT=	Send logs, network, metrics and heartbeat to Elasticsearch or Logstash (${DISTVERSION:R:R}.x version)
+COMMENT=	Send logs, network, metrics and heartbeat to Elasticsearch or Logstash (${DISTVERSION:R}.x version)
 WWW=		https://www.elastic.co/products/beats/
 
 LICENSE=	APACHE20
 
 USES=		go:modules
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	elastic
 
 USE_RC_SUBR=	${GO_TARGET:S,./,,g}
 
 GO_MODULE=	github.com/elastic/beats/v7
 CGO_CFLAGS=	-I.
 CGO_LDFLAGS=	-L.
 MAKE_ENV=	GOBUILD_FLAGS="-mod=vendor"
 
-CONFLICTS=	${PORTNAME}9*
+CONFLICTS=	${PORTNAME}8 ${PORTNAME}92 ${PORTNAME}93
 
-PORTSCOUT=	limit:^8
+PORTSCOUT=	limit:^9\.1\.
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 .ifmake makesum || makeplist || distclean
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .else
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
 .endif
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
 PACKETBEAT_DESC=		Packetbeat
 AUDITBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/auditbeat/:auditbeat \
 				${LOCAL_MASTER_SITES:S|$|:auditbeat|}
 AUDITBEAT_DISTFILES=		auditbeat-${DISTVERSION}-darwin-x86_64.tar.gz:auditbeat
 AUDITBEAT_VARS=			GO_TARGET+=./auditbeat
 FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat \
 				${LOCAL_MASTER_SITES:S|$|:filebeat|}
 FILEBEAT_DISTFILES=		filebeat-${DISTVERSION}-darwin-x86_64.tar.gz:filebeat
 FILEBEAT_VARS=			GO_TARGET+=./filebeat
 HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat \
 				${LOCAL_MASTER_SITES:S|$|:heartbeat|}
 HEARTBEAT_DISTFILES=		heartbeat-${DISTVERSION}-darwin-x86_64.tar.gz:heartbeat
 HEARTBEAT_VARS=			GO_TARGET+=./heartbeat
 METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat \
 				${LOCAL_MASTER_SITES:S|$|:metricbeat|}
 METRICBEAT_DISTFILES=		metricbeat-${DISTVERSION}-darwin-x86_64.tar.gz:metricbeat
 METRICBEAT_VARS=		GO_TARGET+=./metricbeat
 PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat \
 				${LOCAL_MASTER_SITES:S|$|:packetbeat|}
 PACKETBEAT_DISTFILES=		packetbeat-${DISTVERSION}-darwin-x86_64.tar.gz:packetbeat
 PACKETBEAT_VARS=		CGO_CFLAGS+=-I/usr/include \
 				CGO_LDFLAGS+=-L/usr/lib \
 				GO_TARGET+=./packetbeat
 
 LOCAL_MASTER_SITES=		LOCAL/vvd/elastic
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${DISTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/${BEATMOD}/*.yml
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for BEATMOD in ${GO_TARGET:S,^./,,g}
 	(${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD} && \
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/${BEATMOD} \
 		${STAGEDIR}${PREFIX}/sbin && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference)
 	(MODULE_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/module; \
 	 if [ -d $${MODULE_SRC} ]; then \
 	   MODULE_DEST=${STAGEDIR}${DATADIR}/${BEATMOD}/module && \
 	   ${MKDIR} $${MODULE_DEST} && \
 	   cd $${MODULE_SRC} && ${COPYTREE_SHARE} . $${MODULE_DEST} && \
 	   cd $${MODULE_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST}; \
 	 fi) && \
 	(MODULESD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/modules.d; \
 	 if [ -d $${MODULESD_SRC} ]; then \
 	   MODULESD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.modules.d && \
 	   ${MKDIR} $${MODULESD_DEST} && \
 	   cd $${MODULESD_SRC} && ${COPYTREE_SHARE} . $${MODULESD_DEST} && \
 	   cd $${MODULESD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d && \
 	   ${ECHO_CMD} "The modules.d files are now in ${EXAMPLESDIR}/${BEATMOD}.modules.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.modules.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(MONITORSD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/monitors.d; \
 	 if [ -d $${MONITORSD_SRC} ]; then \
 	   MONITORSD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.monitors.d && \
 	   ${MKDIR} $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_SRC} && ${COPYTREE_SHARE} . $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d && \
 	   ${ECHO_CMD} "The monitors.d files are now in ${EXAMPLESDIR}/${BEATMOD}.monitors.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.monitors.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(KIBANA_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/kibana; \
 	 if [ -d $${KIBANA_SRC} ]; then \
 	   KIBANA_PATH=${STAGEDIR}${DATADIR}/${BEATMOD}/kibana; \
 	   ${MKDIR} $${KIBANA_PATH} && \
 	   cd $${KIBANA_SRC} && ${COPYTREE_SHARE} . $${KIBANA_PATH}; \
 	   cd $${KIBANA_PATH} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	 fi)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/beats91/distinfo b/sysutils/beats91/distinfo
index 6580ddda9af5..ab9af6aae667 100644
--- a/sysutils/beats91/distinfo
+++ b/sysutils/beats91/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1773063769
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/go.mod) = 40e40154944293b310ed9171b9de6be9380f0f81127e3a4f20321821d76672b9
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/go.mod) = 28836
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/auditbeat-8.19.12-darwin-x86_64.tar.gz) = fc7a06722eb8ab4fae9d9954ec4bf59522fa95c9f52f86ad346c8c20009db48b
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/auditbeat-8.19.12-darwin-x86_64.tar.gz) = 35814502
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/filebeat-8.19.12-darwin-x86_64.tar.gz) = bd6caaa9d347b951db0f277c136f49df88c34c978fca31cabbd298d459992cb3
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/filebeat-8.19.12-darwin-x86_64.tar.gz) = 55685672
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/heartbeat-8.19.12-darwin-x86_64.tar.gz) = 7bc769ce65a62072d70be1dbed0f3932b895b785ce832f49f5fc79a1e291f942
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/heartbeat-8.19.12-darwin-x86_64.tar.gz) = 35784404
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/metricbeat-8.19.12-darwin-x86_64.tar.gz) = cfd313759ad554b4f518ed6dcb222793c8d21ea67be0616aec270f3f8fc5fe21
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/metricbeat-8.19.12-darwin-x86_64.tar.gz) = 59721874
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/packetbeat-8.19.12-darwin-x86_64.tar.gz) = 21581ca09c0b9403b2cf3731c449b87c66bb3d87998bbe057b8c312d5ea70973
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/packetbeat-8.19.12-darwin-x86_64.tar.gz) = 36808663
-SHA256 (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/elastic-beats-v8.19.12_GH0.tar.gz) = 8ca35b31098cbac291a88a0086685ba40957d3f1606ba6dc4b60242d2b69243f
-SIZE (go/sysutils_beats8/elastic-beats-v8.19.12_GH0/elastic-beats-v8.19.12_GH0.tar.gz) = 104228947
+TIMESTAMP = 1768592509
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/go.mod) = 26f1a646f08bed4b54b53bcd370d2eaad8773f96c6979c27f5b412f48c8e8a30
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/go.mod) = 28239
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/auditbeat-9.1.10-darwin-x86_64.tar.gz) = 689f4e92328d7b137e9368d7876d547d194dd07d8fa581a976b564997d20a0b6
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/auditbeat-9.1.10-darwin-x86_64.tar.gz) = 35027702
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/filebeat-9.1.10-darwin-x86_64.tar.gz) = d70fc9d1347edf4fc086a8a46ab59bbc4a57825fe775f336e78f4558ff925e30
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/filebeat-9.1.10-darwin-x86_64.tar.gz) = 54800645
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/heartbeat-9.1.10-darwin-x86_64.tar.gz) = e9030dafa00fc1158e763fc98bdfa85b567c99de46a45ebd1f836014dab5dbb7
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/heartbeat-9.1.10-darwin-x86_64.tar.gz) = 34781672
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/metricbeat-9.1.10-darwin-x86_64.tar.gz) = 0f04f56508f8c777c645a293dab39c98d6ca9c9d1200e02ecb2488acaf40008e
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/metricbeat-9.1.10-darwin-x86_64.tar.gz) = 58787845
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/packetbeat-9.1.10-darwin-x86_64.tar.gz) = 7c62edd0ec1274e351f4cf5d01dc358fe6603d4aa86fda77b7524f09ad25621c
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/packetbeat-9.1.10-darwin-x86_64.tar.gz) = 36009118
+SHA256 (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/elastic-beats-v9.1.10_GH0.tar.gz) = f716e56aaa96e0c1384d934321e70b8c27b235568862143670a06feb91375ee1
+SIZE (go/sysutils_beats91/elastic-beats-v9.1.10_GH0/elastic-beats-v9.1.10_GH0.tar.gz) = 99583589
diff --git a/sysutils/beats91/files/patch-auditbeat_auditbeat.reference.yml b/sysutils/beats91/files/patch-auditbeat_auditbeat.reference.yml
index 04ef963d9642..2dde79f41609 100644
--- a/sysutils/beats91/files/patch-auditbeat_auditbeat.reference.yml
+++ b/sysutils/beats91/files/patch-auditbeat_auditbeat.reference.yml
@@ -1,20 +1,20 @@
---- auditbeat/auditbeat.reference.yml.orig	2025-09-15 19:57:17 UTC
+--- auditbeat/auditbeat.reference.yml.orig	2026-01-07 19:28:13 UTC
 +++ auditbeat/auditbeat.reference.yml
 @@ -14,7 +14,7 @@ auditbeat.config.modules:
  auditbeat.config.modules:
  
    # Glob pattern for configuration reloading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/auditbeat.modules.d/*.yml
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
 @@ -1250,7 +1250,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/auditbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats91/files/patch-auditbeat_auditbeat.yml b/sysutils/beats91/files/patch-auditbeat_auditbeat.yml
index b9c74affaee6..33751d868f0b 100644
--- a/sysutils/beats91/files/patch-auditbeat_auditbeat.yml
+++ b/sysutils/beats91/files/patch-auditbeat_auditbeat.yml
@@ -1,13 +1,13 @@
---- auditbeat/auditbeat.yml.orig	2025-09-15 19:57:17 UTC
+--- auditbeat/auditbeat.yml.orig	2026-01-07 19:28:13 UTC
 +++ auditbeat/auditbeat.yml
 @@ -82,6 +82,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/auditbeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
diff --git a/sysutils/beats91/files/patch-dev-tools_mage_settings.go b/sysutils/beats91/files/patch-dev-tools_mage_settings.go
index fff0c065e200..7d8610c734f7 100644
--- a/sysutils/beats91/files/patch-dev-tools_mage_settings.go
+++ b/sysutils/beats91/files/patch-dev-tools_mage_settings.go
@@ -1,20 +1,20 @@
---- dev-tools/mage/settings.go.orig	2025-09-15 19:57:17 UTC
+--- dev-tools/mage/settings.go.orig	2026-01-07 19:28:13 UTC
 +++ dev-tools/mage/settings.go
 @@ -31,7 +31,6 @@ import (
  	"sync"
  	"time"
  
 -	"github.com/magefile/mage/sh"
  	"golang.org/x/text/cases"
  	"golang.org/x/text/language"
  	"gopkg.in/yaml.v3"
 @@ -282,7 +281,8 @@ func CommitHash() (string, error) {
  func CommitHash() (string, error) {
  	var err error
  	commitHashOnce.Do(func() {
 -		commitHash, err = sh.Output("git", "rev-parse", "HEAD")
 +		err = nil
 +		commitHash = "%%BEATSVERSION%%"
  	})
  	return commitHash, err
  }
diff --git a/sysutils/beats91/files/patch-filebeat_filebeat.reference.yml b/sysutils/beats91/files/patch-filebeat_filebeat.reference.yml
index 33dc3a22fd11..9514877abcfc 100644
--- a/sysutils/beats91/files/patch-filebeat_filebeat.reference.yml
+++ b/sysutils/beats91/files/patch-filebeat_filebeat.reference.yml
@@ -1,26 +1,26 @@
---- filebeat/filebeat.reference.yml.orig	2025-09-15 19:57:17 UTC
+--- filebeat/filebeat.reference.yml.orig	2026-01-07 19:28:13 UTC
 +++ filebeat/filebeat.reference.yml
-@@ -1329,12 +1329,12 @@ - type: filestream
+@@ -1339,12 +1339,12 @@ - type: filestream
  #filebeat.config:
    #inputs:
      #enabled: false
 -    #path: inputs.d/*.yml
 +    #path: filebeat.inputs.d/*.yml
      #reload.enabled: true
      #reload.period: 10s
    #modules:
      #enabled: true
 -    #path: modules.d/*.yml
 +    #path: filebeat.modules.d/*.yml
      #reload.enabled: true
      #reload.period: 10s
  
-@@ -2408,7 +2408,7 @@ output.elasticsearch:
+@@ -2418,7 +2418,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/filebeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats91/files/patch-filebeat_filebeat.yml b/sysutils/beats91/files/patch-filebeat_filebeat.yml
index c9a078cc6ffb..2a80f9780f0f 100644
--- a/sysutils/beats91/files/patch-filebeat_filebeat.yml
+++ b/sysutils/beats91/files/patch-filebeat_filebeat.yml
@@ -1,33 +1,33 @@
---- filebeat/filebeat.yml.orig	2025-09-15 19:57:17 UTC
+--- filebeat/filebeat.yml.orig	2026-01-07 19:28:13 UTC
 +++ filebeat/filebeat.yml
 @@ -81,7 +81,7 @@ filebeat.config.modules:
  
  filebeat.config.modules:
    # Glob pattern for configuration loading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/filebeat.modules.d/*.yml
  
    # Set to true to enable config reloading
    reload.enabled: false
 @@ -124,6 +124,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/filebeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
 @@ -195,8 +199,8 @@ processors:
    - add_host_metadata:
        when.not.contains.tags: forwarded
    - add_cloud_metadata: ~
 -  - add_docker_metadata: ~
 -  - add_kubernetes_metadata: ~
 +#  - add_docker_metadata: ~
 +#  - add_kubernetes_metadata: ~
  
  # ================================== Logging ===================================
  
diff --git a/sysutils/beats91/files/patch-heartbeat_heartbeat.yml b/sysutils/beats91/files/patch-heartbeat_heartbeat.yml
index 4e41b4e0d011..ccb1fd2c9af6 100644
--- a/sysutils/beats91/files/patch-heartbeat_heartbeat.yml
+++ b/sysutils/beats91/files/patch-heartbeat_heartbeat.yml
@@ -1,11 +1,11 @@
---- heartbeat/heartbeat.yml.orig	2021-07-04 13:59:29 UTC
+--- heartbeat/heartbeat.yml.orig	2026-01-07 19:28:13 UTC
 +++ heartbeat/heartbeat.yml
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ heartbeat.config.monitors:
  # of individual yaml files.
  heartbeat.config.monitors:
    # Directory + glob pattern to search for configuration files
 -  path: ${path.config}/monitors.d/*.yml
 +  path: ${path.config}/heartbeat.monitors.d/*.yml
    # If enabled, heartbeat will periodically check the config.monitors path for changes
    reload.enabled: false
    # How often to check for changes
diff --git a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_config.go b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_config.go
index e554c26110a0..60f935c473f0 100644
--- a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_config.go
+++ b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_config.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/docker/config.go.orig	2025-09-15 19:57:17 UTC
+--- libbeat/autodiscover/providers/docker/config.go.orig	2026-01-07 19:28:13 UTC
 +++ libbeat/autodiscover/providers/docker/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package docker
  
diff --git a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_docker.go b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_docker.go
index 1ba78ac9207b..c9f951e754f8 100644
--- a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_docker.go
+++ b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_docker_docker.go
@@ -1,20 +1,20 @@
---- libbeat/autodiscover/providers/docker/docker.go.orig	2025-09-15 19:57:17 UTC
+--- libbeat/autodiscover/providers/docker/docker.go.orig	2026-01-07 19:28:13 UTC
 +++ libbeat/autodiscover/providers/docker/docker.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package docker
  
 @@ -32,7 +32,7 @@ import (
  	"github.com/elastic/beats/v7/libbeat/common"
  
  	"github.com/elastic/elastic-agent-autodiscover/bus"
 -	"github.com/elastic/elastic-agent-autodiscover/docker"
 +	docker "github.com/elastic/elastic-agent-autodiscover/docker"
  	"github.com/elastic/elastic-agent-autodiscover/utils"
  	"github.com/elastic/elastic-agent-libs/config"
  	"github.com/elastic/elastic-agent-libs/keystore"
diff --git a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_config.go b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
index d61cc99ec22f..7c62e37002e4 100644
--- a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
+++ b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_config.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/kubernetes/config.go.orig	2025-09-15 19:57:17 UTC
+--- libbeat/autodiscover/providers/kubernetes/config.go.orig	2026-01-07 19:28:13 UTC
 +++ libbeat/autodiscover/providers/kubernetes/config.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package kubernetes
  
diff --git a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
index de1795f28db2..bd121d8c1ebd 100644
--- a/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
+++ b/sysutils/beats91/files/patch-libbeat_autodiscover_providers_kubernetes_kubernetes.go
@@ -1,11 +1,11 @@
---- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2025-09-15 19:57:17 UTC
+--- libbeat/autodiscover/providers/kubernetes/kubernetes.go.orig	2026-01-07 19:28:13 UTC
 +++ libbeat/autodiscover/providers/kubernetes/kubernetes.go
 @@ -15,7 +15,7 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 +//go:build linux || darwin || windows || freebsd
  
  package kubernetes
  
diff --git a/sysutils/beats91/files/patch-libbeat_scripts_Makefile b/sysutils/beats91/files/patch-libbeat_scripts_Makefile
index e84469edfa3e..6462a4b64bf0 100644
--- a/sysutils/beats91/files/patch-libbeat_scripts_Makefile
+++ b/sysutils/beats91/files/patch-libbeat_scripts_Makefile
@@ -1,26 +1,26 @@
---- libbeat/scripts/Makefile.orig	2025-09-15 19:57:17 UTC
+--- libbeat/scripts/Makefile.orig	2026-01-07 19:28:13 UTC
 +++ libbeat/scripts/Makefile
 @@ -47,7 +47,7 @@ GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name
  GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
  GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go' 2>/dev/null)
  GOPACKAGES_STRESSTESTS=$(shell find . -type d \( -name "stress" \) 2>/dev/null)
 -SHELL=bash
 +SHELL=sh
  ES_HOST?=elasticsearch
  ES_PORT?=9200
  ES_USER?=beats
 @@ -346,12 +346,12 @@ update: python-env fields collect config ## @build Upd
  update: python-env fields collect config ## @build Update expects the most recent version of libbeat in the GOPATH
  	@echo "Updating generated files for ${BEAT_NAME}"
  
 -ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
 +ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
  	mkdir -p include
  	go run ${INSTALL_FLAG} ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license $(LICENSE) -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
  endif
  
 -ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
 +ifneq ($(shell [[ $(BEAT_NAME) = libbeat || $(BEAT_NAME) = metricbeat ]] && echo true ),true)
  	@# Update docs
  	@mkdir -p docs
- 	@${PYTHON_ENV_EXE} ${ES_BEATS}/libbeat/scripts/generate_fields_docs.py $(PWD)/fields.yml ${BEAT_TITLE} ${ES_BEATS}
+ 	@${PYTHON_ENV_EXE} ${ES_BEATS}/libbeat/scripts/generate_fields_docs.py $(PWD)/fields.yml ${BEAT_NAME} ${ES_BEATS} --output_path $(ES_BEATS)/docs/reference/${BEAT_NAME}
diff --git a/sysutils/beats91/files/patch-metricbeat_metricbeat.reference.yml b/sysutils/beats91/files/patch-metricbeat_metricbeat.reference.yml
index 170a0e8a37f6..c5a364fa9733 100644
--- a/sysutils/beats91/files/patch-metricbeat_metricbeat.reference.yml
+++ b/sysutils/beats91/files/patch-metricbeat_metricbeat.reference.yml
@@ -1,20 +1,20 @@
---- metricbeat/metricbeat.reference.yml.orig	2025-09-15 19:57:17 UTC
+--- metricbeat/metricbeat.reference.yml.orig	2026-01-07 19:28:13 UTC
 +++ metricbeat/metricbeat.reference.yml
 @@ -14,7 +14,7 @@ metricbeat.config.modules:
  metricbeat.config.modules:
  
    # Glob pattern for configuration reloading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/metricbeat.modules.d/*.yml
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
-@@ -2199,7 +2199,7 @@ output.elasticsearch:
+@@ -2218,7 +2218,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/metricbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats91/files/patch-metricbeat_metricbeat.yml b/sysutils/beats91/files/patch-metricbeat_metricbeat.yml
index 7a8524fee677..117a17740e42 100644
--- a/sysutils/beats91/files/patch-metricbeat_metricbeat.yml
+++ b/sysutils/beats91/files/patch-metricbeat_metricbeat.yml
@@ -1,33 +1,33 @@
---- metricbeat/metricbeat.yml.orig	2025-09-15 19:57:17 UTC
+--- metricbeat/metricbeat.yml.orig	2026-01-07 19:28:13 UTC
 +++ metricbeat/metricbeat.yml
 @@ -11,7 +11,7 @@ metricbeat.config.modules:
  
  metricbeat.config.modules:
    # Glob pattern for configuration loading
 -  path: ${path.config}/modules.d/*.yml
 +  path: ${path.config}/metricbeat.modules.d/*.yml
  
    # Set to true to enable config reloading
    reload.enabled: false
 @@ -54,6 +54,10 @@ setup.template.settings:
  # website.
  #setup.dashboards.url:
  
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/metricbeat/kibana
 +
  # =================================== Kibana ===================================
  
  # Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
 @@ -127,8 +131,8 @@ processors:
  processors:
    - add_host_metadata: ~
    - add_cloud_metadata: ~
 -  - add_docker_metadata: ~
 -  - add_kubernetes_metadata: ~
 +#  - add_docker_metadata: ~
 +#  - add_kubernetes_metadata: ~
  
  
  # ================================== Logging ===================================
diff --git a/sysutils/beats91/files/patch-packetbeat_packetbeat.reference.yml b/sysutils/beats91/files/patch-packetbeat_packetbeat.reference.yml
index 665a35e9137b..1a55bd2c9a40 100644
--- a/sysutils/beats91/files/patch-packetbeat_packetbeat.reference.yml
+++ b/sysutils/beats91/files/patch-packetbeat_packetbeat.reference.yml
@@ -1,11 +1,11 @@
---- packetbeat/packetbeat.reference.yml.orig	2026-02-24 08:36:24 UTC
+--- packetbeat/packetbeat.reference.yml.orig	2026-01-07 19:28:13 UTC
 +++ packetbeat/packetbeat.reference.yml
-@@ -1718,7 +1718,7 @@ output.elasticsearch:
+@@ -1712,7 +1712,7 @@ output.elasticsearch:
  
  # The directory from where to read the dashboards. The default is the `kibana`
  # folder in the home path.
 -#setup.dashboards.directory: ${path.home}/kibana
 +#setup.dashboards.directory: %%DATADIR%%/packetbeat/kibana
  
  # The URL from where to download the dashboard archive. It is used instead of
  # the directory if it has a value.
diff --git a/sysutils/beats91/files/patch-packetbeat_packetbeat.yml b/sysutils/beats91/files/patch-packetbeat_packetbeat.yml
index 3189a9f70662..d8906d201cb3 100644
--- a/sysutils/beats91/files/patch-packetbeat_packetbeat.yml
+++ b/sysutils/beats91/files/patch-packetbeat_packetbeat.yml
@@ -1,23 +1,23 @@
---- packetbeat/packetbeat.yml.orig	2025-09-15 19:57:17 UTC
+--- packetbeat/packetbeat.yml.orig	2026-01-07 19:28:13 UTC
 +++ packetbeat/packetbeat.yml
 @@ -25,7 +25,8 @@
  #   internal_networks:
  #   - private
  #
 -packetbeat.interfaces.device: any
 +# On FreeBSD, you must specify particular interface to sniff on
 +packetbeat.interfaces.device: em0
  
  # Specify the amount of time between polling for changes in the default
  # route. This option is only used when one of the default route devices
 @@ -173,6 +174,10 @@ setup.template.settings:
  # versions, this URL points to the dashboard archive on the artifacts.elastic.co
  # website.
  #setup.dashboards.url:
 +
 +# The directory from where to read the dashboards. The default is the `kibana`
 +# folder in the home path.
 +#setup.dashboards.directory: %%DATADIR%%/packetbeat/kibana
  
  # =================================== Kibana ===================================
  
diff --git a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
index 4c27b7b7445b..4d46636621b6 100644
--- a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
+++ b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_client.go
@@ -1,13 +1,13 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go.orig	2022-11-25 21:51:45 UTC
+--- vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go.orig	2026-03-16 23:17:25 UTC
 +++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/client.go
 @@ -15,8 +15,8 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 -// +build linux darwin windows
 +//go:build linux || darwin || windows || freebsd
 +// +build linux darwin windows freebsd
  
  package docker
  
diff --git a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
index b3eb5109493f..c5d10d9bc8e9 100644
--- a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
+++ b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-autodiscover_docker_watcher.go
@@ -1,13 +1,13 @@
---- vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go.orig	2022-11-25 21:51:52 UTC
+--- vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go.orig	2026-03-16 23:17:25 UTC
 +++ vendor/github.com/elastic/elastic-agent-autodiscover/docker/watcher.go
 @@ -15,8 +15,8 @@
  // specific language governing permissions and limitations
  // under the License.
  
 -//go:build linux || darwin || windows
 -// +build linux darwin windows
 +//go:build linux || darwin || windows || freebsd
 +// +build linux darwin windows freebsd
  
  package docker
  
diff --git a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
index d9305bc9d551..3a86f6e0bb94 100644
--- a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
+++ b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__freebsd.go
@@ -1,10 +1,10 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2025-09-19 18:38:09 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go.orig	2026-03-16 23:17:26 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_freebsd.go
 @@ -56,3 +56,7 @@ func parseCPULine(line string) (CPU, error) {
  
  	return cpuData, errors.Join(errs...)
  }
 +
 +func scanCPUInfoFile(scanner *bufio.Scanner) ([]CPUInfo, error) {
 +	return cpuinfoScanner(scanner)
 +}
diff --git a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
index 287667e0d23a..c44c2746306a 100644
--- a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
+++ b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_cpu_metrics__procfs__common.go
@@ -1,20 +1,20 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2025-09-19 18:44:04 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go.orig	2026-03-16 23:17:26 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/cpu/metrics_procfs_common.go
 @@ -32,7 +32,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  func Get(m *Monitor) (CPUMetrics, error) {
  	procfs := m.Hostfs
  
 -	path := procfs.ResolveHostFS("/proc/stat")
 +	path := procfs.ResolveHostFS("/compat/linux/proc/stat")
  	fd, err := os.Open(path)
  	defer func() {
  		_ = fd.Close()
 @@ -46,7 +46,7 @@ func Get(m *Monitor) (CPUMetrics, error) {
  		return CPUMetrics{}, fmt.Errorf("scanning stat file: %w", err)
  	}
  
 -	cpuInfoPath := procfs.ResolveHostFS("/proc/cpuinfo")
 +	cpuInfoPath := procfs.ResolveHostFS("/compat/linux/proc/cpuinfo")
  	cpuInfoFd, err := os.Open(cpuInfoPath)
  	if err != nil {
  		return CPUMetrics{}, fmt.Errorf("opening '%s': %w", cpuInfoPath, err)
diff --git a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
index 26fa875e63eb..f3cc82048012 100644
--- a/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
+++ b/sysutils/beats91/files/patch-vendor_github.com_elastic_elastic-agent-system-metrics_metric_system_filesystem_filesystem__unix.go
@@ -1,14 +1,14 @@
---- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2022-11-25 22:00:53 UTC
+--- vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go.orig	2026-03-16 23:17:26 UTC
 +++ vendor/github.com/elastic/elastic-agent-system-metrics/metric/system/filesystem/filesystem_unix.go
 @@ -37,9 +37,9 @@ func (fs *FSStat) GetUsage() error {
  
  	fs.Total = opt.UintWith(stat.Blocks).MultUint64OrNone(uint64(stat.Bsize))
  	fs.Free = opt.UintWith(stat.Bfree).MultUint64OrNone(uint64(stat.Bsize))
 -	fs.Avail = opt.UintWith(stat.Bavail).MultUint64OrNone(uint64(stat.Bsize))
 +	fs.Avail = opt.UintWith(uint64(stat.Bavail)).MultUint64OrNone(uint64(stat.Bsize))
  	fs.Files = opt.UintWith(stat.Files)
 -	fs.FreeFiles = opt.UintWith(stat.Ffree)
 +	fs.FreeFiles = opt.UintWith(uint64(stat.Ffree))
  
  	fs.fillMetrics()
  
diff --git a/sysutils/beats91/files/patch-vendor_modules.txt b/sysutils/beats91/files/patch-vendor_modules.txt
index b7a9b36c8f7e..631d4365007b 100644
--- a/sysutils/beats91/files/patch-vendor_modules.txt
+++ b/sysutils/beats91/files/patch-vendor_modules.txt
@@ -1,10 +1,10 @@
 --- vendor/modules.txt.orig	2026-03-16 00:00:00 UTC
 +++ vendor/modules.txt
-@@ -2005,6 +2005,7 @@ github.com/elastic/go-sysinfo/providers/darwin
+@@ -2001,6 +2001,7 @@ github.com/elastic/go-sysinfo/providers/darwin
  github.com/elastic/go-sysinfo/internal/registry
  github.com/elastic/go-sysinfo/providers/aix
  github.com/elastic/go-sysinfo/providers/darwin
 +github.com/elastic/go-sysinfo/providers/freebsd
  github.com/elastic/go-sysinfo/providers/linux
  github.com/elastic/go-sysinfo/providers/shared
  github.com/elastic/go-sysinfo/providers/windows