Update logstash 7.10.0 -> 8.6.2

sysutils/logstash/Makefile

@@ -1,11 +1,10 @@
 ONLY_FOR_ARCHS =	amd64
 COMMENT =		tool for managing events and logs
 
-V =			7.10.0
+V =			8.6.2
 DISTNAME =		logstash-oss-$V-darwin-x86_64
 PKGNAME =		logstash-$V
 EPOCH =			0
-REVISION =		0
 
 CATEGORIES =		sysutils
 
@@ -19,7 +18,7 @@ PERMIT_PACKAGE =	Yes
 MASTER_SITES =		https://artifacts.elastic.co/downloads/logstash/
 
 MODULES =		java
-MODJAVA_VER =		11
+MODJAVA_VER =		17
 
 RUN_DEPENDS =		java/javaPathHelper \
 			lang/jruby \
@@ -45,9 +44,9 @@ do-build:
 	rm ${WRKSRC}/config/*{.beforesubst,${PATCHORIG}} \
 		${WRKSRC}/config/startup.options
 	rm ${WRKSRC}/vendor/jruby/bin/*.{bash,bat,dll,exe,sh}
-	rm -r ${WRKSRC}/vendor/jruby/lib/jni
+	rm -r ${WRKSRC}/vendor/jruby/tmp
 	cd ${WRKSRC}/vendor/jruby/lib/ruby/stdlib/ffi/platform/ && \
-		rm -r *-{aix,cygwin,darwin,freebsd,gnu,linux,netbsd,solaris,windows}*
+		rm -r *-{aix,cygwin,darwin,dragonflybsd,freebsd,gnu,haiku,linux,msys,netbsd,solaris,windows}*
 	@# apply hammer to fixup weird modes
 	find ${WRKSRC}/vendor/ -type f -exec chmod 0644 {} +
 	chmod 755 ${WRKSRC}/vendor/jruby/bin/*

sysutils/logstash/distinfo

@@ -1,2 +1,2 @@
-SHA256 (logstash-oss-7.10.0-darwin-x86_64.tar.gz) = SbPO8swM7DJ+KxQwJ+MfbIOS3GGxqqCCwK5JqEZz68I=
-SIZE (logstash-oss-7.10.0-darwin-x86_64.tar.gz) = 343893284
+SHA256 (logstash-oss-8.6.2-darwin-x86_64.tar.gz) = ecMsIpyb4NDhuXUawyJvZLCLuEVxhrLN+ieC2YSdkC8=
+SIZE (logstash-oss-8.6.2-darwin-x86_64.tar.gz) = 321217001

sysutils/logstash/files/filebeat.yml

@@ -31,7 +31,7 @@ output {
   elasticsearch {
     hosts => ["http://localhost:9200"]
     index => "logstash-%{+YYYY.MM.dd}"
-    template => "/etc/logstash/conf.d/templates/elasticsearch-template-es7x.json"
+    template => "/etc/logstash/conf.d/templates/ecs-disabled/elasticsearch-7x.json"
     template_name => "logstash"
     template_overwrite => "true"
   }

sysutils/logstash/patches/patch-bin_logstash_lib_sh

@@ -6,7 +6,7 @@ Index: bin/logstash.lib.sh
  fi
  
 -LOGSTASH_HOME="$(cd `dirname $SOURCEPATH`/..; pwd)"
-+JAVA_HOME="$(${TRUEPREFIX}/bin/javaPathHelper -h logstash)"
++LS_JAVA_HOME="$(${TRUEPREFIX}/bin/javaPathHelper -h logstash)"
 +LOGSTASH_HOME="${TRUEPREFIX}/logstash"
  export LOGSTASH_HOME
  export LS_HOME="${LOGSTASH_HOME}"
@@ -14,4 +14,4 @@ Index: bin/logstash.lib.sh
 +SINCEDB_DIR="${LOCALSTATEDIR}/logstash"
  export SINCEDB_DIR
  LOGSTASH_JARS=${LOGSTASH_HOME}/logstash-core/lib/jars
- 
+ JRUBY_HOME="${LOGSTASH_HOME}/vendor/jruby"

sysutils/logstash/patches/patch-config_logstash_yml

@@ -10,7 +10,7 @@ Index: config/logstash.yml
  #
  # ------------ Pipeline Settings --------------
  #
-@@ -246,7 +246,7 @@ pipeline.ordered: auto
+@@ -310,7 +310,7 @@
  #   * trace
  #
  # log.level: info
@@ -19,7 +19,7 @@ Index: config/logstash.yml
  #
  # ------------ Other Settings --------------
  #
-@@ -256,49 +256,3 @@ pipeline.ordered: auto
+@@ -323,55 +323,3 @@
  # Flag to output log lines of each pipeline in its separate log file. Each log filename contains the pipeline.name
  # Default is false
  # pipeline.separate_logs: false
@@ -38,7 +38,8 @@ Index: config/logstash.yml
 -#xpack.monitoring.elasticsearch.cloud_auth: logstash_system:password
 -# another authentication alternative is to use an Elasticsearch API key
 -#xpack.monitoring.elasticsearch.api_key: "id:api_key"
--#xpack.monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
+-#xpack.monitoring.elasticsearch.ssl.certificate_authority: "/path/to/ca.crt"
+-#xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint: xxxxxxxxxx
 -#xpack.monitoring.elasticsearch.ssl.truststore.path: path/to/file
 -#xpack.monitoring.elasticsearch.ssl.truststore.password: password
 -#xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
@@ -61,7 +62,8 @@ Index: config/logstash.yml
 -#xpack.management.elasticsearch.cloud_auth: logstash_admin_user:password
 -# another authentication alternative is to use an Elasticsearch API key
 -#xpack.management.elasticsearch.api_key: "id:api_key"
--#xpack.management.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
+-#xpack.management.elasticsearch.ssl.ca_trusted_fingerprint: xxxxxxxxxx
+-#xpack.management.elasticsearch.ssl.certificate_authority: "/path/to/ca.crt"
 -#xpack.management.elasticsearch.ssl.truststore.path: /path/to/file
 -#xpack.management.elasticsearch.ssl.truststore.password: password
 -#xpack.management.elasticsearch.ssl.keystore.path: /path/to/file
@@ -69,3 +71,7 @@ Index: config/logstash.yml
 -#xpack.management.elasticsearch.ssl.verification_mode: certificate
 -#xpack.management.elasticsearch.sniffing: false
 -#xpack.management.logstash.poll_interval: 5s
+-
+-# X-Pack GeoIP plugin
+-# https://www.elastic.co/guide/en/logstash/current/plugins-filters-geoip.html#plugins-filters-geoip-manage_update
+-#xpack.geoip.download.endpoint: "https://geoip.elastic.co/v1/database"

sysutils/logstash/pkg/README

@@ -10,14 +10,12 @@ https://www.elastic.co/support/matrix
 Running Logstash
 ================
 Logstash should be started with it's own uid/gid _logstash, since this user
-has all necessary filesystem permissions. For example, if you want to check
-the configuration, use doas(1):
+has all necessary filesystem permissions. For example, to install opensearch
+output plugin:
 
-    # doas -u _logstash ${TRUEPREFIX}/logstash/bin/logstash -t
-
-Or if you want to manage plugins:
-
-    # doas -u _logstash ${TRUEPREFIX}/logstash/bin/logstash-plugin install <plugin>
+    $ doas su -s /bin/sh -c daemon _logstash -c \
+        '/usr/local/logstash/bin/logstash-plugin install --version 2.0.1 \
+        logstash-output-opensearch'
 
 Upgrading Logstash
 ==================