app-admin/logstash-bin: bump to 5.3.2/5.4.0, drop old

Closes: https://github.com/gentoo/gentoo/pull/4744
Package-Manager: Portage-2.3.6, Repoman-2.3.2

4 files changed, 23 insertions, 13 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index f3f31f6eb59a..abff0d7e2176 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
-DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-5.2.2.zip 100068713 SHA256 35bd0378f5b9001b4c3056b11496936ef47c09e3ddc469353bc8951e3b81e174 SHA512 923b35e8bcc97f6036cd4a484df546b2cc1341ec8fe5080bea8f979856086aaaae5f71fa0c3f7aee2207f7c3e71aec18af416278123362f89990c05ec9e2c92f WHIRLPOOL 4a67ed0ba3b532da5d488b2e45f53149b4e63b6b638b6fe1058a13eab904cb7ec24cd87306868a4770fe6aadfe13f7d76bfc9973e73104a8e4e9aee455321c32
-DIST logstash-5.3.1.zip 100150030 SHA256 f5e626a8cfe128b7ebaa0ec8ddc20876913852efd91c2c81a1f19f2223e00e07 SHA512 7897eab56bc33ee38169ad34e600cdf7180d0af30f93811f1ecf30a107944cd7a5ab2e95805695da7c1ce6f2112424c17de3b3bd9efaf344daff4e227d5e3d90 WHIRLPOOL 12383a43c372a2eef31b0a64e1b14f304ea90f7202524f6d56b7f0f51fcefd029f45b7f2782050d3c89269e41ae96c02e78586db30bb5d509f45b19508c36be3
+DIST logstash-5.3.2.zip 100247384 SHA256 b0dfe9295c86dc4efbc1b0884c8078fd414e2e96480c3b513b2a92dab47cb505 SHA512 c150a3076b035204677275081267ac781b34d7abd1e93214cf79d73c326afb58b24ebd91453dd6fb7ba3157cb28de9b319e077e07e4b0cb3db939b99174b130b WHIRLPOOL 83d8b347266e0846b2967b6c11c6615dd3a438d8eaf5dbe057caf7569a6f64ff39a352b56b9ef9127d045d7a37d484a5a09130961cbe190946d7f1b52a66251a
+DIST logstash-5.4.0.zip 98567077 SHA256 f7a817009f7458cb186d652497e68003c221b07dbf28b5097a66b40ffb022a2a SHA512 4d552d43a1817ba04d25a3ada1cf87ecdae632a520627d3b6cb514b7e3384a6a09a98e8f24ea19328c60c4549b9dd1eb0e1a5282665f85877afbd7e7fef88e71 WHIRLPOOL 25dc935abee1ae1852c83801d50fc08bc2896e2744282f219e2afef4e9da5f608472baf4f88b31127959495d320643bbf7f94d7fea809b15d8186f333649ad0e
diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index adf29e1e133d..85c9b5c93d2a 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -1,12 +1,22 @@
 input {
-    stdin {
-        type => "stdin"
+    beats {
+      port => 5044
     }
 
+    # may need root privileges
     file {
         type => "syslog"
         path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
     }
+
+    redis {
+      key => logstash
+      data_type => list
+    }
+
+    stdin {
+        type => "stdin"
+    }
 }
 
 output {
diff --git a/app-admin/logstash-bin/logstash-bin-5.3.1.ebuild b/app-admin/logstash-bin/logstash-bin-5.3.2.ebuild
index cda22abd473f..fbb7c1bfc373 100644
--- a/app-admin/logstash-bin/logstash-bin-5.3.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.3.2.ebuild
@@ -12,7 +12,8 @@ DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 
-LICENSE="Apache-2.0"
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
index 668a90ad7ac6..f5c4d8c2e292 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
@@ -12,7 +12,8 @@ DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 
-LICENSE="Apache-2.0"
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -51,11 +52,9 @@ pkg_postinst() {
 	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
 	ewarn "${EROOT%/}/etc/conf.d/${MY_PN}"
 	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
+	einfo "Installing plugins: (bug #601294)"
+	einfo "DEBUG=1 JARS_SKIP='true' bin/logstash-plugin install logstash-output-gelf"
+	einfo
+	einfo "Sample configuration:"
+	einfo "${EROOT%/}/usr/share/${MY_PN}"
 }