Date: Tue, 21 Feb 2017 01:27:07 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434496 - in head: . sysutils sysutils/beats sysutils/beats/files sysutils/filebeat sysutils/metricbeat sysutils/packetbeat Message-ID: <201702210127.v1L1R7GB091006@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Tue Feb 21 01:27:07 2017 New Revision: 434496 URL: https://svnweb.freebsd.org/changeset/ports/434496 Log: Update to 5.2.1 The three elasticsearch beats ports have merged into one single port systuils/beats that installs all of the above and some more. The reason is to make the port more maintainable and also that the new heartbeat beat would conflict with sysutils/heartbeat. Add heartbeat beat. Install utilities share/beats/import_dashboards share/beats/migrate_beat_config_1_x_to_5_0.py Fix problems with the default configurations [1] PR: 217081 [1] Added: head/sysutils/beats/ head/sysutils/beats/Makefile - copied, changed from r434400, head/sysutils/filebeat/Makefile head/sysutils/beats/distinfo (contents, props changed) head/sysutils/beats/files/ head/sysutils/beats/files/filebeat.in - copied, changed from r434495, head/sysutils/filebeat/files/filebeat.in head/sysutils/beats/files/heartbeat.in (contents, props changed) head/sysutils/beats/files/metricbeat.in - copied, changed from r434495, head/sysutils/metricbeat/files/metricbeat.in head/sysutils/beats/files/packetbeat.in - copied, changed from r434495, head/sysutils/packetbeat/files/packetbeat.in head/sysutils/beats/files/patch-filebeat_filebeat.yml (contents, props changed) head/sysutils/beats/files/patch-gopsutil - copied unchanged from r434495, head/sysutils/metricbeat/files/patch-gopsutil head/sysutils/beats/files/patch-heartbeat_heartbeat.yml (contents, props changed) head/sysutils/beats/files/patch-libbeat_scripts_Makefile - copied unchanged from r434495, head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile head/sysutils/beats/files/patch-metricbeat_metricbeat.yml (contents, props changed) head/sysutils/beats/files/patch-packetbeat_packetbeat.yml (contents, props changed) head/sysutils/beats/pkg-descr (contents, props changed) head/sysutils/beats/pkg-plist (contents, props changed) Deleted: head/sysutils/filebeat/ head/sysutils/metricbeat/ head/sysutils/packetbeat/ Modified: head/MOVED head/UPDATING head/sysutils/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Tue Feb 21 00:44:03 2017 (r434495) +++ head/MOVED Tue Feb 21 01:27:07 2017 (r434496) @@ -9083,3 +9083,6 @@ devel/m6811-binutils||2017-02-18|Has exp devel/libevent2|devel/libevent|2017-02-20|Rename as only libevent 2.x is supported german/mediathek|german/mediathekview|2017-02-20|Project renamed net/nos-ttb||2017-02-20|Has expired: does not work due to protocol changes +sysutils/filebeat|sysutils/beats|2017-02-21|merged beats to one port +sysutils/metricbeat|sysutils/beats|2017-02-21|merged beats to one port +sysutils/packetbeat|sysutils/beats|2017-02-21|merged beats to one port Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Feb 21 00:44:03 2017 (r434495) +++ head/UPDATING Tue Feb 21 01:27:07 2017 (r434496) @@ -6,6 +6,15 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20170220: + AFFECTS: sysutils/filebeat sysutils/metricbeat sysutils/packetbeat + AUTHOR: girgen@FreeBSD.org + + The three elasticsearch beats ports have merged into one single port + systuils/beats that installs all of the above and some more. The reason is to + make the port more maintainable and also that the new heartbeat beat would + conflict with sysutils/heartbeat. + +20170220: AFFECTS: devel/libevent2 AUTHOR: jbeich@FreeBSD.org Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Tue Feb 21 00:44:03 2017 (r434495) +++ head/sysutils/Makefile Tue Feb 21 01:27:07 2017 (r434496) @@ -91,6 +91,7 @@ SUBDIR += bchunk SUBDIR += beadm SUBDIR += beadm-devel + SUBDIR += beats SUBDIR += bhyve-firmware SUBDIR += bhyve-rc SUBDIR += biosfont @@ -289,7 +290,6 @@ SUBDIR += fetchlog SUBDIR += ffs2recov SUBDIR += file - SUBDIR += filebeat SUBDIR += filedupe SUBDIR += filelight-kde4 SUBDIR += fileprune @@ -601,7 +601,6 @@ SUBDIR += memtest86 SUBDIR += memtest86+ SUBDIR += metalog - SUBDIR += metricbeat SUBDIR += mfid SUBDIR += mgeupsd SUBDIR += minimunin @@ -753,7 +752,6 @@ SUBDIR += p5-arclog SUBDIR += p5-reslog SUBDIR += packer - SUBDIR += packetbeat SUBDIR += pacman SUBDIR += paicc SUBDIR += paladin Copied and modified: head/sysutils/beats/Makefile (from r434400, head/sysutils/filebeat/Makefile) ============================================================================== --- head/sysutils/filebeat/Makefile Sun Feb 19 10:57:49 2017 (r434400, copy source) +++ head/sysutils/beats/Makefile Tue Feb 21 01:27:07 2017 (r434496) @@ -1,8 +1,8 @@ # Created by: Palle Girgensohn <girgen@FreeBSD.org> # $FreeBSD$ -PORTNAME= filebeat -PORTVERSION= 5.2.0 +PORTNAME= beats +PORTVERSION= 5.2.1 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -13,21 +13,57 @@ LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= elastic -GH_PROJECT= beats USES= gmake go GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} -GO_TARGETS= ${PORTNAME} -USE_RC_SUBR= ${PORTNAME} +USE_RC_SUBR= ${GO_TARGETS} + +OPTIONS_DEFAULT=FILEBEAT PACKETBEAT METRICBEAT HEARTBEAT +OPTIONS_SUB= yes + +OPTIONS_MULTI= BEATS +OPTIONS_MULTI_BEATS=${OPTIONS_DEFAULT} + +FILEBEAT_DESC= Filebeat +FILEBEAT_VARS= GO_TARGETS+=filebeat + +PACKETBEAT_DESC=Packetbeat +PACKETBEAT_VARS=GO_TARGETS+=packetbeat + +METRICBEAT_DESC=Metricbeat +METRICBEAT_VARS=GO_TARGETS+=metricbeat + +HEARTBEAT_DESC= Heartbeat +HEARTBEAT_VARS=GO_TARGETS+=heartbeat do-build: - cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGETS} + @for GO_TARGET in libbeat/dashboards ${GO_TARGETS}; do \ + cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C $${GO_TARGET} ;\ + done + +post-stage: + for GO_TARGET in ${GO_TARGETS}; do \ + ${MKDIR} ${STAGEDIR}/var/db/beats/$${GO_TARGET} ;\ + done do-install: - ${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGETS}/${GO_TARGETS} \ - ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/${GO_TARGETS}/${GO_TARGETS}.yml \ - ${STAGEDIR}${PREFIX}/etc/${GO_TARGETS}.yml.sample + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} \ + ${GO_WRKSRC}/libbeat/scripts/migrate_beat_config_1_x_to_5_0.py \ + ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} \ + ${GO_WRKSRC}/libbeat/dashboards/import_dashboards \ + ${STAGEDIR}${DATADIR} + for GO_TARGET in ${GO_TARGETS}; do \ + ${INSTALL_PROGRAM} ${GO_WRKSRC}/$${GO_TARGET}/$${GO_TARGET} \ + ${STAGEDIR}${PREFIX}/sbin ;\ + ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.yml \ + ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.yml.sample ;\ + ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.template.json \ + ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.template.json.sample ;\ + ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.template-es2x.json \ + ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.template-es2x.json.sample ;\ + done .include <bsd.port.mk> Added: head/sysutils/beats/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/distinfo Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,3 @@ +TIMESTAMP = 1487537263 +SHA256 (elastic-beats-v5.2.1_GH0.tar.gz) = 8cd082583c9762314c3a15c8847a8b155733e04db328a8f759a0bf7acc17ec7d +SIZE (elastic-beats-v5.2.1_GH0.tar.gz) = 16487289 Copied and modified: head/sysutils/beats/files/filebeat.in (from r434495, head/sysutils/filebeat/files/filebeat.in) ============================================================================== --- head/sysutils/filebeat/files/filebeat.in Tue Feb 21 00:44:03 2017 (r434495, copy source) +++ head/sysutils/beats/files/filebeat.in Tue Feb 21 01:27:07 2017 (r434496) @@ -21,13 +21,13 @@ rcvar=${name}_enable load_rc_config $name : ${filebeat_enable:="NO"} -: ${filebeat_config:="%%PREFIX%%/etc/${name}.yml"} +: ${filebeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"} # daemon start_precmd=filebeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} -c ${filebeat_config}" +command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_config}" filebeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Added: head/sysutils/beats/files/heartbeat.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/heartbeat.in Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,37 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: heartbeat +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf to enable heartbeat: +# +# 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 + +. /etc/rc.subr + +name="heartbeat" +rcvar=${name}_enable +load_rc_config $name + +: ${heartbeat_enable:="NO"} +: ${heartbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"} + +# daemon +start_precmd=heartbeat_prestart +command=/usr/sbin/daemon +pidfile="/var/run/${name}" +command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_config}" + +heartbeat_prestart() { +# Have to empty rc_flags so they don't get passed to daemon(8) + rc_flags="" +} + +run_rc_command "$1" Copied and modified: head/sysutils/beats/files/metricbeat.in (from r434495, head/sysutils/metricbeat/files/metricbeat.in) ============================================================================== --- head/sysutils/metricbeat/files/metricbeat.in Tue Feb 21 00:44:03 2017 (r434495, copy source) +++ head/sysutils/beats/files/metricbeat.in Tue Feb 21 01:27:07 2017 (r434496) @@ -10,8 +10,8 @@ # # metricbeat_enable (bool): Set to YES to enable metricbeat # Default: NO -# metricbeat_flags (str): Extra flags passed to metricbeat -# metricbeat_conf (str): metricbeat configuration file +# metricbeat_flags (str): Extra flags passed to metricbeat +# metricbeat_conf (str): metricbeat configuration metric # Default: ${PREFIX}/etc/metricbeat.yml . /etc/rc.subr @@ -21,17 +21,25 @@ rcvar=${name}_enable load_rc_config $name : ${metricbeat_enable:="NO"} -: ${metricbeat_config:="%%PREFIX%%/etc/${name}.yml"} +: ${metricbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"} # daemon start_precmd=metricbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} -c ${metricbeat_config}" +command_args="-rP ${pidfile} -p ${pidfile}.child %%PREFIX%%/sbin/${name} ${metricbeat_config}" metricbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) rc_flags="" } +# metricbeat will refuse to quit if linprocfs is mounted, and sadly requires -9 +[ -f /compat/linux/proc/cpuinfo ] && stop_cmd=metricbeat_stop + +metricbeat_stop() { + pkill -9 -F ${pidfile} > /dev/null 2>&1 + pkill -9 -F ${pidfile}.child > /dev/null 2>&1 +} + run_rc_command "$1" Copied and modified: head/sysutils/beats/files/packetbeat.in (from r434495, head/sysutils/packetbeat/files/packetbeat.in) ============================================================================== --- head/sysutils/packetbeat/files/packetbeat.in Tue Feb 21 00:44:03 2017 (r434495, copy source) +++ head/sysutils/beats/files/packetbeat.in Tue Feb 21 01:27:07 2017 (r434496) @@ -21,13 +21,13 @@ rcvar=${name}_enable load_rc_config $name : ${packetbeat_enable:="NO"} -: ${packetbeat_config:="%%PREFIX%%/etc/${name}.yml"} +: ${packetbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"} # daemon start_precmd=packetbeat_prestart command=/usr/sbin/daemon pidfile="/var/run/${name}" -command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} -c ${packetbeat_config}" +command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_config}" packetbeat_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8) Added: head/sysutils/beats/files/patch-filebeat_filebeat.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-filebeat_filebeat.yml Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,8 @@ +--- filebeat/filebeat.yml.orig 2017-02-09 15:20:52 UTC ++++ filebeat/filebeat.yml +@@ -112,3 +112,5 @@ output.elasticsearch: + # To enable all selectors use ["*"]. Examples of other selectors are "beat", + # "publish", "service". + #logging.selectors: ["*"] ++logging.to_syslog: true ++logging.to_files: false Copied: head/sysutils/beats/files/patch-gopsutil (from r434495, head/sysutils/metricbeat/files/patch-gopsutil) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-gopsutil Tue Feb 21 01:27:07 2017 (r434496, copy of r434495, head/sysutils/metricbeat/files/patch-gopsutil) @@ -0,0 +1,22 @@ +--- ../src/github.com/elastic/beats/vendor/github.com/shirou/gopsutil/disk/disk_freebsd_386.go.orig 2016-12-13 11:17:18.930219000 +0100 ++++ ../src/github.com/elastic/beats/vendor/github.com/shirou/gopsutil/disk/disk_freebsd_386.go 2016-12-13 11:17:23.015481000 +0100 +@@ -39,6 +39,10 @@ + MNT_SUSPEND = 4 + ) + ++const ( ++ sizeOfDevstat = 0xf0 ++) ++ + type ( + _C_short int16 + _C_int int32 +@@ -95,7 +99,7 @@ + Flags uint32 + Device_type uint32 + Priority uint32 +- ID *byte ++ Id *byte + Sequence1 uint32 + } + type Bintime struct { Added: head/sysutils/beats/files/patch-heartbeat_heartbeat.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-heartbeat_heartbeat.yml Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,8 @@ +--- heartbeat/heartbeat.yml.orig 2017-02-20 22:45:44 UTC ++++ heartbeat/heartbeat.yml +@@ -77,3 +77,5 @@ output.elasticsearch: + # To enable all selectors use ["*"]. Examples of other selectors are "beat", + # "publish", "service". + #logging.selectors: ["*"] ++logging.to_syslog: true ++logging.to_files: false Copied: head/sysutils/beats/files/patch-libbeat_scripts_Makefile (from r434495, head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-libbeat_scripts_Makefile Tue Feb 21 01:27:07 2017 (r434496, copy of r434495, head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile) @@ -0,0 +1,11 @@ +--- libbeat/scripts/Makefile.orig 2016-12-08 18:08:06.201040000 +0100 ++++ libbeat/scripts/Makefile 2016-12-08 18:08:14.835100000 +0100 +@@ -30,7 +30,7 @@ + GOFILES = $(shell find . -type f -name '*.go') + GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*") + GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go') +-SHELL=bash ++SHELL=sh + ES_HOST?="elasticsearch" + PWD=$(shell pwd) + BUILD_DIR?=$(shell pwd)/build Added: head/sysutils/beats/files/patch-metricbeat_metricbeat.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-metricbeat_metricbeat.yml Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,8 @@ +--- metricbeat/metricbeat.yml.orig 2017-02-20 22:45:44 UTC ++++ metricbeat/metricbeat.yml +@@ -103,3 +103,5 @@ output.elasticsearch: + # To enable all selectors use ["*"]. Examples of other selectors are "beat", + # "publish", "service". + #logging.selectors: ["*"] ++logging.to_syslog: true ++logging.to_files: false Added: head/sysutils/beats/files/patch-packetbeat_packetbeat.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/files/patch-packetbeat_packetbeat.yml Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,21 @@ +--- packetbeat/packetbeat.yml.orig 2017-02-09 16:20:52.000000000 +0100 ++++ packetbeat/packetbeat.yml 2017-02-21 02:04:13.919394000 +0100 +@@ -10,8 +10,10 @@ + #============================== Network device ================================ + + # Select the network interface to sniff the data. On Linux, you can use the +-# "any" keyword to sniff on all connected interfaces. +-packetbeat.interfaces.device: any ++# "any" keyword to sniff on all connected interfaces. FreeBSD is a bit different ++# and the beats programmers did not bother to implement it, so you must set this ++# to your preferred device ++packetbeat.interfaces.device: em0 + + #================================== Flows ===================================== + +@@ -147,3 +149,5 @@ + # To enable all selectors use ["*"]. Examples of other selectors are "beat", + # "publish", "service". + #logging.selectors: ["*"] ++logging.to_syslog: true ++logging.to_files: false Added: head/sysutils/beats/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/pkg-descr Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,20 @@ +Beats is the platform for building lightweight, open source data +shippers for many types of operational data you want to enrich with +Logstash, search and analyze in Elasticsearch, and visualize in Kibana. +Whether you're interested in log files, infrastructure metrics, network +packets, or any other type of data, Beats serves as the foundation for +keeping a beat on your data. + +Filebeat is a lightweight, open source shipper for log file data. As the +next-generation Logstash Forwarder, Filebeat tails logs and quickly +sends this information to Logstash for further parsing and enrichment or +to Elasticsearch for centralized storage and analysis. + +Metricbeat Collect metrics from your systems and services. From CPU to memory, +Redis to Nginx, and much more, Metricbeat is a lightweight way to send system +and service statistics. + +Packetbeat is a lightweight network packet analyzer that sends data to Logstash +or Elasticsearch. + +WWW: https://www.elastic.co/products/beats/ Added: head/sysutils/beats/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/beats/pkg-plist Tue Feb 21 01:27:07 2017 (r434496) @@ -0,0 +1,23 @@ +%%DATADIR%%/import_dashboards +%%DATADIR%%/migrate_beat_config_1_x_to_5_0.py +%%FILEBEAT%%sbin/filebeat +%%HEARTBEAT%%sbin/heartbeat +%%METRICBEAT%%sbin/metricbeat +%%PACKETBEAT%%sbin/packetbeat +%%FILEBEAT%%@sample etc/filebeat.template-es2x.json.sample +%%FILEBEAT%%@sample etc/filebeat.template.json.sample +%%FILEBEAT%%@sample etc/filebeat.yml.sample +%%HEARTBEAT%%@sample etc/heartbeat.template-es2x.json.sample +%%HEARTBEAT%%@sample etc/heartbeat.template.json.sample +%%HEARTBEAT%%@sample etc/heartbeat.yml.sample +%%METRICBEAT%%@sample etc/metricbeat.template-es2x.json.sample +%%METRICBEAT%%@sample etc/metricbeat.template.json.sample +%%METRICBEAT%%@sample etc/metricbeat.yml.sample +%%PACKETBEAT%%@sample etc/packetbeat.template-es2x.json.sample +%%PACKETBEAT%%@sample etc/packetbeat.template.json.sample +%%PACKETBEAT%%@sample etc/packetbeat.yml.sample +@dir /var/db/beats +%%FILEBEAT%%@dir /var/db/beats/filebeat +%%HEARTBEAT%%@dir /var/db/beats/heartbeat +%%METRICBEAT%%@dir /var/db/beats/metricbeat +%%PACKETBEAT%%@dir /var/db/beats/packetbeat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702210127.v1L1R7GB091006>