sysutils/rubygem-fluentd: update to 1.12.3

Update and take maintainership.

Submitted by:   Artyom Davidov
PR:             239979
Approved by:    kuriyama@FreeBSD.org (maintainer, timeout > 1 year)

3 files changed, 70 insertions, 30 deletions

diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 068e484acd83..ee4d40ddf7ce 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -1,33 +1,34 @@
 PORTNAME=	fluentd
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.12.3
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Fluent event collector
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	rubygem-dig_rb>=1.0.0:devel/rubygem-dig_rb \
-	rubygem-msgpack>=0.7.0:devel/rubygem-msgpack \
+	rubygem-bundler>=0:sysutils/rubygem-bundler \
+	rubygem-msgpack>=1.3.1:devel/rubygem-msgpack \
 	rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby \
 	rubygem-cool.io>=1.4.5:devel/rubygem-cool.io \
-	rubygem-serverengine>=2.0.4:net/rubygem-serverengine \
+	rubygem-serverengine>=2.2.2:net/rubygem-serverengine \
 	rubygem-http_parser.rb>=0.5.1:net/rubygem-http_parser.rb \
 	rubygem-sigdump>=0.2.2:devel/rubygem-sigdump \
 	rubygem-strptime>=0.2.2:devel/rubygem-strptime \
 	rubygem-tzinfo1>=1.0:devel/rubygem-tzinfo1 \
-	rubygem-tzinfo-data>=1.0.0:devel/rubygem-tzinfo-data
+	rubygem-tzinfo-data>=1.0.0:devel/rubygem-tzinfo-data \
+	rubygem-webrick>=1.4.2:www/rubygem-webrick
 
-USE_RUBY=	yes
-PLIST_FILES=	bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
+PLIST_FILES=	bin/fluent-cap-ctl bin/fluent-cat bin/fluent-ctl \
+		bin/fluent-debug bin/fluent-gem bin/fluentd \
 		bin/fluent-binlog-reader bin/fluent-ca-generate \
 		bin/fluent-plugin-config-format bin/fluent-plugin-generate \
 		"@sample etc/fluentd/fluent.conf.sample"
 PLIST_DIRS=	etc/fluentd/plugin
 USES=		gem
+USE_RUBY=	yes
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
 GROUPS=		fluentd
diff --git a/sysutils/rubygem-fluentd/distinfo b/sysutils/rubygem-fluentd/distinfo
index e395cbe3cea3..966be44a10ff 100644
--- a/sysutils/rubygem-fluentd/distinfo
+++ b/sysutils/rubygem-fluentd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548255788
-SHA256 (rubygem/fluentd-1.3.3.gem) = c2c8bc89c604aa2969630e497f089afedab192be06dd0f056c3ee7d7fe3193d9
-SIZE (rubygem/fluentd-1.3.3.gem) = 438784
+TIMESTAMP = 1621293048
+SHA256 (rubygem/fluentd-1.12.3.gem) = 49a9b217913e50ae0609b2d3f228e6c50706e576f265bb04894e806624921c5e
+SIZE (rubygem/fluentd-1.12.3.gem) = 828928
diff --git a/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample b/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample
index 981709385d08..d8840be888f1 100644
--- a/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample
+++ b/sysutils/rubygem-fluentd/files/patch-fluent.conf.sample
@@ -1,65 +1,94 @@
---- fluent.conf.sample.orig	2017-01-06 21:42:28 UTC
-+++ fluent.conf.sample
-@@ -0,0 +1,100 @@
+--- fluent.conf.sample.orig	2020-08-24 22:30:41.549691000 +0300
++++ fluent.conf.sample	2020-08-24 22:21:09.000000000 +0300
+@@ -0,0 +1,139 @@
++# In v1 configuration, type and id are @ prefix parameters.
++# @type and @id are recommended. type and id are still available for backward compatibility
 +
 +## built-in TCP input
 +## $ echo <json> | fluent-cat <tag>
 +<source>
-+  type forward
++  @type forward
++  @id forward_input
 +</source>
 +
 +## built-in UNIX socket input
 +#<source>
-+#  type unix
++#  @type unix
 +#</source>
 +
 +# HTTP input
 +# http://localhost:8888/<tag>?json=<json>
 +<source>
-+  type http
++  @type http
++  @id http_input
++
 +  port 8888
 +</source>
 +
 +## File input
 +## read apache logs with tag=apache.access
 +#<source>
-+#  type tail
++#  @type tail
 +#  format apache
 +#  path /var/log/httpd-access.log
 +#  tag apache.access
 +#</source>
 +
++## Mutating event filter
++## Add hostname and tag fields to apache.access tag events
++#<filter apache.access>
++#  @type record_transformer
++#  <record>
++#    hostname ${hostname}
++#    tag ${tag}
++#  </record>
++#</filter>
++
++## Selecting event filter
++## Remove unnecessary events from apache prefixed tag events
++#<filter apache.**>
++#  @type grep
++#  include1 method GET # pass only GET in 'method' field
++#  exclude1 message debug # remove debug event
++#</filter>
++
 +# Listen HTTP for monitoring
 +# http://localhost:24220/api/plugins
 +# http://localhost:24220/api/plugins?type=TYPE
 +# http://localhost:24220/api/plugins?tag=MYTAG
 +<source>
-+  type monitor_agent
++  @type monitor_agent
++  @id monitor_agent_input
++
 +  port 24220
 +</source>
 +
 +# Listen DRb for debug
 +<source>
-+  type debug_agent
++  @type debug_agent
++  @id debug_agent_input
++
 +  bind 127.0.0.1
 +  port 24230
 +</source>
 +
-+
 +## match tag=apache.access and write to file
 +#<match apache.access>
-+#  type file
++#  @type file
 +#  path /var/log/fluent/access
 +#</match>
 +
 +## match tag=debug.** and dump to console
 +<match debug.**>
-+  type stdout
++  @type stdout
++  @id stdout_output
 +</match>
 +
 +# match tag=system.** and forward to another fluent server
 +<match system.**>
-+  type forward
++  @type forward
++  @id forward_output
++
 +  <server>
 +    host 192.168.0.11
 +  </server>
@@ -72,9 +101,9 @@
 +
 +## match tag=myapp.** and forward and write to file
 +#<match myapp.**>
-+#  type copy
++#  @type copy
 +#  <store>
-+#    type forward
++#    @type forward
 +#    buffer_type file
 +#    buffer_path /var/log/fluent/myapp-forward
 +#    retry_limit 50
@@ -84,20 +113,30 @@
 +#    </server>
 +#  </store>
 +#  <store>
-+#    type file
++#    @type file
 +#    path /var/log/fluent/myapp
 +#  </store>
 +#</match>
 +
 +## match fluent's internal events
 +#<match fluent.**>
-+#  type null
++#  @type null
 +#</match>
 +
 +## match not matched logs and write to file
 +#<match **>
-+#  type file
++#  @type file
 +#  path /var/log/fluent/else
 +#  compress gz
 +#</match>
 +
++## Label: For handling complex event routing
++#<label @STAGING>
++#  <match system.**>
++#    @type forward
++#    @id staging_forward_output
++#    <server>
++#      host 192.168.0.101
++#    </server>
++#  </match>
++#</label>