[Midnightbsd-cvs] mports [24434] trunk/sysutils: update logstash
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 8 13:08:13 EDT 2018
Revision: 24434
http://svnweb.midnightbsd.org/mports/?rev=24434
Author: laffer1
Date: 2018-10-08 13:08:12 -0400 (Mon, 08 Oct 2018)
Log Message:
-----------
update logstash
Modified Paths:
--------------
trunk/sysutils/Makefile
Added Paths:
-----------
trunk/sysutils/logstash6/
trunk/sysutils/logstash6/Makefile
trunk/sysutils/logstash6/distinfo
trunk/sysutils/logstash6/files/
trunk/sysutils/logstash6/files/logstash.conf.sample
trunk/sysutils/logstash6/files/logstash.in
trunk/sysutils/logstash6/files/patch-config_logstash.yml
trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby
trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash
trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh
trunk/sysutils/logstash6/pkg-descr
trunk/sysutils/logstash6/pkg-message
Removed Paths:
-------------
trunk/sysutils/logstash/
Modified: trunk/sysutils/Makefile
===================================================================
--- trunk/sysutils/Makefile 2018-10-08 16:51:51 UTC (rev 24433)
+++ trunk/sysutils/Makefile 2018-10-08 17:08:12 UTC (rev 24434)
@@ -71,7 +71,7 @@
SUBDIR += libsunacl
SUBDIR += linux-f10-procps
SUBDIR += lmmon
-SUBDIR += logstash
+SUBDIR += logstash6
SUBDIR += lscpu
SUBDIR += lsof
SUBDIR += mbmon
Added: trunk/sysutils/logstash6/Makefile
===================================================================
--- trunk/sysutils/logstash6/Makefile (rev 0)
+++ trunk/sysutils/logstash6/Makefile 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,79 @@
+# Created by: Daniel Solsona <daniel at ish.com.au>, Guido Falsi <madpilot at FreeBSD.org>
+# $FreeBSD: head/sysutils/logstash6/Makefile 469572 2018-05-10 19:15:44Z feld $
+
+PORTNAME= logstash
+PORTVERSION= 6.2.4
+PORTREVISION= 0
+CATEGORIES= sysutils java
+MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/
+PKGNAMESUFFIX= 6
+
+MAINTAINER= elastic at FreeBSD.org
+COMMENT= Server-side data ingest and transfomation tool
+
+LICENSE= apache2
+
+RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
+
+CONFLICTS= logstash-[0-9]* logstash5-[0-9]*
+
+USES= cpe shebangfix
+SHEBANG_FILES= bin/*
+CPE_VENDOR= elasticsearch
+USE_JAVA= yes
+JAVA_VERSION= 1.8+
+JAVA_RUN= yes
+NO_BUILD= yes
+
+USERS= logstash
+GROUPS= logstash
+
+LOGSTASH_DIR= ${PREFIX}/${PORTNAME}
+
+USE_RC_SUBR= logstash
+
+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_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
+
+post-patch:
+ ${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
+ ${FIND} ${WRKSRC} -name '*.orig' -delete
+
+do-install:
+ ${FIND} ${WRKSRC} -name '*.bat' -delete
+ ${MKDIR} ${FAKE_DESTDIR}${TRUE_PREFIX}/etc/logstash
+ ${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${ETCDIR}
+.for x in ${LOGSTASH_CONF_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/config/${x} ${ETCDIR}/${x}.sample
+.endfor
+ ${RM} -rf ${WRKSRC}/config
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR})
+ ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/*
+.for x in ${LOGSTASH_JRUBY_BIN_FILES}
+ ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x}
+.endfor
+ ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_DIR}/config
+
+post-install:
+ ${ECHO} "@sample etc/logstash/logstash.conf.sample" >> ${TMPPLIST}
+.for x in ${LOGSTASH_CONF_FILES}
+ ${ECHO} "@sample etc/logstash/${x}.sample" >> ${TMPPLIST}
+.endfor
+ ${FIND} -s ${FAKE_DESTDIR}${TRUE_PREFIX}/logstash -not -type d | ${SORT} | \
+ ${SED} -e 's#^${FAKE_DESTDIR}${TRUE_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.1-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>
Property changes on: trunk/sysutils/logstash6/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/logstash6/distinfo
===================================================================
--- trunk/sysutils/logstash6/distinfo (rev 0)
+++ trunk/sysutils/logstash6/distinfo 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1525976336
+SHA256 (logstash-6.2.4.tar.gz) = 4040c2b6a1e9c6908b12885659021a35dca415c6b884cef6938fcc589e94431e
+SIZE (logstash-6.2.4.tar.gz) = 147224408
Property changes on: trunk/sysutils/logstash6/distinfo
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/logstash.conf.sample
===================================================================
--- trunk/sysutils/logstash6/files/logstash.conf.sample (rev 0)
+++ trunk/sysutils/logstash6/files/logstash.conf.sample 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,37 @@
+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 { }
+# }
+}
+
+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" ] }
+}
Property changes on: trunk/sysutils/logstash6/files/logstash.conf.sample
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/logstash.in
===================================================================
--- trunk/sysutils/logstash6/files/logstash.in (rev 0)
+++ trunk/sysutils/logstash6/files/logstash.in 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+# Configuration settings for logstash in /etc/rc.conf:
+#
+# PROVIDE: logstash
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+#
+# logstash_enable (bool):
+# Default value: "NO"
+# Flag that determines whether Logstash is enabled.
+#
+# logstash_home (string):
+# Default value: "/usr/local/logstash"
+# Logstash installation directory.
+#
+# logstash_config (string):
+# Default value: /usr/local/etc/${name}
+# Logstash configuration path.
+#
+# logstash_log (bool):
+# Set to "NO" by default.
+# Set it to "YES" to enable logstash logging to file
+# Default output to /var/log/logstash.log
+#
+# logstash_log_file (string):
+# Default value: "${logdir}/${name}.log"
+# Log file path.
+#
+# logstash_java_home (string):
+# Default value: "/usr/local/openjdk8"
+# Root directory of the desired Java SDK.
+# The JAVA_HOME environment variable is set with the contents of this
+# variable.
+#
+# logstash_java_opts (string):
+# Default value: ""
+# Options to pass to the Java Virtual Machine.
+# The JAVA_OPTS environment variable is set with the contents of this
+# variable.
+#
+# logstash_opts (string):
+# Default value: ""
+# Additional command line flags for logstash, eg. "-r"
+#
+
+. /etc/rc.subr
+
+name=logstash
+rcvar=logstash_enable
+
+load_rc_config ${name}
+
+logdir="/var/log"
+
+: ${logstash_enable="NO"}
+: ${logstash_user="logstash"}
+: ${logstash_group="logstash"}
+: ${logstash_home="%%LOGSTASH_HOME%%"}
+: ${logstash_config="%%ETCDIR%%"}
+: ${logstash_log="YES"}
+: ${logstash_log_dir="${logdir}/${name}"}
+: ${logstash_java_home="%%JAVA_HOME%%"}
+: ${logstash_java_opts=""}
+: ${logstash_opts=""}
+
+pidfile=/var/run/${name}/${name}.pid
+
+extra_commands="configtest reload"
+start_precmd="logstash_precmd"
+configtest_cmd=configtest
+
+logstash_cmd="${logstash_home}/bin/logstash"
+procname="${logstash_java_home}/bin/java"
+
+logstash_chdir=${logstash_home}
+logstash_log_options=""
+
+if checkyesno logstash_log; then
+ logstash_log_options=" -l ${logstash_log_dir}"
+fi
+
+logstash_args="--path.settings ${logstash_config} ${logstash_log_options} ${logstash_opts}"
+
+JAVA_OPTS="${logstash_java_opts}"
+JAVA_HOME="${logstash_java_home}"
+export JAVA_OPTS
+export JAVA_HOME
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} ${logstash_cmd} ${logstash_args}"
+required_files="${logstash_home} ${logstash_java_home} ${logstash_cmd} ${logstash_config}"
+
+# Include /usr/local/bin in path because Logstash startup scripts
+# assume bash is in path.
+PATH=/usr/local/bin:$PATH
+
+logstash_precmd()
+{
+ /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${pidfile%/*}
+ /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 ${logstash_log_dir}
+ /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/db/logstash
+ /usr/bin/install -d -o ${logstash_user} -g ${logstash_group} -m 755 /var/run/logstash
+}
+
+configtest()
+{
+ echo "${name} configtest:"
+ echo "WARNING: this does not check validity of Grok patterns!"
+ echo "WARNING: this does not check validity of Grok patterns!"
+ echo "WARNING: this does not check validity of Grok patterns!"
+ ${logstash_cmd} --path.settings ${logstash_config} --config.test_and_exit
+}
+
+
+run_rc_command "$1"
Property changes on: trunk/sysutils/logstash6/files/logstash.in
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/patch-config_logstash.yml
===================================================================
--- trunk/sysutils/logstash6/files/patch-config_logstash.yml (rev 0)
+++ trunk/sysutils/logstash6/files/patch-config_logstash.yml 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,11 @@
+--- config/logstash.yml.orig 2018-03-09 15:21:48 UTC
++++ config/logstash.yml
+@@ -61,7 +61,7 @@
+ #
+ # Where to fetch the pipeline configuration for the main pipeline
+ #
+-# path.config:
++path.config: %%ETCDIR%%/logstash.conf
+ #
+ # Pipeline configuration string for the main pipeline
+ #
Property changes on: trunk/sysutils/logstash6/files/patch-config_logstash.yml
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby
===================================================================
--- trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby (rev 0)
+++ trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,11 @@
+--- vendor/jruby/bin/jruby.orig 2018-02-16 20:50:22 UTC
++++ vendor/jruby/bin/jruby
+@@ -244,7 +244,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}")
Property changes on: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash
===================================================================
--- trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash (rev 0)
+++ trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,11 @@
+--- vendor/jruby/bin/jruby.bash.orig 2018-02-16 20:50:22 UTC
++++ vendor/jruby/bin/jruby.bash
+@@ -244,7 +244,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}")
Property changes on: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.bash
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh
===================================================================
--- trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh (rev 0)
+++ trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,24 @@
+--- 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}"
Property changes on: trunk/sysutils/logstash6/files/patch-vendor_jruby_bin_jruby.sh
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/pkg-descr
===================================================================
--- trunk/sysutils/logstash6/pkg-descr (rev 0)
+++ trunk/sysutils/logstash6/pkg-descr 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,6 @@
+Logstash is an open source, server-side data processing pipeline that
+ingests data from a multitude of sources simultaneously, transforms it,
+and then sends it to your favorite “stash.” (Ours is Elasticsearch,
+naturally.)
+
+WWW: https://www.elastic.co/products/logstash
Property changes on: trunk/sysutils/logstash6/pkg-descr
___________________________________________________________________
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
Added: trunk/sysutils/logstash6/pkg-message
===================================================================
--- trunk/sysutils/logstash6/pkg-message (rev 0)
+++ trunk/sysutils/logstash6/pkg-message 2018-10-08 17:08:12 UTC (rev 24434)
@@ -0,0 +1,7 @@
+To start logstash as an agent during startup, add
+
+ logstash_enable="YES"
+
+to your /etc/rc.conf.
+
+Extra options can be found in startup script.
Property changes on: trunk/sysutils/logstash6/pkg-message
___________________________________________________________________
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
More information about the Midnightbsd-cvs
mailing list