From owner-dev-commits-ports-main@freebsd.org Thu May 20 20:37:37 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D968D648470; Thu, 20 May 2021 20:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FmM4K4tmlz3j0V; Thu, 20 May 2021 20:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 876FC2C98C; Thu, 20 May 2021 20:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14KKbbW3048751; Thu, 20 May 2021 20:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14KKbbYY048749; Thu, 20 May 2021 20:37:37 GMT (envelope-from git) Date: Thu, 20 May 2021 20:37:37 GMT Message-Id: <202105202037.14KKbbYY048749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 5ec81f5382ab - main - sysutils/rubygem-fluentd: update to 1.12.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ec81f5382ab38275465d2e1ff2a9ecf70592639 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 20:37:38 -0000 The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ec81f5382ab38275465d2e1ff2a9ecf70592639 commit 5ec81f5382ab38275465d2e1ff2a9ecf70592639 Author: Palle Girgensohn AuthorDate: 2021-05-20 20:13:54 +0000 Commit: Palle Girgensohn CommitDate: 2021-05-20 20:32:07 +0000 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) --- sysutils/rubygem-fluentd/Makefile | 19 +++--- sysutils/rubygem-fluentd/distinfo | 6 +- .../rubygem-fluentd/files/patch-fluent.conf.sample | 75 ++++++++++++++++------ 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 | fluent-cat + -+ type forward ++ @type forward ++ @id forward_input + + +## built-in UNIX socket input +# -+# type unix ++# @type unix +# + +# HTTP input +# http://localhost:8888/?json= + -+ type http ++ @type http ++ @id http_input ++ + port 8888 + + +## File input +## read apache logs with tag=apache.access +# -+# type tail ++# @type tail +# format apache +# path /var/log/httpd-access.log +# tag apache.access +# + ++## Mutating event filter ++## Add hostname and tag fields to apache.access tag events ++# ++# @type record_transformer ++# ++# hostname ${hostname} ++# tag ${tag} ++# ++# ++ ++## Selecting event filter ++## Remove unnecessary events from apache prefixed tag events ++# ++# @type grep ++# include1 method GET # pass only GET in 'method' field ++# exclude1 message debug # remove debug event ++# ++ +# Listen HTTP for monitoring +# http://localhost:24220/api/plugins +# http://localhost:24220/api/plugins?type=TYPE +# http://localhost:24220/api/plugins?tag=MYTAG + -+ type monitor_agent ++ @type monitor_agent ++ @id monitor_agent_input ++ + port 24220 + + +# Listen DRb for debug + -+ type debug_agent ++ @type debug_agent ++ @id debug_agent_input ++ + bind 127.0.0.1 + port 24230 + + -+ +## match tag=apache.access and write to file +# -+# type file ++# @type file +# path /var/log/fluent/access +# + +## match tag=debug.** and dump to console + -+ type stdout ++ @type stdout ++ @id stdout_output + + +# match tag=system.** and forward to another fluent server + -+ type forward ++ @type forward ++ @id forward_output ++ + + host 192.168.0.11 + @@ -72,9 +101,9 @@ + +## match tag=myapp.** and forward and write to file +# -+# type copy ++# @type copy +# -+# type forward ++# @type forward +# buffer_type file +# buffer_path /var/log/fluent/myapp-forward +# retry_limit 50 @@ -84,20 +113,30 @@ +# +# +# -+# type file ++# @type file +# path /var/log/fluent/myapp +# +# + +## match fluent's internal events +# -+# type null ++# @type null +# + +## match not matched logs and write to file +# -+# type file ++# @type file +# path /var/log/fluent/else +# compress gz +# + ++## Label: For handling complex event routing ++#