Attachment 225046 Details for Bug 239979 – patch all suggested ports

patch all suggested ports

fluentd.diff (text/plain), 12.33 KB, created by Palle Girgensohn on 2021-05-17 23:50:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2021-05-17 23:50:38 UTC

Size: 12.33 KB

patch

obsolete

>commit 0db5ac0e9174075b1e3764a50ece0fc2b3412be8
>Author: Palle Girgensohn <girgen@FreeBSD.org>
>Date:   Tue May 18 01:29:22 2021 +0200
>
>    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)
>
>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>
>
>commit 884848d86526ffa892d76bb8f06349c9fc7403d2
>Author: Palle Girgensohn <girgen@FreeBSD.org>
>Date:   Tue May 18 01:27:38 2021 +0200
>
>    sysutils/rubygem-fluent-plugin-file-alternative: update to 0.2.2
>    
>    Update and take maintainership.
>    
>    PR:             239979
>    Approved by:    kuriyama@FreeBSD.org (maintainer, timeout > 1 year)
>
>diff --git a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
>index 11c3bce9809c..26c55502919a 100644
>--- a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
>+++ b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	fluent-plugin-file-alternative
>-PORTVERSION=	0.1.4
>+PORTVERSION=	0.2.2
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG
> 
>-MAINTAINER=	kuriyama@FreeBSD.org
>+MAINTAINER=	girgen@FreeBSD.org
> COMMENT=	Gems for fluent plugin of alternative implementation of out_file
> 
> RUN_DEPENDS=	\
>diff --git a/sysutils/rubygem-fluent-plugin-file-alternative/distinfo b/sysutils/rubygem-fluent-plugin-file-alternative/distinfo
>index 28ed33e2dd00..78aaeab7d45d 100644
>--- a/sysutils/rubygem-fluent-plugin-file-alternative/distinfo
>+++ b/sysutils/rubygem-fluent-plugin-file-alternative/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (rubygem/fluent-plugin-file-alternative-0.1.4.gem) = 8a0f3575c65fed604c520eb8c25a9df6d6f9acedce0cd49531808c1f01f33a84
>-SIZE (rubygem/fluent-plugin-file-alternative-0.1.4.gem) = 8192
>+TIMESTAMP = 1621293275
>+SHA256 (rubygem/fluent-plugin-file-alternative-0.2.2.gem) = 1f0819032046c68683d7a285a752ca316dd1aa10fd4b16b123696aa7531617de
>+SIZE (rubygem/fluent-plugin-file-alternative-0.2.2.gem) = 9728
>
>commit 2db76bce24185cfdf2155712cc1d32cf099c8beb
>Author: Palle Girgensohn <girgen@FreeBSD.org>
>Date:   Tue May 18 01:25:45 2021 +0200
>
>    sysutils/rubygem-fluent-plugin-config-expander: update to
>    
>    Update and take maintainership.
>    
>    Approved by:    kuriyama@FreeBSD.org (maintainer, timeout > 1 year)
>    PR              239979
>
>diff --git a/sysutils/rubygem-fluent-plugin-config-expander/Makefile b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
>index d21767d75e16..d3321258026c 100644
>--- a/sysutils/rubygem-fluent-plugin-config-expander/Makefile
>+++ b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	fluent-plugin-config-expander
>-PORTVERSION=	0.1.3
>+PORTVERSION=	1.0.1
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG
> 
>-MAINTAINER=	kuriyama@FreeBSD.org
>+MAINTAINER=	girgen@FreeBSD.org
> COMMENT=	Fluent plugin which provides directives for loop extraction
> 
> RUN_DEPENDS=	\
>diff --git a/sysutils/rubygem-fluent-plugin-config-expander/distinfo b/sysutils/rubygem-fluent-plugin-config-expander/distinfo
>index d8759556e178..1c1bc226e7f2 100644
>--- a/sysutils/rubygem-fluent-plugin-config-expander/distinfo
>+++ b/sysutils/rubygem-fluent-plugin-config-expander/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (rubygem/fluent-plugin-config-expander-0.1.3.gem) = 09a5e7486bc168032b853be306303c9a21b4a16974f14959713b38333900a8f3
>-SIZE (rubygem/fluent-plugin-config-expander-0.1.3.gem) = 9216
>+TIMESTAMP = 1621293219
>+SHA256 (rubygem/fluent-plugin-config-expander-1.0.1.gem) = fe5ece9bbf39aa07477cf8c4727809663ac37f4c51f7a1215a1f47829884f21e
>+SIZE (rubygem/fluent-plugin-config-expander-1.0.1.gem) = 9728
>
>commit 951dbc3148ceb622948bbdd2f97f5c4ba3eec62f
>Author: Palle Girgensohn <girgen@FreeBSD.org>
>Date:   Tue May 18 01:24:00 2021 +0200
>
>    sysutils/rubygem-fluent-mixin-plaintextformatter: update to 0.2.6
>    
>    Update and take maintainersbip.
>    
>    PR:             239979
>    Approved by:    kuriyama@FreeBSD.org (maintainer, timeout > 1 year)
>
>diff --git a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
>index b18521eddb36..a2be071e37b3 100644
>--- a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
>+++ b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	fluent-mixin-plaintextformatter
>-PORTVERSION=	0.2.2
>+PORTVERSION=	0.2.6
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG
> 
>-MAINTAINER=	kuriyama@FreeBSD.org
>+MAINTAINER=	girgen@FreeBSD.org
> COMMENT=	Fluentd plugin to include format values into json, tsv or csv
> 
> LICENSE=	APACHE20
>diff --git a/sysutils/rubygem-fluent-mixin-plaintextformatter/distinfo b/sysutils/rubygem-fluent-mixin-plaintextformatter/distinfo
>index c4bbdba20d0b..1849452a4cff 100644
>--- a/sysutils/rubygem-fluent-mixin-plaintextformatter/distinfo
>+++ b/sysutils/rubygem-fluent-mixin-plaintextformatter/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (rubygem/fluent-mixin-plaintextformatter-0.2.2.gem) = 25da4f5dc9a79356917e57374f4a6fe9646a56ec097ea76ad4a53e41f6e98bb5
>-SIZE (rubygem/fluent-mixin-plaintextformatter-0.2.2.gem) = 8192
>+TIMESTAMP = 1621293153
>+SHA256 (rubygem/fluent-mixin-plaintextformatter-0.2.6.gem) = b69cbaf76490abcf0672c568ff7cdbe76fd19d9f5ce9a43c30e080ec9e55913e
>+SIZE (rubygem/fluent-mixin-plaintextformatter-0.2.6.gem) = 9728
>
>commit 9762d4347db6abc7dae5137c3cd015b7a14b8dad
>Author: Palle Girgensohn <girgen@FreeBSD.org>
>Date:   Tue May 18 01:22:13 2021 +0200
>
>    sysutils/rubygem-fluent-plugin-graylog: update to version 1.0.2
>
>diff --git a/sysutils/rubygem-fluent-plugin-graylog/Makefile b/sysutils/rubygem-fluent-plugin-graylog/Makefile
>index e67b29fc2276..517ce17ede0b 100644
>--- a/sysutils/rubygem-fluent-plugin-graylog/Makefile
>+++ b/sysutils/rubygem-fluent-plugin-graylog/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Palle Girgensohn <girgen@FreeBSD.org>
> 
> PORTNAME=	fluent-plugin-graylog
>-PORTVERSION=	1.0.1
>-PORTREVISION=	1
>+PORTVERSION=	1.0.2
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG
> 
>diff --git a/sysutils/rubygem-fluent-plugin-graylog/distinfo b/sysutils/rubygem-fluent-plugin-graylog/distinfo
>index 7d86707ff349..a0f4b9edfa17 100644
>--- a/sysutils/rubygem-fluent-plugin-graylog/distinfo
>+++ b/sysutils/rubygem-fluent-plugin-graylog/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489013140
>-SHA256 (rubygem/fluent-plugin-graylog-1.0.1.gem) = ae15760d566990d8285bda19ef36be86faa27fb6a9d642cdf3dff23a3a9c3224
>-SIZE (rubygem/fluent-plugin-graylog-1.0.1.gem) = 7680
>+TIMESTAMP = 1621290118
>+SHA256 (rubygem/fluent-plugin-graylog-1.0.2.gem) = 5856cbe4bc30e4c92212cb06ce4841e5ebcd51e321a753155404b9bef83f8a93
>+SIZE (rubygem/fluent-plugin-graylog-1.0.2.gem) = 7680

Actions: View

Attachments on bug 239979: 206717 | 208311 | 208312 | 215641 | 216331 | 217161 | 217215 | 217502 | 217503 | 218719 | 218776 | 219532 | 223438 | 224274 | 225046