app-admin/logstash-bin: version bump to 2.1.2/2.2.0

Package-Manager: portage-2.2.27

6 files changed, 2 insertions, 74 deletions

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index 9d125cd6a25e..96781bd3327b 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -15,7 +15,6 @@ output {
     }
   
     elasticsearch {
-        host => localhost
-        cluster => elasticsearch
+        hosts => localhost
     }
 }
diff --git a/app-admin/logstash-bin/files/agent.conf.sample-r2 b/app-admin/logstash-bin/files/agent.conf.sample-r2
deleted file mode 100644
index 96781bd3327b..000000000000
--- a/app-admin/logstash-bin/files/agent.conf.sample-r2
+++ /dev/null
@@ -1,20 +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 {
-        hosts => localhost
-    }
-}
diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd
index cb6839569537..cb6839569537 100644
--- a/app-admin/logstash-bin/files/logstash.confd-r2
+++ b/app-admin/logstash-bin/files/logstash.confd
diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
deleted file mode 100644
index b101e86c8c99..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#LS_USER="root"
-#LS_GROUP="root"
-#LS_CONFDIR="/etc/logstash/conf.d"
-#LS_LOGFILE="/var/log/logstash/logstash.log"
-#LS_PIDFILE="/run/logstash/logstash.pid"
-#LS_HEAP_SIZE="500m"
-#LS_OPTS=""
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd
index e4abf59b0fa0..a61395018b7f 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 LS_USER="${LS_USER:-root}"
diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
deleted file mode 100644
index c65f098c2151..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER="${LS_USER:-root}"
-LS_GROUP="${LS_GROUP:-root}"
-LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
-LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
-LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
-LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user=${LS_USER}:${LS_GROUP} \
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
-pidfile="${LS_PIDFILE}"
-
-depend() {
-	use net
-	after elasticsearch
-}
-
-checkconfig() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	start-stop-daemon --stop \
-		--pidfile="${LS_PIDFILE}" \
-		--retry=TERM/5/KILL/5
-}