Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-admin/fluentd
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/fluentd')
-rw-r--r--app-admin/fluentd/Manifest3
-rw-r--r--app-admin/fluentd/files/fluent.conf139
-rw-r--r--app-admin/fluentd/files/fluentd.initd2
-rw-r--r--app-admin/fluentd/fluentd-1.16.3.ebuild (renamed from app-admin/fluentd/fluentd-1.9.0.ebuild)33
-rw-r--r--app-admin/fluentd/fluentd-1.4.2.ebuild61
-rw-r--r--app-admin/fluentd/metadata.xml14
6 files changed, 30 insertions, 222 deletions
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index adc11320eac4..030120f0dd95 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,2 +1 @@
-DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
-DIST fluentd-1.9.0.gem 500224 BLAKE2B c09fc4d40e931ef2dc669cac1358c3b15baf434b7920f9481644953986dd1c3d140c4f4f8b53dd46d5972207ca7b1cb355f7fc51830b1adbb275c82ea9a7b979 SHA512 145b14b77900b2c7e4b83923d0d06465c7c5fdbfcdf39d1ab0be31a91e9003da7086b02b5fe9b4367956d892aadd65ac3ee34cafdf4f746c630a306af245b69d
+DIST fluentd-1.16.3.gem 880128 BLAKE2B c3b7379acf671bdf339cf4e7f2cc83aafebf4b8146203b04dcf7e1608263734979a77f3514373d9ff5740b421daa51edc3f10ab2b112b61cfac6aae4375efa55 SHA512 fb7d5fc9bd020ae4cd5c45d89740ed9a218156e9f64c170c9c6869448d111755a8e225c3539b8b2626a312406a329b5660d5d9ba2aa863eb1ee8ab69fb9c72a0
diff --git a/app-admin/fluentd/files/fluent.conf b/app-admin/fluentd/files/fluent.conf
deleted file mode 100644
index 099d1b4af47d..000000000000
--- a/app-admin/fluentd/files/fluent.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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
-# @id forward_input
-#</source>
-
-## built-in UNIX socket input
-#<source>
-# @type unix
-#</source>
-
-# HTTP input
-# http://localhost:8888/<tag>?json=<json>
-#<source>
-# @type http
-# @id http_input
-
-# port 8888
-#</source>
-
-## File input
-## read apache logs with tag=apache.access
-#<source>
-# @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
-# @id monitor_agent_input
-
-# port 24220
-#</source>
-
-# Listen DRb for debug
-#<source>
-# @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
-# path /var/log/fluent/access
-#</match>
-
-## match tag=debug.** and dump to console
-<match debug.**>
- @type stdout
- @id stdout_output
-</match>
-
-# match tag=system.** and forward to another fluent server
-#<match system.**>
-# @type forward
-# @id forward_output
-
-# <server>
-# host 192.168.0.11
-# </server>
-# <secondary>
-# <server>
-# host 192.168.0.12
-# </server>
-# </secondary>
-#</match>
-
-## match tag=myapp.** and forward and write to file
-#<match myapp.**>
-# @type copy
-# <store>
-# @type forward
-# buffer_type file
-# buffer_path /var/log/fluent/myapp-forward
-# retry_limit 50
-# flush_interval 10s
-# <server>
-# host 192.168.0.13
-# </server>
-# </store>
-# <store>
-# @type file
-# path /var/log/fluent/myapp
-# </store>
-#</match>
-
-## match fluent's internal events
-#<match fluent.**>
-# @type null
-#</match>
-
-## match not matched logs and write to file
-#<match **>
-# @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>
diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
index 03fb7fbff7e7..76c7c6374f86 100644
--- a/app-admin/fluentd/files/fluentd.initd
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -5,7 +5,7 @@
command=/usr/bin/fluentd
logfile=/var/log/fluentd/fluent.log
pidfile=/var/run/fluentd.pid
-command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
+command_args="--no-supervisor -o ${logfile} ${fluentd_opts}"
command_background=yes
command_user=fluentd:fluentd
retry="${retry:-TERM/10/KILL/30}"
diff --git a/app-admin/fluentd/fluentd-1.9.0.ebuild b/app-admin/fluentd/fluentd-1.16.3.ebuild
index 501d09685987..4b5c6efc3d20 100644
--- a/app-admin/fluentd/fluentd-1.9.0.ebuild
+++ b/app-admin/fluentd/fluentd-1.16.3.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=8
+USE_RUBY="ruby31 ruby32"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem user
+inherit ruby-fakegem
DESCRIPTION="data collector and unified logging layer (project under CNCF)"
HOMEPAGE="https://www.fluentd.org"
@@ -15,20 +13,31 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
+COMMON_DEPEND="acct-group/fluentd
+ acct-user/fluentd"
+DEPEND="${COMMON_DEPEND}
+ test? (
+ dev-ruby/async
+ dev-ruby/test-unit-rr
+ dev-ruby/rr[test]
+ dev-ruby/timecop
+ )
+"
+RDEPEND="${COMMON_DEPEND}"
+
ruby_add_rdepend "
+ dev-ruby/bundler
>=dev-ruby/coolio-1.4.5
>=dev-ruby/http_parser_rb-0.5.1
>=dev-ruby/msgpack-1.3.1
- >=dev-ruby/serverengine-2.0.4
+ >=dev-ruby/serverengine-2.2.5
>=dev-ruby/sigdump-0.2.2
- >=dev-ruby/strptime-0.2.2
+ >=dev-ruby/strptime-0.2.4
>=dev-ruby/tzinfo-1.0
+ =dev-ruby/webrick-1.7*
>=dev-ruby/yajl-ruby-1.0"
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
+ruby_add_depend "test? ( dev-ruby/flexmock )"
all_ruby_prepare() {
sed -i \
diff --git a/app-admin/fluentd/fluentd-1.4.2.ebuild b/app-admin/fluentd/fluentd-1.4.2.ebuild
deleted file mode 100644
index 137927eb85ae..000000000000
--- a/app-admin/fluentd/fluentd-1.4.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem user
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend "
- >=dev-ruby/msgpack-0.7.0
- >=dev-ruby/yajl-ruby-1.0
- >=dev-ruby/coolio-1.4.5
- >=dev-ruby/serverengine-2.0.4
- >=dev-ruby/http_parser_rb-0.5.1
- >=dev-ruby/sigdump-0.2.2
- >=dev-ruby/tzinfo-1.0
- >=dev-ruby/strptime-0.2.2"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-all_ruby_prepare() {
- sed -i \
- -e '/tzinfo-data/d' \
- -e '/dig_rb/d' \
- "${PN}".gemspec || die "'sed failed"
-
- # Avoid test dependency on unpackaged oj
- rm -f test/test_event_time.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
- keepdir /var/log/fluentd
- fowners fluentd:adm /var/log/fluentd
- insinto /etc/fluent
- doins fluent.conf
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "A default configuration file has been installed in"
- elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
- elog "this file to match your configuration."
- fi
-}
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index 1fbe5854b306..effd619d79fe 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>williamh@gentoo.org</email>
- <name>William Hubbs</name>
+ <maintainer type="person" proxied="yes">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
</maintainer>
- <maintainer type="project">
- <email>ruby@gentoo.org</email>
- <name>Gentoo Ruby Project</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
Fluentd is an open source data collector which lets you unify