Date: Sat, 3 Oct 2020 20:03:36 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551341 - in head/sysutils/beats7: . files Message-ID: <202010032003.093K3aiT082518@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Oct 3 20:03:35 2020 New Revision: 551341 URL: https://svnweb.freebsd.org/changeset/ports/551341 Log: sysutils/beats7: Update to 7.9.2 Changes since 7.9.1: * Breaking changes - Affecting all Beats - Autodiscover doesn’t generate any configuration when a variable is missing. Previously it generated an incomplete configuration. * Bugfixes - Affecting all Beats - Explicitly detect missing variables in autodiscover configuration, log them at the debug level. - Fix libbeat.output.write.bytes and libbeat.output.read.bytes metrics of the Elasticsearch output. - Filebeat - Provide backwards compatibility for the set processor when Elasticsearch is less than 7.9.0. - Fix an error updating file size being logged when EOF is reached. - Fix error when processing AWS Cloudtrail Digest logs. - Metricbeat - The Kibana collector applies backoff when errored at getting usage stats - The elasticsearch/index metricset only requests wildcard expansion for hidden indices if the monitored Elasticsearch cluster supports it. - Fix panic index out of range error when getting AWS account name. - Handle missing counters in the application_pool metricset. - Functionbeat - Do not need Google credentials if not required for the operation. - Fix dependency issues of GCP functions. * Added - Affecting all Beats - Add container ECS fields in kubernetes metadata. FreeBSD notes: - Fixed PRs: - bug #248499 - bug #244627 - bug #228785 - Fix paths in various (mostly example) files Release Notes: https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.9.2.html PR: 249912 Submitted by: Juraj Lutter <juraj@lutter.sk> Added: head/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml (contents, props changed) head/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml (contents, props changed) head/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml (contents, props changed) Modified: head/sysutils/beats7/Makefile head/sysutils/beats7/distinfo head/sysutils/beats7/files/auditbeat.in head/sysutils/beats7/files/filebeat.in head/sysutils/beats7/files/heartbeat.in head/sysutils/beats7/files/metricbeat.in head/sysutils/beats7/files/packetbeat.in head/sysutils/beats7/files/patch-filebeat_filebeat.yml head/sysutils/beats7/files/patch-metricbeat_metricbeat.yml Modified: head/sysutils/beats7/Makefile ============================================================================== --- head/sysutils/beats7/Makefile Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/Makefile Sat Oct 3 20:03:35 2020 (r551341) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 7.9.1 +PORTVERSION= 7.9.2 DISTVERSIONPREFIX=v CATEGORIES= sysutils PKGNAMESUFFIX?= 7 Modified: head/sysutils/beats7/distinfo ============================================================================== --- head/sysutils/beats7/distinfo Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/distinfo Sat Oct 3 20:03:35 2020 (r551341) @@ -1,6 +1,6 @@ -TIMESTAMP = 1599167465 -SHA256 (elastic-beats-v7.9.1_GH0.tar.gz) = a1334984a39c6151dad45396b51e4c9f87297334f71b7a49148c77b7ce2b8cb2 -SIZE (elastic-beats-v7.9.1_GH0.tar.gz) = 82853636 +TIMESTAMP = 1601026623 +SHA256 (elastic-beats-v7.9.2_GH0.tar.gz) = ff64a41619b5070f8d6bebedf05d00cc7ea173b158730d34996cd0e0b27e2230 +SIZE (elastic-beats-v7.9.2_GH0.tar.gz) = 82861097 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 Modified: head/sysutils/beats7/files/auditbeat.in ============================================================================== --- head/sysutils/beats7/files/auditbeat.in Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/auditbeat.in Sat Oct 3 20:03:35 2020 (r551341) @@ -11,8 +11,11 @@ # auditbeat_enable (bool): Set to YES to enable auditbeat # Default: NO # auditbeat_flags (str): Extra flags passed to auditbeat -# auditbeat_conf (str): auditbeat configuration metric -# Default: ${PREFIX}/etc/auditbeat.yml +# auditbeat_config (str): auditbeat configuration directory +# Default: ${PREFIX}/etc/beats +# auditbeat_conffile (str): auditbeat configuration file +# relative to ${auditbeat_conf} +# Default: auditbeat.yml . /etc/rc.subr @@ -22,15 +25,16 @@ load_rc_config $name : ${auditbeat_enable:="NO"} : ${auditbeat_config:="%%ETCDIR%%"} +: ${auditbeat_conffile:="auditbeat.yml"} : ${auditbeat_home:="%%DATADIR%%/auditbeat"} : ${auditbeat_logs:="/var/log/beats"} -: ${auditbeat_data:="/var/db/beats/auditbeat" +: ${auditbeat_data:="/var/db/beats/auditbeat"} # daemon start_precmd=auditbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${auditbeat_flags} -path.config ${auditbeat_config} --path.home ${auditbeat_home} --path.data ${auditbeat_data} --path.logs ${auditbeat_logs}" +command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${auditbeat_flags} --path.config ${auditbeat_config} --path.home ${auditbeat_home} --path.data ${auditbeat_data} --path.logs ${auditbeat_logs} -c ${auditbeat_conffile}" auditbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) rc_flags="" Modified: head/sysutils/beats7/files/filebeat.in ============================================================================== --- head/sysutils/beats7/files/filebeat.in Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/filebeat.in Sat Oct 3 20:03:35 2020 (r551341) @@ -11,8 +11,11 @@ # filebeat_enable (bool): Set to YES to enable filebeat # Default: NO # filebeat_flags (str): Extra flags passed to filebeat -# filebeat_conf (str): filebeat configuration file -# Default: ${PREFIX}/etc/filebeat.yml +# filebeat_config (str): filebeat configuration directory +# Default: ${PREFIX}/etc/beats +# filebeat_conffile (str): filebeat configuration file +# relative to ${filebeat_conf} +# Default: filebeat.yml . /etc/rc.subr @@ -22,6 +25,7 @@ load_rc_config $name : ${filebeat_enable:="NO"} : ${filebeat_config:="%%ETCDIR%%"} +: ${filebeat_conffile:="filebeat.yml"} : ${filebeat_home:="%%DATADIR%%/filebeat"} : ${filebeat_logs:="/var/log/beats"} : ${filebeat_data:="/var/db/beats/filebeat"} @@ -30,7 +34,7 @@ load_rc_config $name start_precmd=filebeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_flags} -path.config ${filebeat_config} --path.home ${filebeat_home} --path.data ${filebeat_data} --path.logs ${filebeat_logs}" +command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_flags} --path.config ${filebeat_config} --path.home ${filebeat_home} --path.data ${filebeat_data} --path.logs ${filebeat_logs} -c ${filebeat_conffile}" filebeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Modified: head/sysutils/beats7/files/heartbeat.in ============================================================================== --- head/sysutils/beats7/files/heartbeat.in Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/heartbeat.in Sat Oct 3 20:03:35 2020 (r551341) @@ -11,8 +11,11 @@ # heartbeat_enable (bool): Set to YES to enable heartbeat # Default: NO # heartbeat_flags (str): Extra flags passed to heartbeat -# heartbeat_conf (str): heartbeat configuration file -# Default: ${PREFIX}/etc/heartbeat.yml +# heartbeat_config (str): heartbeat configuration directory +# Default: ${PREFIX}/etc/beats +# heartbeat_conffile (str): heartbeat configuration file +# relative to ${heartbeat_conf} +# Default: heartbeat.yml . /etc/rc.subr @@ -22,6 +25,7 @@ load_rc_config $name : ${heartbeat_enable:="NO"} : ${heartbeat_config:="%%ETCDIR%%"} +: ${heartbeat_conffile:="heartbeat.yml"} : ${heartbeat_home:="%%DATADIR%%/heartbeat"} : ${heartbeat_logs:="/var/log/beats"} : ${heartbeat_data:="/var/db/beats/heartbeat"} @@ -31,7 +35,7 @@ load_rc_config $name start_precmd=heartbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_flags} -path.config ${heartbeat_config} --path.home ${heartbeat_home} --path.data ${heartbeat_data} --path.logs ${heartbeat_logs}" +command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_flags} --path.config ${heartbeat_config} --path.home ${heartbeat_home} --path.data ${heartbeat_data} --path.logs ${heartbeat_logs} -c ${heartbeat_conffile}" heartbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Modified: head/sysutils/beats7/files/metricbeat.in ============================================================================== --- head/sysutils/beats7/files/metricbeat.in Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/metricbeat.in Sat Oct 3 20:03:35 2020 (r551341) @@ -11,8 +11,11 @@ # metricbeat_enable (bool): Set to YES to enable metricbeat # Default: NO # metricbeat_flags (str): Extra flags passed to metricbeat -# metricbeat_conf (str): metricbeat configuration metric -# Default: ${PREFIX}/etc/metricbeat.yml +# metricbeat_config (str): metricbeat configuration directory +# Default: ${PREFIX}/etc/beats +# metricbeat_conffile (str): metricbeat configuration file +# relative to ${metricbeat_conf} +# Default: metricbeat.yml . /etc/rc.subr @@ -22,6 +25,7 @@ load_rc_config $name : ${metricbeat_enable:="NO"} : ${metricbeat_config:="%%ETCDIR%%"} +: ${metricbeat_conffile:="metricbeat.yml"} : ${metricbeat_home:="%%DATADIR%%/metricbeat"} : ${metricbeat_logs:="/var/log/beats"} : ${metricbeat_data:="/var/db/beats/metricbeat"} @@ -30,7 +34,7 @@ load_rc_config $name start_precmd=metricbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${metricbeat_flags} -path.config ${metricbeat_config} --path.home ${metricbeat_home} --path.data ${metricbeat_data} --path.logs ${metricbeat_logs}" +command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${metricbeat_flags} --path.config ${metricbeat_config} --path.home ${metricbeat_home} --path.data ${metricbeat_data} --path.logs ${metricbeat_logs} -c ${metricbeat_conffile}" metricbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Modified: head/sysutils/beats7/files/packetbeat.in ============================================================================== --- head/sysutils/beats7/files/packetbeat.in Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/packetbeat.in Sat Oct 3 20:03:35 2020 (r551341) @@ -11,8 +11,11 @@ # packetbeat_enable (bool): Set to YES to enable packetbeat # Default: NO # packetbeat_flags (str): Extra flags passed to packetbeat -# packetbeat_conf (str): packetbeat configuration file -# Default: ${PREFIX}/etc/packetbeat.yml +# packetbeat_config (str): packetbeat configuration directory +# Default: ${PREFIX}/etc/beats +# packetbeat_conffile (str): packetbeat configuration file +# relative to ${packetbeat_conf} +# Default: packetbeat.yml . /etc/rc.subr @@ -22,6 +25,7 @@ load_rc_config $name : ${packetbeat_enable:="NO"} : ${packetbeat_config:="%%ETCDIR%%"} +: ${packetbeat_conffile:="packetbeat.yml"} : ${packetbeat_home:="%%DATADIR%%/packetbeat"} : ${packetbeat_logs:="/var/log/beats"} : ${packetbeat_data:="/var/db/beats/packetbeat"} @@ -30,7 +34,7 @@ load_rc_config $name start_precmd=packetbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_flags} -path.config ${packetbeat_config} --path.home ${packetbeat_home} --path.data ${packetbeat_data} --path.logs ${packetbeat_logs}" +command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_flags} --path.config ${packetbeat_config} --path.home ${packetbeat_home} --path.data ${packetbeat_data} --path.logs ${packetbeat_logs} -c ${packetbeat_conffile}" packetbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Added: head/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml Sat Oct 3 20:03:35 2020 (r551341) @@ -0,0 +1,11 @@ +--- auditbeat/auditbeat.reference.yml.orig 2020-09-25 20:02:33 UTC ++++ auditbeat/auditbeat.reference.yml +@@ -14,7 +14,7 @@ + auditbeat.config.modules: + + # Glob pattern for configuration reloading +- path: ${path.config}/modules.d/*.yml ++ path: ${path.config}/auditbeat.modules.d/*.yml + + # Period on which files under path should be checked for changes + reload.period: 10s Added: head/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml Sat Oct 3 20:03:35 2020 (r551341) @@ -0,0 +1,11 @@ +--- filebeat/filebeat.reference.yml.orig 2020-09-25 20:03:46 UTC ++++ filebeat/filebeat.reference.yml +@@ -840,7 +840,7 @@ filebeat.inputs: + #reload.period: 10s + #modules: + #enabled: false +- #path: modules.d/*.yml ++ #path: filebeat.modules.d/*.yml + #reload.enabled: true + #reload.period: 10s + Modified: head/sysutils/beats7/files/patch-filebeat_filebeat.yml ============================================================================== --- head/sysutils/beats7/files/patch-filebeat_filebeat.yml Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/patch-filebeat_filebeat.yml Sat Oct 3 20:03:35 2020 (r551341) @@ -1,5 +1,14 @@ ---- filebeat/filebeat.yml.orig 2020-08-11 15:19:45 UTC +--- filebeat/filebeat.yml.orig 2020-09-17 22:28:49 UTC +++ filebeat/filebeat.yml +@@ -66,7 +66,7 @@ filebeat.inputs: + + filebeat.config.modules: + # Glob pattern for configuration loading +- path: ${path.config}/modules.d/*.yml ++ path: ${path.config}/filebeat.modules.d/*.yml + + # Set to true to enable config reloading + reload.enabled: false @@ -176,8 +176,8 @@ processors: - add_host_metadata: when.not.contains.tags: forwarded Added: head/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml Sat Oct 3 20:03:35 2020 (r551341) @@ -0,0 +1,11 @@ +--- metricbeat/metricbeat.reference.yml.orig 2020-09-25 20:07:52 UTC ++++ metricbeat/metricbeat.reference.yml +@@ -14,7 +14,7 @@ + metricbeat.config.modules: + + # Glob pattern for configuration reloading +- path: ${path.config}/modules.d/*.yml ++ path: ${path.config}/metricbeat.modules.d/*.yml + + # Period on which files under path should be checked for changes + reload.period: 10s Modified: head/sysutils/beats7/files/patch-metricbeat_metricbeat.yml ============================================================================== --- head/sysutils/beats7/files/patch-metricbeat_metricbeat.yml Sat Oct 3 19:31:49 2020 (r551340) +++ head/sysutils/beats7/files/patch-metricbeat_metricbeat.yml Sat Oct 3 20:03:35 2020 (r551341) @@ -1,5 +1,14 @@ ---- metricbeat/metricbeat.yml.orig 2020-08-11 15:19:45 UTC +--- metricbeat/metricbeat.yml.orig 2020-09-17 22:28:49 UTC +++ metricbeat/metricbeat.yml +@@ -11,7 +11,7 @@ + + metricbeat.config.modules: + # Glob pattern for configuration loading +- path: ${path.config}/modules.d/*.yml ++ path: ${path.config}/metricbeat.modules.d/*.yml + + # Set to true to enable config reloading + reload.enabled: false @@ -123,8 +123,8 @@ output.elasticsearch: processors: - add_host_metadata: ~
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010032003.093K3aiT082518>