mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-07 06:40:06 +00:00
Code Issues Releases Activity

Update to 6.8.3

Browse Source 
* Update to 6.8.3
* Take the distributed sample and use that as logstash.conf.sample

PR:		240000
Approved by:	maintainer timeout
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Greg Lewis 2019-10-05 00:26:17 +00:00
parent 479830d495
commit ae955583c0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=513798
4 changed files with 20 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sysutils/logstash6/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= logstash
PORTVERSION= 6.5.4
PORTVERSION= 6.8.3
PORTREVISION= 0
CATEGORIES= sysutils java
MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/
@ -37,10 +37,11 @@ LOGSTASH_HOME?= ${PREFIX}/${PORTNAME}
SUB_LIST= JAVA_HOME=${JAVA_HOME} \
LOGSTASH_HOME=${LOGSTASH_HOME}
LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml pipelines.yml
LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml \
pipelines.yml startup.options
LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin
LOGSTASH_JRUBY_BIN_FILES= ast irb jirb jruby jruby.sh rdoc testrb gem \
jgem jirb_swing jruby.bash jrubyc rake ri
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
@ -69,11 +70,5 @@ post-install:
${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>

6
sysutils/logstash6/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563908861
SHA256 (logstash-6.5.4.tar.gz) = 774c5687006991bcd20d28bf1dcb76890fcd882d1937d71074ba87aa7fc5c4f0
SIZE (logstash-6.5.4.tar.gz) = 160286824
TIMESTAMP = 1568827839
SHA256 (logstash-6.8.3.tar.gz) = a300840ff110f6c3b94388ba728fdf7bc6ffc0f003ae12deffd4b547d989fc02
SIZE (logstash-6.8.3.tar.gz) = 172067513

44
sysutils/logstash6/files/logstash.conf.sample
View File

@ -1,37 +1,17 @@
# Sample Logstash configuration for creating a simple
# Beats -> Logstash -> Elasticsearch pipeline.
input {
file {
type => "syslog"
# 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 { }
# }
beats {
port => 5044
}
}
output {
# Emit events to stdout for easy debugging of what is going through
# logstash.
# stdout { codec => rubydebug }
# This will use elasticsearch to store your logs.
# elasticsearch { hosts => [ "localhost:9200" ] }
elasticsearch {
hosts => ["http://localhost:9200"]
index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
#user => "elastic"
#password => "changeme"
}
}

24
sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh
View File

@ -1,24 +0,0 @@
--- vendor/jruby/bin/jruby.sh.orig 2018-02-16 20:50:22 UTC
+++ vendor/jruby/bin/jruby.sh
@@ -26,9 +26,9 @@ progname=`basename "$0"`
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- if expr "$link" : '/' > /dev/null; then
+ link=`expr -- "$ls" : '.*-> \(.*\)$'`
+ if expr -- "$link" : '.*/.*' > /dev/null; then
+ if expr -- "$link" : '/' > /dev/null; then
PRG="$link"
else
PRG="`dirname ${PRG}`/${link}"
@@ -202,7 +202,7 @@ do
# Match -Xa.b.c=d to translate to -Da.b.c=d as a java option
-X*)
val=${1:2}
- if expr "$val" : '.*[.]' > /dev/null; then
+ if expr -- "$val" : '.*[.]' > /dev/null; then
java_args="${java_args} -Djruby.${val}"
else
ruby_args="${ruby_args} -X${val}"