git: 3c5941307404 - main - sysutils/beats7: Update to 7.15.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Sun, 24 Oct 2021 22:38:49 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c5941307404109bdfc8130de42d85a557180ecf

commit 3c5941307404109bdfc8130de42d85a557180ecf
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-10-24 21:36:34 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-10-24 22:37:44 +0000

    sysutils/beats7: Update to 7.15.1
    
    - Update to 7.15.1
    - For breaking changes for 7.15.x see UPDATING
    - Install kibana dashboard files from binary package (PR 247776)
    - Install .yml config files into examples directory (PR 258506)
    - Release notes:
    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.1.html
    
    PR:             247776, 258506
---
 UPDATING                                           |   30 +
 sysutils/beats7/Makefile                           |  159 ++-
 sysutils/beats7/distinfo                           |   92 +-
 .../files/patch-auditbeat_auditbeat.reference.yml  |   11 +-
 .../beats7/files/patch-auditbeat_auditbeat.yml     |   13 +
 .../files/patch-filebeat_filebeat.reference.yml    |   13 +-
 sysutils/beats7/files/patch-filebeat_filebeat.yml  |   15 +-
 .../patch-metricbeat_metricbeat.reference.yml      |   11 +-
 .../beats7/files/patch-metricbeat_metricbeat.yml   |   15 +-
 .../patch-packetbeat_packetbeat.reference.yml      |   11 +
 .../beats7/files/patch-packetbeat_packetbeat.yml   |   13 +-
 sysutils/beats7/files/pkg-message.in               |   12 +
 sysutils/beats7/pkg-plist                          | 1298 +-------------------
 13 files changed, 298 insertions(+), 1395 deletions(-)

diff --git a/UPDATING b/UPDATING
index f4c84f17bc8b..645983436bfe 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,36 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20211024:
+  AFFECTS: sysutils/beats7
+  AUTHOR: otis@FreeBSD.org
+
+  The following breaking changes apply to beats 7.15.0 and newer:
+
+    - All beats:
+    Loading Kibana assets (dashboards, index templates) rely on Saved Object API.
+    So to provide a reliable service, Beats can only import and export dashboards
+    using at least Kibana 7.15.
+
+    - Filebeat:
+      - Remove all alias fields pointing to ECS fields from modules. This affects
+        the Suricata and Traefik modules.
+      - Fix Crowdstrike ingest pipeline that was creating flattened process fields.
+      - Rename log.path to log.file.path in filestream to be consistent with log
+        input and ECS.
+
+    - Heartbeat:
+      - Remove long deprecated watch_poll functionality.
+      - Fix inconsistency in event.dataset values between heartbeat and fleet by
+        always setting this value to the monitor type / fleet dataset.
+
+    - Metricbeat:
+      - Fix Elasticsearch jvm.gc.collectors.old being exposed as young
+
+  Full changelog:
+    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.0.html
+    https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.15.1.html
+
 20211024:
   AFFECTS: users of databases/postgresql* and other software using PostgreSQL to run
   AUTHOR: kbowling@FreeBSD.org
diff --git a/sysutils/beats7/Makefile b/sysutils/beats7/Makefile
index dd7b97478684..bca46f275771 100644
--- a/sysutils/beats7/Makefile
+++ b/sysutils/beats7/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.14.0
+DISTVERSION=	7.15.1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	7
 
@@ -22,14 +22,15 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		Azure:azure-storage-blob-go:v0.8.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
 		Azure:go-amqp:v0.12.6:azure_go_amqp/vendor/github.com/Azure/go-amqp \
 		Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
-		Azure:go-autorest:5bd9621f41a0:azure_go_autorest_date \
+		Azure:go-autorest:4e2e1bb52ffb:azure_go_autorest_adal \
+		Azure:go-autorest:5bd9621f41a0:azure_go_autorest_to \
 		Azure:go-autorest:autorest/v0.9.6:azure_go_autorest_autorest \
+		Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \
 		Azure:go-autorest:b965d219bd9d:azure_go_autorest_auth \
 		Azure:go-autorest:cc407fb4f94c:azure_go_autorest_cli \
-		Azure:go-autorest:d3556005bee1:azure_go_autorest_adal \
-		Azure:go-autorest:logger/v0.1.0:azure_go_autorest_logger \
-		Azure:go-autorest:tracing/v0.5.0:azure_go_autorest_tracing \
-		Azure:go-autorest:v12.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
+		Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \
+		Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \
+		Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		DataDog:zstd:v1.4.1:datadog_zstd/vendor/github.com/DataDog/zstd \
 		Masterminds:semver:v1.4.2:masterminds_semver/vendor/github.com/Masterminds/semver \
@@ -47,11 +48,10 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
 		armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
 		aws:aws-lambda-go:v1.6.0:aws_aws_lambda_go/vendor/github.com/aws/aws-lambda-go \
-		aws:aws-sdk-go-v2:v0.9.0:aws_aws_sdk_go_v2/vendor/github.com/aws/aws-sdk-go-v2 \
+		aws:aws-sdk-go-v2:v0.24.0:aws_aws_sdk_go_v2/vendor/github.com/aws/aws-sdk-go-v2 \
 		awslabs:goformation:v4.1.0:awslabs_goformation_v4/vendor/github.com/awslabs/goformation/v4 \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bi-zone:go-winio:v0.4.15:bi_zone_go_winio/vendor/github.com/Microsoft/go-winio \
-		blakerouse:service:057808572ffa:blakerouse_service/vendor/github.com/kardianos/service \
 		blakesmith:ar:8bd4349a67f2:blakesmith_ar/vendor/github.com/blakesmith/ar \
 		bsm:sarama-cluster:7e67d87a6b3f:bsm_sarama_cluster/vendor/github.com/bsm/sarama-cluster \
 		cavaliercoder:badio:ce5280129e9e:cavaliercoder_badio/vendor/github.com/cavaliercoder/badio \
@@ -79,7 +79,6 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		devigned:tab:0c15cf42f9a2:devigned_tab/vendor/github.com/devigned/tab \
 		dgraph-io:badger:f5a7e0a1c83b:dgraph_io_badger_v2/vendor/github.com/dgraph-io/badger/v2 \
 		dgraph-io:ristretto:f66de99634de:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
-		dgrijalva:jwt-go:5e25c22bd5d6:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		dgryski:go-farm:6a90982ecee2:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
 		digitalocean:go-libvirt:6075ea3c39a1:digitalocean_go_libvirt/vendor/github.com/digitalocean/go-libvirt \
 		dimchansky:utfbom:v1.1.0:dimchansky_utfbom/vendor/github.com/dimchansky/utfbom \
@@ -98,13 +97,13 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		eapache:go-xerial-snappy:776d5712da21:eapache_go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \
 		eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \
 		eclipse:paho.mqtt.golang:0d940dd29fd2:eclipse_paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \
-		elastic:apm-agent-go:2aef45b9cf4b:elastic_apm_agent_go \
+		elastic:apm-agent-go:v1.14.0:elastic_apm_agent_go/vendor/github.com/elastic/apm-agent-go \
 		elastic:dhcp:57ec251c7eb3:elastic_dhcp/vendor/github.com/insomniacslk/dhcp \
 		elastic:ecs-logging-go-zap:v0.3.0:elastic_ecs_logging_go_zap/vendor/go.elastic.co/ecszap \
-		elastic:ecs:v1.10.0:elastic_ecs/vendor/github.com/elastic/ecs \
+		elastic:ecs:v1.11.0:elastic_ecs/vendor/github.com/elastic/ecs \
 		elastic:elastic-agent-client:f0905d9377f6:elastic_elastic_agent_client_v7/vendor/github.com/elastic/elastic-agent-client/v7 \
 		elastic:fsevents:e1d381a4d270:elastic_fsevents/vendor/github.com/fsnotify/fsevents \
-		elastic:go-concert:v0.1.0:elastic_go_concert/vendor/github.com/elastic/go-concert \
+		elastic:go-concert:v0.2.0:elastic_go_concert/vendor/github.com/elastic/go-concert \
 		elastic:go-fastjson:v1.1.0:elastic_go_fastjson/vendor/go.elastic.co/fastjson \
 		elastic:go-libaudit:v2.2.0:elastic_go_libaudit_v2/vendor/github.com/elastic/go-libaudit/v2 \
 		elastic:go-licence-detector:v0.4.0:elastic_go_licence_detector/vendor/go.elastic.co/go-licence-detector \
@@ -129,7 +128,7 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		go-mgo:mgo:3f83fa500528:go_mgo_mgo/vendor/gopkg.in/mgo.v2 \
 		go-ole:go-ole:14974a1cf647:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
 		go-sourcemap:sourcemap:v2.1.2:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \
-		go-sql-driver:mysql:v1.4.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-test:deep:v1.0.7:go_test_deep/vendor/github.com/go-test/deep \
 		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
@@ -141,19 +140,21 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		gofrs:flock:5135e617513b:gofrs_flock/vendor/github.com/gofrs/flock \
 		gofrs:uuid:v3.3.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang-jwt:jwt:v4.0.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \
 		golang-sql:civil:cb61b32ac6fe:golang_sql_civil/vendor/github.com/golang-sql/civil \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:5ff15b29337e:golang_crypto/vendor/golang.org/x/crypto \
 		golang:exp:da58074b4299:golang_exp/vendor/golang.org/x/exp \
 		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:lint:910be7a94367:golang_lint/vendor/golang.org/x/lint \
-		golang:mod:v0.3.0:golang_mod/vendor/golang.org/x/mod \
+		golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \
+		golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \
 		golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sync:43a5402ce75a:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:665e8c7367d1:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:0f9fa26af87c:golang_sys/vendor/golang.org/x/sys \
 		golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
 		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
@@ -181,7 +182,7 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		gotestyourself:gotestsum:v0.6.0:gotestyourself_gotestsum/vendor/gotest.tools/gotestsum \
 		grpc-ecosystem:grpc-gateway:v1.13.0:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
 		grpc:grpc-go:v1.29.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		h2non:filetype:f60988ab73d5:h2non_filetype/vendor/github.com/h2non/filetype \
+		h2non:filetype:v1.1.1:h2non_filetype/vendor/github.com/h2non/filetype \
 		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
 		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
 		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
@@ -209,9 +210,9 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
 		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
 		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
+		kardianos:service:a323c3813bc7:kardianos_service/vendor/github.com/kardianos/service \
 		karrick:godirwalk:v1.15.6:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
 		klauspost:compress:v1.11.0:klauspost_compress/vendor/github.com/klauspost/compress \
-		kolide:osquery-go:b019be7063ac:kolide_osquery_go/vendor/github.com/kolide/osquery-go \
 		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		kubernetes-sigs:structured-merge-diff:v4.0.1:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v4 \
 		kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
@@ -230,8 +231,9 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-ieproxy:7c0f6868bffe:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		matttproud:golang_protobuf_extensions:c182affec369:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:v1.1.15:miekg_dns/vendor/github.com/miekg/dns \
+		miekg:dns:v1.1.25:miekg_dns/vendor/github.com/miekg/dns \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:gox:v1.0.1:mitchellh_gox/vendor/github.com/mitchellh/gox \
 		mitchellh:hashstructure:ab25296c0f51:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \
@@ -241,9 +243,11 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		morikuni:aec:v1.0.0:morikuni_aec/vendor/github.com/morikuni/aec \
 		oklog:ulid:v1.3.1:oklog_ulid/vendor/github.com/oklog/ulid \
+		olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
 		opencontainers:go-digest:ac19fd6e7483:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
 		opencontainers:image-spec:775207bd45b6:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
 		opencontainers:runc:v1.0.0-rc9:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		osquery:osquery-go:99b4efa62ec5:osquery_osquery_go/vendor/github.com/osquery/osquery-go \
 		otiai10:copy:v1.2.0:otiai10_copy/vendor/github.com/otiai10/copy \
 		pierrec:lz4:v2.5.2:pierrec_lz4/vendor/github.com/pierrec/lz4 \
 		pierrre:gotestcover:924dca7d15f0:pierrre_gotestcover/vendor/github.com/pierrre/gotestcover \
@@ -281,7 +285,7 @@ GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor
 		urso:diag:21b3cc8eb797:urso_diag/vendor/github.com/urso/diag \
 		urso:go-bin:781c575c9f0e:urso_go_bin/vendor/github.com/urso/go-bin \
 		urso:magetools:290c89e0c230:urso_magetools/vendor/github.com/urso/magetools \
-		urso:sderr:c2a16f3d43ec:urso_sderr/vendor/github.com/urso/sderr \
+		urso:sderr:52b04e8f5c71:urso_sderr/vendor/github.com/urso/sderr \
 		vmware:govmomi:2cad15190b41:vmware_govmomi/vendor/github.com/vmware/govmomi \
 		xdg:scram:7eeb5667e42c:xdg_scram/vendor/github.com/xdg/scram \
 		xdg:stringprep:v1.0.0:xdg_stringprep/vendor/github.com/xdg/stringprep \
@@ -295,27 +299,38 @@ USE_RC_SUBR=	${GO_TARGETS}
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 CGO_CFLAGS=	-I.
 CGO_LDFLAGS=	-L.
-_FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 MAKE_ENV+=	GOBUILD_FLAGS="-mod=vendor"
 
 CONFLICTS=	beats6*
 
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
 OPTIONS_SUB=		yes
 
-AUDITBEAT_DESC=		Auditbeat
-FILEBEAT_DESC=		Filebeat
-HEARTBEAT_DESC=		Heartbeat
-METRICBEAT_DESC=	Metricbeat
-PACKETBEAT_DESC=	Packetbeat
-AUDITBEAT_VARS=		GO_TARGETS+=auditbeat
-FILEBEAT_VARS=		GO_TARGETS+=filebeat
-HEARTBEAT_VARS=		GO_TARGETS+=heartbeat
-METRICBEAT_VARS=	GO_TARGETS+=metricbeat
-PACKETBEAT_VARS=	CGO_CFLAGS+=-I/usr/include \
-			CGO_LDFLAGS+=-L/usr/lib \
-			GO_TARGETS+=packetbeat
+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
+AUDITBEAT_DISTFILES=		auditbeat-${DISTVERSION}-darwin-x86_64.tar.gz:auditbeat
+AUDITBEAT_VARS=			GO_TARGETS+=auditbeat
+FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat
+FILEBEAT_DISTFILES=		filebeat-${DISTVERSION}-darwin-x86_64.tar.gz:filebeat
+FILEBEAT_VARS=			GO_TARGETS+=filebeat
+HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat
+HEARTBEAT_DISTFILES=		heartbeat-${DISTVERSION}-darwin-x86_64.tar.gz:heartbeat
+HEARTBEAT_VARS=			GO_TARGETS+=heartbeat
+METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat
+METRICBEAT_DISTFILES=		metricbeat-${DISTVERSION}-darwin-x86_64.tar.gz:metricbeat
+METRICBEAT_VARS=		GO_TARGETS+=metricbeat
+PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat
+PACKETBEAT_DISTFILES=		packetbeat-${DISTVERSION}-darwin-x86_64.tar.gz:packetbeat
+PACKETBEAT_VARS=		CGO_CFLAGS+=-I/usr/include \
+				CGO_LDFLAGS+=-L/usr/lib \
+				GO_TARGETS+=packetbeat
 
 .include <bsd.port.options.mk>
 
@@ -344,6 +359,9 @@ post-extract:
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${PORTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
+.for BEATMOD in ${GO_TARGETS}
+	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/${BEATMOD}/*.yml
+.endfor
 
 do-build:
 .for GO_TARGET in ${GO_TARGETS}
@@ -360,31 +378,60 @@ do-install:
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference
-	(KIBANA_PATH=${STAGEDIR}${DATADIR}/${BEATMOD}/kibana; \
-		${MKDIR} $${KIBANA_PATH}; \
-		DASHBOARD_FIND_ARGS="-path */_meta/kibana -type d"; \
-		DASHBOARD_PATHS=$$(${SETENV} ${FIND} ${WRKSRC}/${BEATMOD} $${DASHBOARD_FIND_ARGS}); \
-		for DASHBOARD_PATH in $${DASHBOARD_PATHS}; \
-		do \
-			(cd $${DASHBOARD_PATH} && ${COPYTREE_SHARE} . $${KIBANA_PATH}); \
-		done)
 .endfor
-.for BEATMOD in filebeat metricbeat
-.if !empty(GO_TARGETS:M${BEATMOD})
-	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
-	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
-	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
-.endif
-.endfor
-.for BEATMOD in auditbeat
-.if !empty(GO_TARGETS:M${BEATMOD})
-	${MKDIR} ${STAGEDIR}${DATADIR}/${BEATMOD}/module
-	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
-.endif
+.for BEATMOD in ${GO_TARGETS}
+	(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 "The modules.d files are now in ${EXAMPLESDIR}/${BEATMOD}.modules.d" > \
+	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d/README; \
+	   echo ${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 "The monitors.d files are now in ${EXAMPLESDIR}/${BEATMOD}.monitors.d" > \
+	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d/README; \
+	   echo ${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
-.if !empty(GO_TARGETS:Mheartbeat)
-	${MKDIR} ${STAGEDIR}${ETCDIR}/heartbeat.monitors.d
-	(cd ${WRKSRC}/heartbeat/monitors.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/heartbeat.monitors.d)
-.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/beats7/distinfo b/sysutils/beats7/distinfo
index ebe19d203270..af2fa0680082 100644
--- a/sysutils/beats7/distinfo
+++ b/sysutils/beats7/distinfo
@@ -1,6 +1,16 @@
-TIMESTAMP = 1628171706
-SHA256 (elastic-beats-v7.14.0_GH0.tar.gz) = ad92fad296bd24fd426ba584a4c9baa3dd144de859e4e1a46dea0cda0d29b368
-SIZE (elastic-beats-v7.14.0_GH0.tar.gz) = 100311275
+TIMESTAMP = 1635069039
+SHA256 (auditbeat-7.15.1-darwin-x86_64.tar.gz) = 8d847b076e319bba36ec17d084d898234eddbbf65d44351afbd2f5099996f68d
+SIZE (auditbeat-7.15.1-darwin-x86_64.tar.gz) = 23211717
+SHA256 (filebeat-7.15.1-darwin-x86_64.tar.gz) = 94112d02fcf6a63cbdbb6bbaeee999ef6c5ee387ad1e39e32c15f8bbc996dc95
+SIZE (filebeat-7.15.1-darwin-x86_64.tar.gz) = 30176354
+SHA256 (heartbeat-7.15.1-darwin-x86_64.tar.gz) = 7f28dcc0a1fafe9fdfdd3fa1ba2514ff1bfe5c2cbc1434788c90acb0bf49c369
+SIZE (heartbeat-7.15.1-darwin-x86_64.tar.gz) = 23122967
+SHA256 (metricbeat-7.15.1-darwin-x86_64.tar.gz) = aa319a87b3a749e9383bf324a14a6ffb5a609217e904b752b0d1440a702188df
+SIZE (metricbeat-7.15.1-darwin-x86_64.tar.gz) = 35337449
+SHA256 (packetbeat-7.15.1-darwin-x86_64.tar.gz) = 011824033ea1155647a22a828776d5f3ca3c9de34dc53c7dd4e8b408f0d14762
+SIZE (packetbeat-7.15.1-darwin-x86_64.tar.gz) = 24056480
+SHA256 (elastic-beats-v7.15.1_GH0.tar.gz) = e865a0d7809200ffa2507a3ef180b399bd79bbee6b9d61428f412504854ab75b
+SIZE (elastic-beats-v7.15.1_GH0.tar.gz) = 101738032
 SHA256 (Azure-azure-amqp-common-go-v3.0.0_GH0.tar.gz) = f498d230bba298dbd42d3d904a7d174ad5a5ec2794bdcb2d26467137235dfb9a
 SIZE (Azure-azure-amqp-common-go-v3.0.0_GH0.tar.gz) = 17018
 SHA256 (Azure-azure-event-hubs-go-v3.1.2_GH0.tar.gz) = 3235c3f8c097f4e63d0e051bdf939ac33231d651faa5822632b8a8594adb5ddd
@@ -15,22 +25,24 @@ SHA256 (Azure-go-amqp-v0.12.6_GH0.tar.gz) = f8598280c68c60c57f9249af2cecf788048b
 SIZE (Azure-go-amqp-v0.12.6_GH0.tar.gz) = 396804
 SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821
 SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946
+SHA256 (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = f490eae213fa67895cee27f8724a64bbc359361233326b5134dfcb3fdd9e91d5
+SIZE (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = 172343
 SHA256 (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 1cd0fa3f623475cd94daf16fff33e873d6a8191de89b1306008744fbf78f892b
 SIZE (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 156993
 SHA256 (Azure-go-autorest-autorest-v0.9.6_GH0.tar.gz) = 589787170ff96e23dd929e25ca8844cbbb4d2c152c64f2068d10dda714a65139
 SIZE (Azure-go-autorest-autorest-v0.9.6_GH0.tar.gz) = 166960
+SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f
+SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123
 SHA256 (Azure-go-autorest-b965d219bd9d_GH0.tar.gz) = 51108622e85d3acb59d5ecedda0ecf835ddb8fa7aca8a39a52d6bd3ac5a0f2b4
 SIZE (Azure-go-autorest-b965d219bd9d_GH0.tar.gz) = 165544
 SHA256 (Azure-go-autorest-cc407fb4f94c_GH0.tar.gz) = 932b806389a390161ec7bf5651088726b11a9d3abe1debb02999ef4514aadcf6
 SIZE (Azure-go-autorest-cc407fb4f94c_GH0.tar.gz) = 164625
-SHA256 (Azure-go-autorest-d3556005bee1_GH0.tar.gz) = 977eb19975da382c795d889c1debba282037213e3a9f3a9db1a3eb9e1a7cdad5
-SIZE (Azure-go-autorest-d3556005bee1_GH0.tar.gz) = 166180
-SHA256 (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = d642ed3d87f3dc9fcde6c7ff7b82a3b3463b70f6ff2d5a7c6c37099d754c464e
-SIZE (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = 141423
-SHA256 (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = af322c3ccc73be318dddafd20f43baaa4be95dc58312f8d781cca29931cfa02f
-SIZE (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = 181045
-SHA256 (Azure-go-autorest-v12.2.0_GH0.tar.gz) = de9882aef87762981c13b03bc9fff092b5fb8c97a464ad65518b6cde3e347e7a
-SIZE (Azure-go-autorest-v12.2.0_GH0.tar.gz) = 173266
+SHA256 (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = fac35805dc320638a322b407c0cd0c471932a4855e9ef0485c85e533af8146dc
+SIZE (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = 175062
+SHA256 (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = b43cd0127dd6e91debe1eb98873e219817b71c10988d0a6c550e4ad19a29a8ea
+SIZE (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = 167113
+SHA256 (Azure-go-autorest-v14.2.0_GH0.tar.gz) = d0db0e47112570e3f2bd2e38ae56338f1e74625dd4cb553007082fdad5fd844d
+SIZE (Azure-go-autorest-v14.2.0_GH0.tar.gz) = 167851
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-zstd-v1.4.1_GH0.tar.gz) = 48c0ad82d9bc66d77ca95aa47374bed6b6466510da66a2b2f9215cb239cb8137
@@ -65,16 +77,14 @@ SHA256 (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 37f9cad3e321c452ea54824021ecd
 SIZE (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 8586
 SHA256 (aws-aws-lambda-go-v1.6.0_GH0.tar.gz) = aaf177ea73b32a6b10fb7d20a74381a6b32049a06c696ca8452a14fa87b87881
 SIZE (aws-aws-lambda-go-v1.6.0_GH0.tar.gz) = 51271
-SHA256 (aws-aws-sdk-go-v2-v0.9.0_GH0.tar.gz) = 874ccb29f51dff095297daabfd02dc71cd15592525df11877430513a5cfb7d42
-SIZE (aws-aws-sdk-go-v2-v0.9.0_GH0.tar.gz) = 9959914
+SHA256 (aws-aws-sdk-go-v2-v0.24.0_GH0.tar.gz) = 2b6c31da60cf93ff1dad5bff206bc22e60c7acab0ad43a0f1a484b0f00b08ca1
+SIZE (aws-aws-sdk-go-v2-v0.24.0_GH0.tar.gz) = 13343914
 SHA256 (awslabs-goformation-v4.1.0_GH0.tar.gz) = 0089b96bee355cca0d0745a35e476beca32a51fc093694b49689f345ca5d50ad
 SIZE (awslabs-goformation-v4.1.0_GH0.tar.gz) = 2703139
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (bi-zone-go-winio-v0.4.15_GH0.tar.gz) = 8243698dbdbc739d859a187f4fad0a2897b2b5ce29bd26a193ddb1c8f83eac61
 SIZE (bi-zone-go-winio-v0.4.15_GH0.tar.gz) = 120126
-SHA256 (blakerouse-service-057808572ffa_GH0.tar.gz) = ce3352c4fb6ed83d9c20c9395a24d2fa1d1bd7feb2168caed30b5f4c384606af
-SIZE (blakerouse-service-057808572ffa_GH0.tar.gz) = 24456
 SHA256 (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 51d0ca71a5f31d283eb43142fadd036c9df909ebe5e5d7af031f6b9b91c65a67
 SIZE (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 4057
 SHA256 (bsm-sarama-cluster-7e67d87a6b3f_GH0.tar.gz) = b93f207347451f8d874f65a42f42516196404a8ef0dd691118a354521e87ca1d
@@ -129,8 +139,6 @@ SHA256 (dgraph-io-badger-f5a7e0a1c83b_GH0.tar.gz) = 59d4310f05dd52634fd31a596bcd
 SIZE (dgraph-io-badger-f5a7e0a1c83b_GH0.tar.gz) = 346779
 SHA256 (dgraph-io-ristretto-f66de99634de_GH0.tar.gz) = 416a972246cece89e9aafca82583addc064c8bbabdbb5c6c614ecee6a59180f5
 SIZE (dgraph-io-ristretto-f66de99634de_GH0.tar.gz) = 266327
-SHA256 (dgrijalva-jwt-go-5e25c22bd5d6_GH0.tar.gz) = e90211288461124c0c6d2e111c5dec42dac4b72b39b87b8fbc74aced86c80344
-SIZE (dgrijalva-jwt-go-5e25c22bd5d6_GH0.tar.gz) = 37163
 SHA256 (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 47bda738d281105cc7b1cb832880f93d220eae40b18095dc322b0b7bf44fdf23
 SIZE (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 26800
 SHA256 (digitalocean-go-libvirt-6075ea3c39a1_GH0.tar.gz) = 90ff9d416a48f5a8fdac8f469f36c7fa03ec4262d73c9d54f14df8bb10ed3cb3
@@ -167,20 +175,20 @@ SHA256 (eapache-queue-v1.1.0_GH0.tar.gz) = 2be4716ba2bba5f7c125a8fe72ba534f02cf0
 SIZE (eapache-queue-v1.1.0_GH0.tar.gz) = 3502
 SHA256 (eclipse-paho.mqtt.golang-0d940dd29fd2_GH0.tar.gz) = 9096beeaa927266920bf6c28a4faccda36896c034e8532391ee31193e5c5f8f2
 SIZE (eclipse-paho.mqtt.golang-0d940dd29fd2_GH0.tar.gz) = 77249
-SHA256 (elastic-apm-agent-go-2aef45b9cf4b_GH0.tar.gz) = 68d682da02f1454b9ae2b38a792cb86fd3257e13d094ea7f06f3fac3f27171f9
-SIZE (elastic-apm-agent-go-2aef45b9cf4b_GH0.tar.gz) = 386002
+SHA256 (elastic-apm-agent-go-v1.14.0_GH0.tar.gz) = 8baa16f7da5a4435f49ace105bb79be17765e967a16c8a16da0643fb9bdfddb6
+SIZE (elastic-apm-agent-go-v1.14.0_GH0.tar.gz) = 569728
 SHA256 (elastic-dhcp-57ec251c7eb3_GH0.tar.gz) = ef8dc41b36cceda8bee717073b0e25109ea43ed2dc0f38a577ace917f293010e
 SIZE (elastic-dhcp-57ec251c7eb3_GH0.tar.gz) = 65299
 SHA256 (elastic-ecs-logging-go-zap-v0.3.0_GH0.tar.gz) = fbfd4f567e729bb0b60820c7b0848711ead337af053f61d802a31a57600562a3
 SIZE (elastic-ecs-logging-go-zap-v0.3.0_GH0.tar.gz) = 21041
-SHA256 (elastic-ecs-v1.10.0_GH0.tar.gz) = 8f4a714189dfca0334325ab57e5a63087a06da2b26431b750ab210fdccb26827
-SIZE (elastic-ecs-v1.10.0_GH0.tar.gz) = 887105
+SHA256 (elastic-ecs-v1.11.0_GH0.tar.gz) = 01fb60155ebf50f05d9b0f72dc44f3ca7c24c8d8b67f171a6b42d68d662dbbbc
+SIZE (elastic-ecs-v1.11.0_GH0.tar.gz) = 1057560
 SHA256 (elastic-elastic-agent-client-f0905d9377f6_GH0.tar.gz) = 2878cf698aeca905f619e6850764e8199916d1ca4fd73dc3cc3c45e259436d66
 SIZE (elastic-elastic-agent-client-f0905d9377f6_GH0.tar.gz) = 28582
 SHA256 (elastic-fsevents-e1d381a4d270_GH0.tar.gz) = 76950a74dc771138a2bff412742baebedb3d86318bb3b0de24292f0f538e6ed8
 SIZE (elastic-fsevents-e1d381a4d270_GH0.tar.gz) = 12596
-SHA256 (elastic-go-concert-v0.1.0_GH0.tar.gz) = 6077da338aaa16f35073324ba812efde9f97df04d57f93c50ad4ad60ecc14bb7
-SIZE (elastic-go-concert-v0.1.0_GH0.tar.gz) = 28272
+SHA256 (elastic-go-concert-v0.2.0_GH0.tar.gz) = 9cca7617718b9dcd2a0741e3b58a375cd7b27ee6c2f93840683fbce1c5e268d1
+SIZE (elastic-go-concert-v0.2.0_GH0.tar.gz) = 30154
 SHA256 (elastic-go-fastjson-v1.1.0_GH0.tar.gz) = 76bce00719eef94c2fd173ea92e95daaeec7c46d909657436b90fa46931a7571
 SIZE (elastic-go-fastjson-v1.1.0_GH0.tar.gz) = 10404
 SHA256 (elastic-go-libaudit-v2.2.0_GH0.tar.gz) = 07d5c989fc355e1e3b1af8a7da58e727cb8f38a6f269023985df03af7d60afeb
@@ -229,8 +237,8 @@ SHA256 (go-ole-go-ole-14974a1cf647_GH0.tar.gz) = 87c0a03b90f3e5e22d1272ea620429e
 SIZE (go-ole-go-ole-14974a1cf647_GH0.tar.gz) = 52034
 SHA256 (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6e9981d0cf3def24f67bb1f0af720f0100105d4b387fc0fe7dc7d3535388c61a
 SIZE (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6378
-SHA256 (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 9b5d435903a674cd761310365df992a1b4eed2e4e2f0c8aa90bdc996c330d7ae
-SIZE (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 83524
+SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
+SIZE (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
 SHA256 (go-test-deep-v1.0.7_GH0.tar.gz) = c4c8e26ec8924e4608b669a4234f8b8880db8bb1f47ec6f22da0d4e8634fc849
 SIZE (go-test-deep-v1.0.7_GH0.tar.gz) = 10199
 SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
@@ -253,6 +261,8 @@ SHA256 (gofrs-uuid-v3.3.0_GH0.tar.gz) = e9e33d86dfb753b1569414d733e8483d565345df
 SIZE (gofrs-uuid-v3.3.0_GH0.tar.gz) = 17919
 SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
 SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
+SHA256 (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 5d305c23625c50ed87968122a7fe17d760665857199b9a8e13ad679931ccd191
+SIZE (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 40180
 SHA256 (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = ebc100d46719b1374b59e59bc63baffaec6a2bface5b0d519024f43c097cdc3e
 SIZE (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = 8359
 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
@@ -265,8 +275,10 @@ SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e
 SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
 SHA256 (golang-lint-910be7a94367_GH0.tar.gz) = fb702d9a4efbe7f23f33772e2ba9908db74d33beff3c1688ddb9a72a736bdf41
 SIZE (golang-lint-910be7a94367_GH0.tar.gz) = 31816
-SHA256 (golang-mod-v0.3.0_GH0.tar.gz) = bc97bb300928a00cfe64d97b3240c760668060cda0767e0d0b413e506fc3fa0a
-SIZE (golang-mod-v0.3.0_GH0.tar.gz) = 93941
+SHA256 (golang-mock-v1.6.0_GH0.tar.gz) = 470174971c3a63361149a30f5b2d3a716a198afeb6cc71daa30712faa7293942
+SIZE (golang-mock-v1.6.0_GH0.tar.gz) = 69251
+SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917
+SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584
 SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
 SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
 SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
@@ -277,8 +289,8 @@ SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c4783
 SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
 SHA256 (golang-sync-43a5402ce75a_GH0.tar.gz) = c9a58dbd06f5747ccf112cc29eb6f82ab2b8a3cd18908efa2d949a27d3924fc8
 SIZE (golang-sync-43a5402ce75a_GH0.tar.gz) = 17275
-SHA256 (golang-sys-665e8c7367d1_GH0.tar.gz) = 19c3498496d91ac9c0c0226c9b832c23a0b042b9a707be811ef976e801d373f4
-SIZE (golang-sys-665e8c7367d1_GH0.tar.gz) = 1200405
+SHA256 (golang-sys-0f9fa26af87c_GH0.tar.gz) = 4a7725e85ddaba8f2efc9b799eb00f4b3d522ea8ed9ad0ce08783febe3ec97a1
+SIZE (golang-sys-0f9fa26af87c_GH0.tar.gz) = 1202044
 SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
 SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239
 SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
@@ -333,8 +345,8 @@ SHA256 (grpc-ecosystem-grpc-gateway-v1.13.0_GH0.tar.gz) = 6ddd9a29326a09ed0bea23
 SIZE (grpc-ecosystem-grpc-gateway-v1.13.0_GH0.tar.gz) = 464268
 SHA256 (grpc-grpc-go-v1.29.1_GH0.tar.gz) = b626c128878d1d7aaf79c6f4f73cba0eadd26405a30fc00b71cc9a12e56fef38
 SIZE (grpc-grpc-go-v1.29.1_GH0.tar.gz) = 892944
-SHA256 (h2non-filetype-f60988ab73d5_GH0.tar.gz) = 96d861afde9da47a15a5c258825ae69df83cd46248de058f217252542b654125
-SIZE (h2non-filetype-f60988ab73d5_GH0.tar.gz) = 9056706
+SHA256 (h2non-filetype-v1.1.1_GH0.tar.gz) = 4186f491c70aa1b976233aabee679b27f1355877c17b8e11d2505fc77d3e4276
+SIZE (h2non-filetype-v1.1.1_GH0.tar.gz) = 8977934
 SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
 SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
 SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b
@@ -389,12 +401,12 @@ SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328
 SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
 SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
 SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
+SHA256 (kardianos-service-a323c3813bc7_GH0.tar.gz) = fd9df2ee5933ccff4c0ba3e4f6714acd027fa8d775259a94ffba937e86018c35
+SIZE (kardianos-service-a323c3813bc7_GH0.tar.gz) = 26879
 SHA256 (karrick-godirwalk-v1.15.6_GH0.tar.gz) = d861987afed4e6c6998ab5d502c1480390175b3dc64b2c6cdb46367c2fdc054f
 SIZE (karrick-godirwalk-v1.15.6_GH0.tar.gz) = 24756
 SHA256 (klauspost-compress-v1.11.0_GH0.tar.gz) = 921d54cd6384e48e489afa06cd4e276a9a0e3ef760f934d971137c06eac474ae
 SIZE (klauspost-compress-v1.11.0_GH0.tar.gz) = 17324280
-SHA256 (kolide-osquery-go-b019be7063ac_GH0.tar.gz) = 37b2af29ecd1ea6a9274e64e86ffb1f3013d80ed15aaa1be20f15d8035299aa6
-SIZE (kolide-osquery-go-b019be7063ac_GH0.tar.gz) = 34807
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
 SHA256 (kubernetes-sigs-structured-merge-diff-v4.0.1_GH0.tar.gz) = 97fe500d1378fe8cf233f590f10dda77020d34aa789595c13947aa4dbe9fee99
@@ -431,10 +443,12 @@ SHA256 (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = caf8b5faaa47c492900bd84e6b56
 SIZE (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = 8486
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
 SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835
+SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714
 SHA256 (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 66a6911e621bfd8823078568688b5683d66ce0b8f85da7b1288d3533d2724735
 SIZE (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 37518
-SHA256 (miekg-dns-v1.1.15_GH0.tar.gz) = a27dbc6e920596548db7edb0996a9338f60f14dd65255787a78dad8de039aba3
-SIZE (miekg-dns-v1.1.15_GH0.tar.gz) = 1692734
+SHA256 (miekg-dns-v1.1.25_GH0.tar.gz) = e94ac821ccdcb32dd227af714b7fa9ce03d307d23f8818352ef2d571dc60e3cd
+SIZE (miekg-dns-v1.1.25_GH0.tar.gz) = 179389
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
 SHA256 (mitchellh-gox-v1.0.1_GH0.tar.gz) = 25aab55a4ba75653931be2a2b95e29216b54bd8fecc7931bd416efe49a388229
@@ -453,12 +467,16 @@ SHA256 (morikuni-aec-v1.0.0_GH0.tar.gz) = 560235880d23e531fcbf59ab768bdb213ea54d
 SIZE (morikuni-aec-v1.0.0_GH0.tar.gz) = 55416
 SHA256 (oklog-ulid-v1.3.1_GH0.tar.gz) = 499a6ee77ca473a44ad9f11425a8f87f6c02ff1221b11f24d13bee13ce632640
 SIZE (oklog-ulid-v1.3.1_GH0.tar.gz) = 55582
+SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
+SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
 SHA256 (opencontainers-go-digest-ac19fd6e7483_GH0.tar.gz) = 08c5675cfc1319a4a3a0025415afa8677c257c669d644637e6234c527af992f9
 SIZE (opencontainers-go-digest-ac19fd6e7483_GH0.tar.gz) = 19139
 SHA256 (opencontainers-image-spec-775207bd45b6_GH0.tar.gz) = 83643269bda44a95279eebc7fd5d0ed35de1b4afed73b44f87b1e1e74064d9d2
 SIZE (opencontainers-image-spec-775207bd45b6_GH0.tar.gz) = 141521
 SHA256 (opencontainers-runc-v1.0.0-rc9_GH0.tar.gz) = 2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4
 SIZE (opencontainers-runc-v1.0.0-rc9_GH0.tar.gz) = 1883127
+SHA256 (osquery-osquery-go-99b4efa62ec5_GH0.tar.gz) = 7b5a85d04d5207b7b92eac00ed6125a155b64e0be984ba0096a368f230f3d468
+SIZE (osquery-osquery-go-99b4efa62ec5_GH0.tar.gz) = 34876
 SHA256 (otiai10-copy-v1.2.0_GH0.tar.gz) = 3ed36d24b75b99fe1a24743f7d8834ac60df5396203fd82b370b1f2fdb9d4214
 SIZE (otiai10-copy-v1.2.0_GH0.tar.gz) = 6429
 SHA256 (pierrec-lz4-v2.5.2_GH0.tar.gz) = bf5ad1ce74f264bad828cea8a546e5d2100a7ab67695bf7badcbe14c57ec4df4
@@ -533,8 +551,8 @@ SHA256 (urso-go-bin-781c575c9f0e_GH0.tar.gz) = 2680616df52967de0b5a904bbfd118499
 SIZE (urso-go-bin-781c575c9f0e_GH0.tar.gz) = 8232
 SHA256 (urso-magetools-290c89e0c230_GH0.tar.gz) = 197fb140865b30794252888e96d7d837d28809e9a45d7c2a91575bc4362781bd
 SIZE (urso-magetools-290c89e0c230_GH0.tar.gz) = 6417
-SHA256 (urso-sderr-c2a16f3d43ec_GH0.tar.gz) = 51a557581105fac620995d41fdd18951dd1bab0786aa87c8aa28709a7e8b1f66
-SIZE (urso-sderr-c2a16f3d43ec_GH0.tar.gz) = 9750
+SHA256 (urso-sderr-52b04e8f5c71_GH0.tar.gz) = 2b23ebeb8976cf7f65f0c54dce8d0e64c7d87062e97eac5b6b8e4f127814400e
+SIZE (urso-sderr-52b04e8f5c71_GH0.tar.gz) = 9811
 SHA256 (vmware-govmomi-2cad15190b41_GH0.tar.gz) = 01a96f4ba7630bb11addee19188fd321d394f34df4b9b406652e30f9b7a23b50
 SIZE (vmware-govmomi-2cad15190b41_GH0.tar.gz) = 816453
 SHA256 (xdg-scram-7eeb5667e42c_GH0.tar.gz) = 9a28d88b1d4aade9c9181e72e5f20e2e9f24838662d09a6e6b39a76cfba20369
diff --git a/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml b/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml
index be8e71ffaffe..4ffb27215763 100644
--- a/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml
+++ b/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml
@@ -1,4 +1,4 @@
---- auditbeat/auditbeat.reference.yml.orig	2020-09-25 20:02:33 UTC
+--- auditbeat/auditbeat.reference.yml.orig	2021-10-07 17:20:31 UTC
 +++ auditbeat/auditbeat.reference.yml
 @@ -14,7 +14,7 @@
  auditbeat.config.modules:
@@ -9,3 +9,12 @@
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
+@@ -1159,7 +1159,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 dashboards archive. It is used instead of
+ # the directory if it has a value.
diff --git a/sysutils/beats7/files/patch-auditbeat_auditbeat.yml b/sysutils/beats7/files/patch-auditbeat_auditbeat.yml
new file mode 100644
index 000000000000..032360fc254b
--- /dev/null
+++ b/sysutils/beats7/files/patch-auditbeat_auditbeat.yml
@@ -0,0 +1,13 @@
+--- auditbeat/auditbeat.yml.orig	2021-10-24 20:40:41 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/beats7/files/patch-filebeat_filebeat.reference.yml b/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml
index c8053bbe78bf..a48340bdd20e 100644
--- a/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml
+++ b/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml
@@ -1,6 +1,6 @@
---- filebeat/filebeat.reference.yml.orig	2021-06-10 16:57:09 UTC
+--- filebeat/filebeat.reference.yml.orig	2021-10-07 17:20:31 UTC
 +++ filebeat/filebeat.reference.yml
-@@ -1016,7 +1016,7 @@ filebeat.inputs:
+@@ -1025,7 +1025,7 @@ filebeat.inputs:
      #reload.period: 10s
    #modules:
      #enabled: false
@@ -9,3 +9,12 @@
      #reload.enabled: true
      #reload.period: 10s
  
+@@ -2070,7 +2070,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 dashboards archive. It is used instead of
+ # the directory if it has a value.
diff --git a/sysutils/beats7/files/patch-filebeat_filebeat.yml b/sysutils/beats7/files/patch-filebeat_filebeat.yml
index 416e7f45b953..2a03714c8ccb 100644
--- a/sysutils/beats7/files/patch-filebeat_filebeat.yml
+++ b/sysutils/beats7/files/patch-filebeat_filebeat.yml
@@ -1,4 +1,4 @@
---- filebeat/filebeat.yml.orig	2021-06-10 16:57:09 UTC
+--- filebeat/filebeat.yml.orig	2021-10-07 17:20:31 UTC
 +++ filebeat/filebeat.yml
 @@ -95,7 +95,7 @@ filebeat.inputs:
  
@@ -9,7 +9,18 @@
  
    # Set to true to enable config reloading
    reload.enabled: false
-@@ -205,8 +205,8 @@ processors:
+@@ -138,6 +138,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.
+@@ -205,8 +209,8 @@ processors:
    - add_host_metadata:
        when.not.contains.tags: forwarded
    - add_cloud_metadata: ~
diff --git a/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml b/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml
index d568583ad448..12b6f66ce290 100644
--- a/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml
+++ b/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml
@@ -1,4 +1,4 @@
---- metricbeat/metricbeat.reference.yml.orig	2020-09-25 20:07:52 UTC
+--- metricbeat/metricbeat.reference.yml.orig	2021-10-07 17:20:31 UTC
 +++ metricbeat/metricbeat.reference.yml
 @@ -14,7 +14,7 @@
  metricbeat.config.modules:
@@ -9,3 +9,12 @@
  
    # Period on which files under path should be checked for changes
    reload.period: 10s
+@@ -1970,7 +1970,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 dashboards archive. It is used instead of
+ # the directory if it has a value.
diff --git a/sysutils/beats7/files/patch-metricbeat_metricbeat.yml b/sysutils/beats7/files/patch-metricbeat_metricbeat.yml
index ab654fa91272..0dcf745f9cfd 100644
--- a/sysutils/beats7/files/patch-metricbeat_metricbeat.yml
+++ b/sysutils/beats7/files/patch-metricbeat_metricbeat.yml
@@ -1,4 +1,4 @@
---- metricbeat/metricbeat.yml.orig	2020-09-17 22:28:49 UTC
+--- metricbeat/metricbeat.yml.orig	2021-10-07 17:20:31 UTC
 +++ metricbeat/metricbeat.yml
 @@ -11,7 +11,7 @@
  
@@ -9,7 +9,18 @@
  
    # Set to true to enable config reloading
    reload.enabled: false
-@@ -123,8 +123,8 @@ output.elasticsearch:
+@@ -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.
+@@ -123,8 +127,8 @@ output.elasticsearch:
  processors:
    - add_host_metadata: ~
    - add_cloud_metadata: ~
diff --git a/sysutils/beats7/files/patch-packetbeat_packetbeat.reference.yml b/sysutils/beats7/files/patch-packetbeat_packetbeat.reference.yml
new file mode 100644
index 000000000000..7c02e3d5058d
--- /dev/null
+++ b/sysutils/beats7/files/patch-packetbeat_packetbeat.reference.yml
@@ -0,0 +1,11 @@
+--- packetbeat/packetbeat.reference.yml.orig	2021-10-24 20:47:25 UTC
++++ packetbeat/packetbeat.reference.yml
+@@ -1653,7 +1653,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 dashboards archive. It is used instead of
+ # the directory if it has a value.
diff --git a/sysutils/beats7/files/patch-packetbeat_packetbeat.yml b/sysutils/beats7/files/patch-packetbeat_packetbeat.yml
index 7099994f20f0..aab48c576416 100644
--- a/sysutils/beats7/files/patch-packetbeat_packetbeat.yml
+++ b/sysutils/beats7/files/patch-packetbeat_packetbeat.yml
@@ -1,4 +1,4 @@
---- packetbeat/packetbeat.yml.orig	2021-06-10 16:57:09 UTC
+--- packetbeat/packetbeat.yml.orig	2021-10-07 17:20:31 UTC
 +++ packetbeat/packetbeat.yml
 @@ -10,8 +10,10 @@
  # =============================== Network device ===============================
@@ -13,3 +13,14 @@
  
  # The network CIDR blocks that are considered "internal" networks for
  # the purpose of network perimeter boundary classification. The valid
+@@ -151,6 +153,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/beats7/files/pkg-message.in b/sysutils/beats7/files/pkg-message.in
new file mode 100644
index 000000000000..d774668512dc
--- /dev/null
+++ b/sysutils/beats7/files/pkg-message.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+The modules.d and monitors.d files are now installed into
+%%EXAMPLESDIR%%
+
+See README file in %%ETCDIR%% for respective beat information.
+
+See UPDATING file in ports top level directory for list of breaking changes.
+EOM
+}
+]
diff --git a/sysutils/beats7/pkg-plist b/sysutils/beats7/pkg-plist
index f75d7e0a282e..5710ac7d1364 100644
--- a/sysutils/beats7/pkg-plist
+++ b/sysutils/beats7/pkg-plist
@@ -1,1309 +1,21 @@
 %%AUDITBEAT%%sbin/auditbeat
 %%AUDITBEAT%%%%ETCDIR%%/auditbeat.yml.reference
-%%AUDITBEAT%%%%ETCDIR%%/auditbeat.yml.sample
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-file-integrity.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-executions.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-overview.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-sockets.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/accept.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-32bit.conf
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-64bit.conf
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/config.yml.tmpl
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/data.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/docs.asciidoc
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/execve.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/fields.yml
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-overview.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-sockets.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/module.yml
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/config.yml.tmpl
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/data.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/docs.asciidoc
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/fields.yml
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/kibana/7/dashboard/auditbeat-file-integrity.json
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/module.yml
-%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/schema.fbs
-%%AUDITBEAT%%@dir %%DATADIR%%/auditbeat/module/file_integrity/monitor
-%%AUDITBEAT%%@dir %%DATADIR%%/auditbeat/module/file_integrity/schema
+%%AUDITBEAT%%@sample %%ETCDIR%%/auditbeat.yml.sample
 %%AUDITBEAT%%@dir /var/db/beats/auditbeat
 %%FILEBEAT%%sbin/filebeat
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/apache.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/auditd.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/elasticsearch.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/haproxy.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/icinga.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/iis.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kafka.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kibana.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/logstash.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mongodb.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mysql.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/nats.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/nginx.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/osquery.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/pensando.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/postgresql.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/redis.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/santa.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/system.yml.disabled
-%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/traefik.yml.disabled
 %%FILEBEAT%%%%ETCDIR%%/filebeat.yml.reference
-%%FILEBEAT%%%%ETCDIR%%/filebeat.yml.sample
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Kafka-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Mongodb-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Postgresql-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Postgresql-slowlogs.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-apache.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-auditd.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-auth-sudo-commands.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-haproxy-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-debug-log.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-main-log.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-startup-errors.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-iis.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-logstash-log.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-logstash-slowlog.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-mysql.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nats-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-new-users-and-groups.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-ingress-logs.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-ingress-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-logs.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-redis.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-ssh-login-attempts.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-syslog.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-traefik-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/filebeat-santa-log-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/osquery-compliance.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/osquery-rootkit.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/pensando-dfw-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/config.reference.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/config.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/docs.asciidoc
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/kibana/7/dashboard/Filebeat-apache.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/config/access.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/config/error.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/module.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/module.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.reference.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/docs.asciidoc
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/7/dashboard/Filebeat-auditd.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/config/log.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/ingest/gen-ecs-mappings.py
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/module.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/config.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/docs.asciidoc
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/config/audit.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-json.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-plaintext.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/config/log.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline-json.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline-plaintext.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/config/gc.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/module.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/config/log.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline-json.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline-plaintext.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/config/slowlog.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline-json.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline-plaintext.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/config.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/docs.asciidoc
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/kibana/7/dashboard/Filebeat-haproxy-overview.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/file.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/syslog.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/module.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.reference.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/docs.asciidoc
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-debug-log.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-main-log.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-startup-errors.json
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/config/debug.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/_meta/fields.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/config/main.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/ingest/pipeline.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/manifest.yml
-%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/module.yml
*** 1148 LINES SKIPPED ***