app-admin/logstash-bin: drop old

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

6 files changed, 15 insertions, 142 deletions

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index 96781bd3327b..adf29e1e133d 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -13,8 +13,7 @@ output {
     stdout {
         codec => rubydebug
     }
-  
+
     elasticsearch {
-        hosts => localhost
     }
 }
diff --git a/app-admin/logstash-bin/files/agent.conf.sample2 b/app-admin/logstash-bin/files/agent.conf.sample2
deleted file mode 100644
index adf29e1e133d..000000000000
--- a/app-admin/logstash-bin/files/agent.conf.sample2
+++ /dev/null
@@ -1,19 +0,0 @@
-input {
-    stdin {
-        type => "stdin"
-    }
-
-    file {
-        type => "syslog"
-        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
-    }
-}
-
-output {
-    stdout {
-        codec => rubydebug
-    }
-
-    elasticsearch {
-    }
-}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
index 6d197a219640..dd861d0633f3 100644
--- a/app-admin/logstash-bin/files/logstash.confd
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -20,7 +20,7 @@
 #LS_GROUP=logstash
 
 # logstash logging
-#LS_LOG_FILE=/var/log/logstash/logstash.log
+#LS_LOG_DIR=/var/log/logstash
 #LS_USE_GC_LOGGING="true"
 
 # logstash configuration directory
diff --git a/app-admin/logstash-bin/files/logstash.confd2 b/app-admin/logstash-bin/files/logstash.confd2
deleted file mode 100644
index dd861d0633f3..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd2
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# pidfiles location
-#LS_PIDFILE=/run/logstash/logstash.pid
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_DIR=/var/log/logstash
-#LS_USE_GC_LOGGING="true"
-
-# logstash configuration directory
-#LS_CONF_DIR=/etc/logstash/conf.d
-
-# Open file limit
-#LS_OPEN_FILES=16384
-
-# Nice level
-#LS_NICE=19
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
index eee6c09a16cc..0a0f7ad11b8b 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -4,7 +4,7 @@
 
 LS_USER=${LS_USER:-logstash}
 LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
 LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
 LS_HOME=${LS_HOME:-/var/lib/logstash}
 LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
@@ -14,8 +14,10 @@ LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
 LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
 KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
 
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
 
@@ -36,7 +38,7 @@ checkconfig() {
 	fi
 
 	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
+	${command} ${command_args} --config.test_and_exit
 	eend $? "Configuration error. Please fix your configuration files."
 }
 
@@ -52,14 +54,17 @@ start_pre() {
 
 	rc_ulimit="-n ${LS_OPEN_FILES}"
 
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+	local d
+	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
+	done
+
 }
 
 stop() {
 	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
 		start-stop-daemon --stop \
 			--pidfile=${pidfile} \
 			--retry=TERM/5/KILL/5
diff --git a/app-admin/logstash-bin/files/logstash.initd4 b/app-admin/logstash-bin/files/logstash.initd4
deleted file mode 100644
index 0a0f7ad11b8b..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd4
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER=${LS_USER:-logstash}
-LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
-LS_NICE=${LS_NICE:-19}
-LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
-LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
-LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
-KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
-
-LS_INSTALL_DIR="/opt/logstash"
-
-command="${LS_INSTALL_DIR}/bin/logstash"
-command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
-
-start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
-	--chdir ${LS_HOME}
-	--nicelevel ${LS_NICE}
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
-	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
-	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
-	if [ ! -f ${LS_CONF_DIR}/* ]; then
-		eerror "Please put your configuration in ${LS_CONF_DIR}"
-		exit 1
-	fi
-
-	ebegin "Checking your configuration"
-	${command} ${command_args} --config.test_and_exit
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	rc_ulimit="-n ${LS_OPEN_FILES}"
-
-	local d
-	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
-		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
-		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
-	done
-
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
-		start-stop-daemon --stop \
-			--pidfile=${pidfile} \
-			--retry=TERM/5/KILL/5
-	else
-		start-stop-daemon --stop \
-			--pidfile=${pidfile}
-	fi
-}