Attachment #206739 for bug #240000




# $FreeBSD$

PORTNAME=	logstash
PORTVERSION=	6.8.2
PORTREVISION=	0
CATEGORIES=	sysutils java
MASTER_SITES=	http://artifacts.elastic.co/downloads/logstash/

SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
		LOGSTASH_HOME=${LOGSTASH_HOME}

LOGSTASH_CONF_FILES=	jvm.options log4j2.properties logstash.yml \
			pipelines.yml startup.options
LOGSTASH_JRUBY_SUBDIR=	vendor/jruby/bin
LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
				jruby.bash jruby.sh jrubyc rake rdoc ri testrb

post-patch:
	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml

	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \
		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/build_info" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/cache" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/doc" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/extensions" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/manticore-0.6.4-java/spec/ssl" >> ${TMPPLIST}
	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/redis-3.3.5/test/db" >> ${TMPPLIST}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1563908861	1	TIMESTAMP = 1565893547
2	SHA256 (logstash-6.5.4.tar.gz) = 774c5687006991bcd20d28bf1dcb76890fcd882d1937d71074ba87aa7fc5c4f0	2	SHA256 (logstash-6.8.2.tar.gz) = f5a2db683bdab01c1067c727ffdbd150ab6c56c6a6ab28daf10c77c18e6134e8
3	SIZE (logstash-6.5.4.tar.gz) = 160286824	3	SIZE (logstash-6.8.2.tar.gz) = 172065567




# Sample Logstash configuration for creating a simple
# Beats -> Logstash -> Elasticsearch pipeline.

input {
  beats {
    port => 5044
  }
		# path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
		path => "/var/log/messages"
		start_position => "beginning"
	}
}

filter {
# An filter may change the regular expression used to match a record or a field,
# alter the value of parsed fields, add or remove fields, etc.
#
#	if [type] == "syslog" {
#		grok {
#			#patterns_dir => ["/usr/local/etc/logstash/patterns"]
#			match => { "message" => "(<%{POSINT:syslog_pri}>)?%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
#		}
#		mutate {
#			remove_field => [ "syslog_hostname", "syslog_message" ]
#		}
#		date {
#			match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
#		}
#		syslog_pri { }
#	}
}

output {
  elasticsearch {
    hosts => ["http://localhost:9200"]
    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
    #user => "elastic"
    #password => "changeme"
  }
}

Lines 1-24 Link Here

(-)files/patch-vendor_jruby_bin_jruby.sh (-24 lines)
1	--- vendor/jruby/bin/jruby.sh.orig 2018-02-16 20:50:22 UTC
2	+++ vendor/jruby/bin/jruby.sh
3	@@ -26,9 +26,9 @@ progname=`basename "$0"`
4
5	while [ -h "$PRG" ] ; do
6	ls=`ls -ld "$PRG"`
7	- link=`expr "$ls" : '.-> $.$$'`
8	- if expr "$link" : './.' > /dev/null; then
9	- if expr "$link" : '/' > /dev/null; then
10	+ link=`expr -- "$ls" : '.-> $.$$'`
11	+ if expr -- "$link" : './.' > /dev/null; then
12	+ if expr -- "$link" : '/' > /dev/null; then
13	PRG="$link"
14	else
15	PRG="`dirname ${PRG}`/${link}"
16	@@ -202,7 +202,7 @@ do
17	# Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
18	-X*)
19	val=${1:2}
20	- if expr "$val" : '.*[.]' > /dev/null; then
21	+ if expr -- "$val" : '.*[.]' > /dev/null; then
22	java_args="${java_args} -Djruby.${val}"
23	else
24	ruby_args="${ruby_args} -X${val}"

Return to bug 240000

Lines 2-8 Link Here

(-)Makefile (-10 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= logstash	4	PORTNAME= logstash
5	PORTVERSION= 6.5.4	5	PORTVERSION= 6.8.2
6	PORTREVISION= 0	6	PORTREVISION= 0
7	CATEGORIES= sysutils java	7	CATEGORIES= sysutils java
8	MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/	8	MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/
Lines 37-46 Link Here
37	SUB_LIST= JAVA_HOME=${JAVA_HOME} \	37	SUB_LIST= JAVA_HOME=${JAVA_HOME} \
38	LOGSTASH_HOME=${LOGSTASH_HOME}	38	LOGSTASH_HOME=${LOGSTASH_HOME}
39		39
40	LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml	40	LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml \
		41	pipelines.yml startup.options
41	LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin	42	LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin
42	LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \	43	LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \
43	jgem jirb_swing jruby.bash jrubyc rake ri	44	jruby.bash jruby.sh jrubyc rake rdoc ri testrb
44		45
45	post-patch:	46	post-patch:
46	${REINPLACE_CMD} 's\|%%ETCDIR%%\|${ETCDIR}\|g' ${WRKSRC}/config/logstash.yml	47	${REINPLACE_CMD} 's\|%%ETCDIR%%\|${ETCDIR}\|g' ${WRKSRC}/config/logstash.yml
Lines 69-79 Link Here
69	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d \| ${SORT} \| \	70	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d \| ${SORT} \| \
70	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}	71	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
71	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}	72	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
72	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/build_info" >> ${TMPPLIST}
73	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/cache" >> ${TMPPLIST}
74	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/doc" >> ${TMPPLIST}
75	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/extensions" >> ${TMPPLIST}
76	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/manticore-0.6.4-java/spec/ssl" >> ${TMPPLIST}
77	${ECHO} "@dir logstash/vendor/bundle/jruby/2.3.0/gems/redis-3.3.5/test/db" >> ${TMPPLIST}
78		73
79	.include <bsd.port.mk>	74	.include <bsd.port.mk>

Lines 1-37 Link Here

(-)files/logstash.conf.sample (-32 / +12 lines)
		1	# Sample Logstash configuration for creating a simple
		2	# Beats -> Logstash -> Elasticsearch pipeline.
		3
1	input {	4	input {
2		5	beats {
3	file {	6	port => 5044
4	type => "syslog"	7	}
5	# path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
6	path => "/var/log/messages"
7	start_position => "beginning"
8	}
9	}	8	}
10		9
11	filter {
12	# An filter may change the regular expression used to match a record or a field,
13	# alter the value of parsed fields, add or remove fields, etc.
14	#
15	# if [type] == "syslog" {
16	# grok {
17	# #patterns_dir => ["/usr/local/etc/logstash/patterns"]
18	# match => { "message" => "(<%{POSINT:syslog_pri}>)?%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}\|%{GREEDYDATA:syslog_message})" }
19	# }
20	# mutate {
21	# remove_field => [ "syslog_hostname", "syslog_message" ]
22	# }
23	# date {
24	# match => [ "syslog_timestamp","MMM d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ]
25	# }
26	# syslog_pri { }
27	# }
28	}
29
30	output {	10	output {
31	# Emit events to stdout for easy debugging of what is going through	11	elasticsearch {
32	# logstash.	12	hosts => ["http://localhost:9200"]
33	# stdout { codec => rubydebug }	13	index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
34		14	#user => "elastic"
35	# This will use elasticsearch to store your logs.	15	#password => "changeme"
36	# elasticsearch { hosts => [ "localhost:9200" ] }	16	}
37	}	17	}