Date: Sat, 5 Oct 2019 00:26:17 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513798 - in head/sysutils/logstash6: . files Message-ID: <201910050026.x950QHJF059069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sat Oct 5 00:26:17 2019 New Revision: 513798 URL: https://svnweb.freebsd.org/changeset/ports/513798 Log: Update to 6.8.3 * 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 Deleted: head/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh Modified: head/sysutils/logstash6/Makefile head/sysutils/logstash6/distinfo head/sysutils/logstash6/files/logstash.conf.sample Modified: head/sysutils/logstash6/Makefile ============================================================================== --- head/sysutils/logstash6/Makefile Sat Oct 5 00:18:50 2019 (r513797) +++ head/sysutils/logstash6/Makefile Sat Oct 5 00:26:17 2019 (r513798) @@ -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> Modified: head/sysutils/logstash6/distinfo ============================================================================== --- head/sysutils/logstash6/distinfo Sat Oct 5 00:18:50 2019 (r513797) +++ head/sysutils/logstash6/distinfo Sat Oct 5 00:26:17 2019 (r513798) @@ -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 Modified: head/sysutils/logstash6/files/logstash.conf.sample ============================================================================== --- head/sysutils/logstash6/files/logstash.conf.sample Sat Oct 5 00:18:50 2019 (r513797) +++ head/sysutils/logstash6/files/logstash.conf.sample Sat Oct 5 00:26:17 2019 (r513798) @@ -1,37 +1,17 @@ -input { +# Sample Logstash configuration for creating a simple +# Beats -> Logstash -> Elasticsearch pipeline. - file { - type => "syslog" - # path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ] - path => "/var/log/messages" - start_position => "beginning" - } +input { + beats { + port => 5044 + } } -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 { - # 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" + } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910050026.x950QHJF059069>