Attachment 216154 Details for Bug 244613 – Update grok_exporter to 1.0.0.RC3 and fix other issues

[patch] Update grok_exporter to 1.0.0.RC3 and fix other issues

grok_exporter-1.0.0.rc3.1.diff (text/plain), 9.71 KB, created by Alan Somers on 2020-07-03 04:27:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Somers

Created: 2020-07-03 04:27:10 UTC

Size: 9.71 KB

patch

obsolete

>Index: net-mgmt/grok_exporter/Makefile
>===================================================================
>--- net-mgmt/grok_exporter/Makefile	(revision 541068)
>+++ net-mgmt/grok_exporter/Makefile	(working copy)
>@@ -1,9 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	grok_exporter
>-PORTVERSION=	0.2.3
>+PORTVERSION=	1.0.0.RC3
> DISTVERSIONPREFIX=v
>-PORTREVISION=	3
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	gasol.wu@gmail.com
>@@ -16,11 +15,29 @@
> 
> LIB_DEPENDS=	libonig.so:devel/oniguruma
> 
>-USES=		go
>+USES=		go:modules
> USE_GITHUB=	yes
> GH_ACCOUNT=	fstab logstash-plugins:plugins
> GH_PROJECT=	logstash-patterns-core:plugins
> GH_TAGNAME=	6d25c13:plugins
>+GH_TUPLE=	\
>+		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
>+		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
>+		alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \
>+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
>+		bitly:go-simplejson:v0.5.0:bitly_go_simplejson/vendor/github.com/bitly/go-simplejson \
>+		cespare:xxhash:v2.1.1:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
>+		go-yaml:yaml:v2.2.7:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
>+		golang:exp:da58074b4299:golang_exp/vendor/golang.org/x/exp \
>+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
>+		golang:sys:d4481acd189f:golang_sys/vendor/golang.org/x/sys \
>+		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
>+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
>+		prometheus:client_golang:v1.3.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
>+		prometheus:client_model:v0.1.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
>+		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
>+		prometheus:procfs:v0.0.8:prometheus_procfs/vendor/github.com/prometheus/procfs \
>+		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus
> USERS=		prometheus
> GROUPS=		prometheus
> 
>@@ -29,11 +46,11 @@
> SUB_FILES=	config.yml
> 
> post-patch:
>-	${LN} -sf ${WRKSRC}/tailer/fileTailer_darwin.go ${WRKSRC}/tailer/fileTailer_freebsd.go
>+	for f in `${FIND} ${WRKSRC}/tailer -name '*darwin*'`; do ${LN} -sf $${f} `echo $${f} | ${SED} 's/darwin/freebsd/g'`; done
> 
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
>-	${INSTALL_DATA} ${WRKDIR}/config.yml ${STAGEDIR}${ETCDIR}
>+	${INSTALL_DATA} ${WRKDIR}/config.yml ${STAGEDIR}${ETCDIR}/config.yml.sample
> 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} example ${STAGEDIR}${DATADIR})
> 	@(cd ${WRKSRC_plugins} && ${COPYTREE_SHARE} patterns ${STAGEDIR}${DATADIR})
> 
>Index: net-mgmt/grok_exporter/distinfo
>===================================================================
>--- net-mgmt/grok_exporter/distinfo	(revision 541068)
>+++ net-mgmt/grok_exporter/distinfo	(working copy)
>@@ -1,5 +1,39 @@
>-TIMESTAMP = 1513652246
>-SHA256 (fstab-grok_exporter-v0.2.3_GH0.tar.gz) = 2dd92d93b59979d409e11c2e5ca3fce28299529f63dde3423234264c0a846338
>-SIZE (fstab-grok_exporter-v0.2.3_GH0.tar.gz) = 470262
>+TIMESTAMP = 1583184453
>+SHA256 (fstab-grok_exporter-v1.0.0.RC3_GH0.tar.gz) = 001d13ee05bd089658d4f4891ea85ae9aeae55b68d792fe4204212adb2fc2a6b
>+SIZE (fstab-grok_exporter-v1.0.0.RC3_GH0.tar.gz) = 308486
> SHA256 (logstash-plugins-logstash-patterns-core-6d25c13_GH0.tar.gz) = 7f4986b695d82bcfd585b47635607267ce473a601df504672072b242ae7c607f
> SIZE (logstash-plugins-logstash-patterns-core-6d25c13_GH0.tar.gz) = 27383
>+SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
>+SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
>+SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
>+SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
>+SHA256 (alecthomas-units-c3de453c63f4_GH0.tar.gz) = b2eb77de46e677edb150bb4bf81d213416a477525980e315264cbd70b22d0ece
>+SIZE (alecthomas-units-c3de453c63f4_GH0.tar.gz) = 3485
>+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
>+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
>+SHA256 (bitly-go-simplejson-v0.5.0_GH0.tar.gz) = 44196c95263e74277372319e5a6cb7f53b29ef7ddab8c7fed6ce6fc80144d465
>+SIZE (bitly-go-simplejson-v0.5.0_GH0.tar.gz) = 5994
>+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
>+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
>+SHA256 (go-yaml-yaml-v2.2.7_GH0.tar.gz) = 74afe4be0fa4482de73cfaf952dc6c8d41088b687c3f9de4a7ced86d2bbe0cb4
>+SIZE (go-yaml-yaml-v2.2.7_GH0.tar.gz) = 72651
>+SHA256 (golang-exp-da58074b4299_GH0.tar.gz) = 25c8abc24a515aea70869eb6a5c8671d71821a22b90837807cfd2da7ebf893ff
>+SIZE (golang-exp-da58074b4299_GH0.tar.gz) = 1484336
>+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
>+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
>+SHA256 (golang-sys-d4481acd189f_GH0.tar.gz) = 190a722622274e5a847b2040b17771b28bc3dcd6be61bdf48f52be9e121a0ec7
>+SIZE (golang-sys-d4481acd189f_GH0.tar.gz) = 1536485
>+SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
>+SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
>+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
>+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
>+SHA256 (prometheus-client_golang-v1.3.0_GH0.tar.gz) = 7ef44644c24178b650f88930f33ee42758393e657de5d37390f42cb64f894010
>+SIZE (prometheus-client_golang-v1.3.0_GH0.tar.gz) = 143932
>+SHA256 (prometheus-client_model-v0.1.0_GH0.tar.gz) = 6d5b240f7d53765179b84e8f1361d8cd8963b842f70dd1dbce250e8a45f12bdb
>+SIZE (prometheus-client_model-v0.1.0_GH0.tar.gz) = 10520
>+SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
>+SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
>+SHA256 (prometheus-procfs-v0.0.8_GH0.tar.gz) = 1c26c8b86a9b1902684f860f94d0bf4b94abcc570e456bf9a74d1c9d83643872
>+SIZE (prometheus-procfs-v0.0.8_GH0.tar.gz) = 126299
>+SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
>+SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
>Index: net-mgmt/grok_exporter/files/config.yml.in
>===================================================================
>--- net-mgmt/grok_exporter/files/config.yml.in	(revision 541068)
>+++ net-mgmt/grok_exporter/files/config.yml.in	(working copy)
>@@ -1,15 +1,21 @@
> global:
>-    config_version: 2
>+  config_version: 3
> 
>-grok:
>-    patterns_dir: %%DATADIR%%/patterns
>+input:
>+  type: file
>+  path: /var/log/messages
>+  readall: true
> 
>+imports:
>+- type: grok_patterns
>+  dir: %%DATADIR%%/patterns
>+
> metrics:
>-    - type: counter
>-      name: log_messages_total
>-      help: Number of lines in /var/log/messages
>-      match: '%{GREEDYDATA}'
>+- type: counter
>+  name: log_messages_total
>+  help: Number of lines in /var/log/messages
>+  match: '%{GREEDYDATA}'
> 
> server:
>-    host: localhost
>-    port: 9144
>+  host: localhost
>+  port: 9144
>Index: net-mgmt/grok_exporter/files/grok_exporter.in
>===================================================================
>--- net-mgmt/grok_exporter/files/grok_exporter.in	(revision 541068)
>+++ net-mgmt/grok_exporter/files/grok_exporter.in	(working copy)
>@@ -36,7 +36,7 @@
> pidfile=/var/run/grok_exporter.pid
> command=/usr/sbin/daemon
> procname=%%PREFIX%%/bin/grok_exporter
>-command_args="-p ${pidfile} /usr/bin/env ${procname} -config ${grok_exporter_config} >>${grok_exporter_log_file} 2>&1"
>+command_args="-f -p ${pidfile} /usr/bin/env ${procname} -config ${grok_exporter_config} >>${grok_exporter_log_file} 2>&1"
> 
> start_precmd=grok_exporter_startprecmd
> 
>Index: net-mgmt/grok_exporter/files/patch-tailer_fswatcher_fseventProducerLoop__darwin.go
>===================================================================
>--- net-mgmt/grok_exporter/files/patch-tailer_fswatcher_fseventProducerLoop__darwin.go	(nonexistent)
>+++ net-mgmt/grok_exporter/files/patch-tailer_fswatcher_fseventProducerLoop__darwin.go	(working copy)
>@@ -0,0 +1,15 @@
>+--- tailer/fswatcher/fseventProducerLoop_darwin.go.orig	2020-05-07 19:14:41 UTC
>++++ tailer/fswatcher/fseventProducerLoop_darwin.go
>+@@ -61,9 +61,11 @@ func runKeventLoop(kq int) *keventloop {
>+ 		for {
>+ 			eventBuf = make([]syscall.Kevent_t, 10)
>+ 			n, err = syscall.Kevent(l.kq, nil, eventBuf, nil)
>+-			if err == syscall.EINTR || err == syscall.EBADF {
>++			if err == syscall.EBADF {
>+ 				// kq was closed, i.e. Close() was called.
>+ 				return
>++			} else if err == syscall.EINTR {
>++				continue
>+ 			} else if err != nil {
>+ 				select {
>+ 				case <-l.done:
>
>Property changes on: net-mgmt/grok_exporter/files/patch-tailer_fswatcher_fseventProducerLoop__darwin.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/grok_exporter/pkg-plist
>===================================================================
>--- net-mgmt/grok_exporter/pkg-plist	(revision 541068)
>+++ net-mgmt/grok_exporter/pkg-plist	(working copy)
>@@ -1,7 +1,8 @@
> bin/grok_exporter
>-%%ETCDIR%%/config.yml
>+@sample %%ETCDIR%%/config.yml.sample
> %%DATADIR%%/example/config.yml
> %%DATADIR%%/example/exim-rejected-RCPT-examples.log
>+%%DATADIR%%/example/config_logstash_http_input_ipv6.yml
> %%DATADIR%%/patterns/aws
> %%DATADIR%%/patterns/bacula
> %%DATADIR%%/patterns/bro

Actions: View | Diff

Attachments on bug 244613: 212164 | 216154 | 217139