Date: Sat, 13 Jun 2020 22:57:33 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538707 - in head/sysutils/beats7: . files Message-ID: <202006132257.05DMvXp7022574@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sat Jun 13 22:57:33 2020 New Revision: 538707 URL: https://svnweb.freebsd.org/changeset/ports/538707 Log: * Update to 7.7.1 * Fix some minor packaging issues Added: head/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go (contents, props changed) Modified: head/sysutils/beats7/Makefile head/sysutils/beats7/distinfo head/sysutils/beats7/files/patch-libbeat_scripts_Makefile head/sysutils/beats7/pkg-plist Modified: head/sysutils/beats7/Makefile ============================================================================== --- head/sysutils/beats7/Makefile Sat Jun 13 22:55:26 2020 (r538706) +++ head/sysutils/beats7/Makefile Sat Jun 13 22:57:33 2020 (r538707) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 7.6.2 +PORTVERSION= 7.7.1 DISTVERSIONPREFIX=v CATEGORIES= sysutils PKGNAMESUFFIX?= 7 @@ -20,7 +20,7 @@ CONFLICTS= beats6* GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} FIND_ARGS= "! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*" -MAKE_ENV+= GOBUILD_FLAGS="" +MAKE_ENV+= GOBUILD_FLAGS="-mod=vendor" CGO_CFLAGS= -I. CGO_LDFLAGS= -L. @@ -71,13 +71,17 @@ do-install: 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 .endfor .include <bsd.port.mk> Modified: head/sysutils/beats7/distinfo ============================================================================== --- head/sysutils/beats7/distinfo Sat Jun 13 22:55:26 2020 (r538706) +++ head/sysutils/beats7/distinfo Sat Jun 13 22:57:33 2020 (r538707) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584101680 -SHA256 (elastic-beats-v7.6.2_GH0.tar.gz) = 47d7c35e482efffd01bb2eecda13315b43a23d54d1766b6db88521759c108d99 -SIZE (elastic-beats-v7.6.2_GH0.tar.gz) = 77851341 +TIMESTAMP = 1591573393 +SHA256 (elastic-beats-v7.7.1_GH0.tar.gz) = 00b276685227dfd4b04254bb35a6bec6735d73961a19e5a4ad77b4dc581f48b3 +SIZE (elastic-beats-v7.7.1_GH0.tar.gz) = 90130095 Modified: head/sysutils/beats7/files/patch-libbeat_scripts_Makefile ============================================================================== --- head/sysutils/beats7/files/patch-libbeat_scripts_Makefile Sat Jun 13 22:55:26 2020 (r538706) +++ head/sysutils/beats7/files/patch-libbeat_scripts_Makefile Sat Jun 13 22:57:33 2020 (r538707) @@ -2,7 +2,7 @@ Fix syntax for sh (get rid of bash-isms) --- libbeat/scripts/Makefile.orig 2020-02-28 18:43:02 UTC +++ libbeat/scripts/Makefile -@@ -35,7 +35,7 @@ GOFILES = $(shell find . -type f -name ' +@@ -43,7 +43,7 @@ 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 . -name '*.go' 2>/dev/null | xargs awk 'FNR>1 {nextfile} /\+build.*stresstest/ {print FILENAME; nextfile}' | xargs dirname | uniq) @@ -11,16 +11,16 @@ Fix syntax for sh (get rid of bash-isms) ES_HOST?=elasticsearch ES_PORT?=9200 ES_USER?=beats -@@ -128,7 +128,7 @@ ${BEAT_NAME}.test: $(GOFILES_ALL) +@@ -140,7 +140,7 @@ .PHONY: crosscompile crosscompile: ## @build Cross-compile beat for the OS'es specified in GOX_OS variable. The binaries are placed in the build/bin directory. crosscompile: $(GOFILES) -ifneq ($(shell [[ $(BEAT_NAME) == journalbeat ]] && echo true ),true) +ifneq ($(shell [ $(BEAT_NAME) == journalbeat ] && echo true ),true) - go get github.com/mitchellh/gox + go install -mod=vendor github.com/mitchellh/gox mkdir -p ${BUILD_DIR}/bin gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS} -@@ -333,12 +333,12 @@ ifndef EXCLUDE_COMMON_UPDATE_TARGET +@@ -354,12 +354,12 @@ 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}" @@ -34,4 +34,4 @@ Fix syntax for sh (get rid of bash-isms) +ifneq ($(shell [ $(BEAT_NAME) == libbeat -o $(BEAT_NAME) == metricbeat ] && echo true ),true) @# Update docs @mkdir -p docs - @${PYTHON_ENV}/bin/python ${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_TITLE} ${ES_BEATS} Added: head/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go Sat Jun 13 22:57:33 2020 (r538707) @@ -0,0 +1,20 @@ +--- vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go.orig 2020-05-28 07:16:25.000000000 -0700 ++++ vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go 2020-06-10 23:26:07.955802000 -0700 +@@ -8,7 +8,7 @@ + package dbus + + /* +-const int sizeofPtr = sizeof(void*); ++const int sizeOfPtr = sizeof(void*); + #define _WANT_UCRED + #include <sys/ucred.h> + */ +@@ -38,7 +38,7 @@ + + // http://golang.org/src/pkg/syscall/sockcmsg_unix.go + func cmsgAlignOf(salen int) int { +- salign := C.sizeofPtr ++ salign := C.sizeOfPtr + + return (salen + salign - 1) & ^(salign - 1) + } Modified: head/sysutils/beats7/pkg-plist ============================================================================== --- head/sysutils/beats7/pkg-plist Sat Jun 13 22:55:26 2020 (r538706) +++ head/sysutils/beats7/pkg-plist Sat Jun 13 22:57:33 2020 (r538707) @@ -31,7 +31,6 @@ %%AUDITBEAT%%@sample %%ETCDIR%%/auditbeat.yml.reference %%AUDITBEAT%%@sample %%ETCDIR%%/auditbeat.yml.sample %%AUDITBEAT%%sbin/auditbeat -%%AUDITBEAT%%sbin/packetbeat %%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 @@ -65,11 +64,11 @@ %%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/default.json +%%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.json +%%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 @@ -88,32 +87,32 @@ %%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.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-plaintext.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline.json +%%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.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline-plaintext.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json +%%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.json +%%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.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline-plaintext.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline.json +%%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.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline-plaintext.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json +%%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 @@ -122,7 +121,7 @@ %%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.json +%%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 @@ -134,16 +133,16 @@ %%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.json +%%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.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/module.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/config/startup.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/ingest/pipeline.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.reference.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.yml @@ -152,11 +151,11 @@ %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/kibana/7/dashboard/Filebeat-iis.json %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/config/iis-access.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/ingest/default.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/config/iis-error.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/ingest/default.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/config.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/docs.asciidoc @@ -164,7 +163,7 @@ %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/kibana/7/dashboard/Filebeat-Kafka-overview.json %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/config/log.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/ingest/pipeline.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/module.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/config.yml @@ -172,7 +171,7 @@ %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/config/log.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/ingest/pipeline.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/ingest/pipeline.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/module.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/config.reference.yml @@ -183,14 +182,14 @@ %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-slowlog.json %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/config/log.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-json.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-plain.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-json.yml +%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-plain.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/module.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/_meta/fields.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/config/slowlog.yml -%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-json.json -%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-json.yml +%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-plain.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.reference.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.yml @@ -239,6 +238,10 @@ %%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/config/nginx-error.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/ingest/pipeline.json %%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/manifest.yml +%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/_meta/fields.yml +%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/config/ingress_controller.yml +%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/ingest/pipeline.json +%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/manifest.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/module.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.reference.yml %%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.yml @@ -331,6 +334,8 @@ %%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%%@dir %%DATADIR%%/filebeat %%FILEBEAT%%@dir %%DATADIR%%/filebeat/kibana %%FILEBEAT%%@dir %%DATADIR%%/filebeat/kibana/7 @@ -381,6 +386,8 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-uwsgi-overview.json %%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-zookeeper-overview.json %%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-nginx-overview.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-vsphere-host.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-vsphere-vm.json %%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-windows-service.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/config.reference.yml @@ -418,12 +425,16 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/fields.yml -%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile.jewel +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile.nautilus +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config-mgr.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.reference.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/healthcheck.sh %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/kibana/7/dashboard/Metricbeat-ceph-overview.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/supported-versions.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/fields.yml @@ -434,6 +445,24 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/docker-compose.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/fields.yml @@ -522,6 +551,7 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/supported-versions.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/fields.yml @@ -619,6 +649,18 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.crt +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.key +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.pem +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.crt +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.csr +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.key +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.pem +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/generate.sh +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.crt +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.csr +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.key +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.pem %%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.reference.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/docs.asciidoc @@ -661,6 +703,7 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/README.md %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/docs.asciidoc @@ -784,6 +827,10 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/README.md +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/fields.yml @@ -804,6 +851,7 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/healthcheck.sh +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/pipeline/logstash.conf %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/docker-compose.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/docs.asciidoc @@ -868,13 +916,14 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/fields.yml -%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/Dockerfile.1.3 -%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/Dockerfile.2.0.X +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/config.reference.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/kibana/7/dashboard/Metricbeat-nats-overview.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/run.sh +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/supported-versions.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/fields.yml @@ -941,10 +990,18 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/kibana/7/dashboard/Metricbeat-prometheus-overview.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/prometheus.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/run.sh %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/docker-compose.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.reference.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.yml @@ -1045,6 +1102,9 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/data.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/docs.asciidoc +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/docs.asciidoc @@ -1061,22 +1121,28 @@ %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/fields.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/7/dashboard/Metricbeat-uwsgi-overview.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/supported-versions.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/docker-compose.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/module.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/Dockerfile %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/README.md %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.reference.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-host.json +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-vm.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/docker-compose.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/fields.yml +%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/module.yml %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/data.json %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/docs.asciidoc %%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml @@ -1112,6 +1178,7 @@ %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/apache.yml.disabled %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/beat-xpack.yml.disabled %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/beat.yml.disabled +%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/ceph-mgr.yml.disabled %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/ceph.yml.disabled %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/consul.yml.disabled %%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/couchbase.yml.disabled @@ -1181,4 +1248,5 @@ %%PACKETBEAT%%@dir /var/db/beats/packetbeat %%PACKETBEAT%%@sample %%ETCDIR%%/packetbeat.yml.reference %%PACKETBEAT%%@sample %%ETCDIR%%/packetbeat.yml.sample +%%PACKETBEAT%%sbin/packetbeat @dir /var/db/beats
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006132257.05DMvXp7022574>