Wed Dec 13 12:44:54 2017 UTC ()
Update sysutils/beats to 6.0.1.

Affecting all Beats
- Fix documentation links in README.md files.
- Fix add_docker_metadata dropping some containers.

Heartbeat
- Fix the "HTTP up status" visualization.

Metricbeat
- Fix map overwrite in docker diskio module.
- Fix connection leak in mongodb module.
- Fix the include top N processes feature for cases where there
  are fewer processes than N.


(fhajny)
diff -r1.20 -r1.21 pkgsrc/sysutils/beats/Makefile
diff -r1.17 -r1.18 pkgsrc/sysutils/beats/distinfo

cvs diff -r1.20 -r1.21 pkgsrc/sysutils/beats/Makefile (switch to unified diff)

--- pkgsrc/sysutils/beats/Makefile 2017/11/20 15:55:16 1.20
+++ pkgsrc/sysutils/beats/Makefile 2017/12/13 12:44:54 1.21
@@ -1,67 +1,67 @@ @@ -1,67 +1,67 @@
1# $NetBSD: Makefile,v 1.20 2017/11/20 15:55:16 fhajny Exp $ 1# $NetBSD: Makefile,v 1.21 2017/12/13 12:44:54 fhajny Exp $
2 2
3DISTNAME= beats-6.0.0 3DISTNAME= beats-6.0.1
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=elastic/}
6GITHUB_PROJECT= beats 6GITHUB_PROJECT= beats
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= filip@joyent.com 9MAINTAINER= filip@joyent.com
10HOMEPAGE= https://www.elastic.co/products/beats 10HOMEPAGE= https://www.elastic.co/products/beats
11COMMENT= Data Shippers for Elasticsearch 11COMMENT= Data Shippers for Elasticsearch
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16 16
17GO_DIST_BASE= ${PKGBASE}-${GITHUB_TAG:S/v//} 17GO_DIST_BASE= ${PKGBASE}-${GITHUB_TAG:S/v//}
18GO_SRCPATH= github.com/elastic/beats 18GO_SRCPATH= github.com/elastic/beats
19 19
20# Components to build/install 20# Components to build/install
21BEATS= filebeat heartbeat metricbeat packetbeat 21BEATS= filebeat heartbeat metricbeat packetbeat
22 22
23CHECK_RELRO_SKIP+= bin/filebeat 23CHECK_RELRO_SKIP+= bin/filebeat
24CHECK_RELRO_SKIP+= bin/heartbeat 24CHECK_RELRO_SKIP+= bin/heartbeat
25CHECK_RELRO_SKIP+= bin/metricbeat 25CHECK_RELRO_SKIP+= bin/metricbeat
26CHECK_RELRO_SKIP+= bin/packetbeat 26CHECK_RELRO_SKIP+= bin/packetbeat
27 27
28.for beat in ${BEATS} 28.for beat in ${BEATS}
29CONF_FILES+= share/examples/beats/${beat}.yml \ 29CONF_FILES+= share/examples/beats/${beat}.yml \
30 ${PKG_SYSCONFDIR}/${beat}.yml 30 ${PKG_SYSCONFDIR}/${beat}.yml
31.endfor 31.endfor
32 32
33BEATS_DIR?= ${VARBASE}/db/beats 33BEATS_DIR?= ${VARBASE}/db/beats
34BEATS_LOGDIR?= ${VARBASE}/log/beats 34BEATS_LOGDIR?= ${VARBASE}/log/beats
35 35
36FILES_SUBST+= BEATS_DIR=${BEATS_DIR} 36FILES_SUBST+= BEATS_DIR=${BEATS_DIR}
37FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR} 37FILES_SUBST+= BEATS_LOGDIR=${BEATS_LOGDIR}
38 38
39PKG_SYSCONFSUBDIR= beats 39PKG_SYSCONFSUBDIR= beats
40 40
41SMF_INSTANCES+= ${BEATS} 41SMF_INSTANCES+= ${BEATS}
42 42
43OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR} 43OWN_DIRS+= ${BEATS_DIR} ${BEATS_LOGDIR}
44 44
45MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg 45MAKE_ENV+= GOPATH=${WRKDIR}:${PREFIX}/gopkg
46MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib" 46MAKE_ENV+= CGO_LDFLAGS="-L${BUILDLINK_PREFIX.libpcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib"
47BUILD_TARGET= # 47BUILD_TARGET= #
48 48
49INSTALLATION_DIRS+= bin share/examples/beats 49INSTALLATION_DIRS+= bin share/examples/beats
50 50
51do-build: 51do-build:
52.for beat in ${BEATS} 52.for beat in ${BEATS}
53 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD} 53 cd ${WRKSRC}/${beat} && ${BUILD_MAKE_CMD}
54.endfor 54.endfor
55 55
56do-install: 56do-install:
57.for beat in ${BEATS} 57.for beat in ${BEATS}
58 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin 58 ${INSTALL_PROGRAM} ${WRKSRC}/${beat}/${beat} ${DESTDIR}${PREFIX}/bin
59 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \ 59 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.reference.yml \
60 ${DESTDIR}${PREFIX}/share/examples/beats 60 ${DESTDIR}${PREFIX}/share/examples/beats
61 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.yml \ 61 ${INSTALL_DATA} ${WRKSRC}/${beat}/${beat}.yml \
62 ${DESTDIR}${PREFIX}/share/examples/beats 62 ${DESTDIR}${PREFIX}/share/examples/beats
63.endfor 63.endfor
64 64
65.include "../../lang/go/go-package.mk" 65.include "../../lang/go/go-package.mk"
66.include "../../net/libpcap/buildlink3.mk" 66.include "../../net/libpcap/buildlink3.mk"
67.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"

cvs diff -r1.17 -r1.18 pkgsrc/sysutils/beats/distinfo (switch to unified diff)

--- pkgsrc/sysutils/beats/distinfo 2017/11/20 15:55:16 1.17
+++ pkgsrc/sysutils/beats/distinfo 2017/12/13 12:44:54 1.18
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.17 2017/11/20 15:55:16 fhajny Exp $ 1$NetBSD: distinfo,v 1.18 2017/12/13 12:44:54 fhajny Exp $
2 2
3SHA1 (beats-6.0.0.tar.gz) = b9e80f854c7042b6f5110393d9a09733026f4ad5 3SHA1 (beats-6.0.1.tar.gz) = 073cd38106d84878d7267ab7b099b443d8328032
4RMD160 (beats-6.0.0.tar.gz) = 0eaee5bf8e8ff764e1e09bb3be8c52ecc06ef8f3 4RMD160 (beats-6.0.1.tar.gz) = cb08add8cfbeb26131403941d0a90a37a03e04d5
5SHA512 (beats-6.0.0.tar.gz) = 6dbeecb640fe2e39b81be90fdd05d03c1b3ffddd20ef06ab7c51805eede82035a8d0a00de3132edb77594383095bd5e7a79609e3bdf3d62377140cde7ed3fcd7 5SHA512 (beats-6.0.1.tar.gz) = baf21acf38409b398f261509d25d2b009342fdde1fcd824c99d16cc279355ae5eb029699a5a7e3b6e58abdbed4ef5fda1b4058ed94b807fd5964ad24828585e2
6Size (beats-6.0.0.tar.gz) = 15118739 bytes 6Size (beats-6.0.1.tar.gz) = 15150919 bytes
7SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 2ef13f84cbf2e1da428e7b08625ffa6111ebcdf5 7SHA1 (patch-vendor_github.com_tsg_gopacket_pcap_pcap.go) = 2ef13f84cbf2e1da428e7b08625ffa6111ebcdf5