commit: e379896e502fca4405cbdd01d178212a6840b8bb Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> AuthorDate: Thu Jan 11 14:59:33 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 20 13:30:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e379896e
app-admin/fluentd: drop 1.14.4, 1.14.6 Bug: https://bugs.gentoo.org/879181 Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/34757 Signed-off-by: Sam James <sam <AT> gentoo.org> app-admin/fluentd/Manifest | 2 - app-admin/fluentd/files/fluent.conf | 139 -------------------------------- app-admin/fluentd/fluentd-1.14.4.ebuild | 63 --------------- app-admin/fluentd/fluentd-1.14.6.ebuild | 63 --------------- 4 files changed, 267 deletions(-) diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest index 4125063fc608..030120f0dd95 100644 --- a/app-admin/fluentd/Manifest +++ b/app-admin/fluentd/Manifest @@ -1,3 +1 @@ -DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0 -DIST fluentd-1.14.6.gem 856576 BLAKE2B 1422ab704a4b5eb674885a192ae241aa9ee4ba187ff38c9548435c858712f40b6af028776a8e8c8cd122501463cc910e034b5f0a5815e738f7cfd4d1f0d6026e SHA512 63a4e4a51dd9913d0a3a2ea9cb40794de874ee40256890ebaaef3111cc5a401179abdea1230efc92d962811c2f618591bbc7d8d5139d8851d682818712ba3ea7 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/fluentd-1.14.4.ebuild b/app-admin/fluentd/fluentd-1.14.4.ebuild deleted file mode 100644 index bce8cd6013be..000000000000 --- a/app-admin/fluentd/fluentd-1.14.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby27 ruby30 ruby31" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -inherit ruby-fakegem - -DESCRIPTION="data collector and unified logging layer (project under CNCF)" -HOMEPAGE="https://www.fluentd.org"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND="acct-group/fluentd - acct-user/fluentd" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -ruby_add_rdepend " - >=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/sigdump-0.2.2 - >=dev-ruby/strptime-0.2.2 - >=dev-ruby/tzinfo-1.0 - >=dev-ruby/yajl-ruby-1.0" - -ruby_add_depend "test? ( dev-ruby/flexmock )" - -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/fluentd-1.14.6.ebuild b/app-admin/fluentd/fluentd-1.14.6.ebuild deleted file mode 100644 index 7d47ce990b7d..000000000000 --- a/app-admin/fluentd/fluentd-1.14.6.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -USE_RUBY="ruby31 ruby32" - -inherit ruby-fakegem - -DESCRIPTION="data collector and unified logging layer (project under CNCF)" -HOMEPAGE="https://www.fluentd.org"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -COMMON_DEPEND="acct-group/fluentd - acct-user/fluentd" -DEPEND="${COMMON_DEPEND}" -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.2.5 - >=dev-ruby/sigdump-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" - -ruby_add_depend "test? ( dev-ruby/flexmock )" - -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 -}
