Merge pull request #206252 from infinisil/init/fluentd-plugin-concat (aaea1aae) · Commits · nix / nixpkgs

pkgs/tools/misc/fluentd/Gemfile

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,4 @@ gem 'fluent-plugin-mongo'
		gem 'fluent-plugin-webhdfs'
		gem 'fluent-plugin-rewrite-tag-filter'
		gem 'fluent-plugin-cloudwatch-logs'
		gem 'fluent-plugin-concat'

pkgs/tools/misc/fluentd/Gemfile.lock

+20 −17

Original line number	Diff line number	Diff line
		@@ -4,29 +4,29 @@ GEM
		addressable (2.8.1)
		public_suffix (>= 2.0.2, < 6.0)
		aws-eventstream (1.2.0)
		aws-partitions (1.661.0)
		aws-sdk-cloudwatchlogs (1.56.0)
		aws-partitions (1.677.0)
		aws-sdk-cloudwatchlogs (1.58.0)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sigv4 (~> 1.1)
		aws-sdk-core (3.167.0)
		aws-sdk-core (3.168.4)
		aws-eventstream (~> 1, >= 1.0.2)
		aws-partitions (~> 1, >= 1.651.0)
		aws-sigv4 (~> 1.5)
		jmespath (~> 1, >= 1.6.1)
		aws-sdk-firehose (1.49.0)
		aws-sdk-firehose (1.50.0)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sigv4 (~> 1.1)
		aws-sdk-kinesis (1.42.0)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sigv4 (~> 1.1)
		aws-sdk-kms (1.59.0)
		aws-sdk-kms (1.61.0)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sigv4 (~> 1.1)
		aws-sdk-s3 (1.117.1)
		aws-sdk-s3 (1.117.2)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sdk-kms (~> 1)
		aws-sigv4 (~> 1.4)
		aws-sdk-sqs (1.52.0)
		aws-sdk-sqs (1.52.1)
		aws-sdk-core (~> 3, >= 3.165.0)
		aws-sigv4 (~> 1.1)
		aws-sigv4 (1.5.2)
		@@ -39,12 +39,12 @@ GEM
		elastic-transport (8.1.0)
		faraday (< 3)
		multi_json
		elasticsearch (8.5.1)
		elasticsearch (8.5.2)
		elastic-transport (~> 8)
		elasticsearch-api (= 8.5.1)
		elasticsearch-api (8.5.1)
		elasticsearch-api (= 8.5.2)
		elasticsearch-api (8.5.2)
		multi_json
		excon (0.94.0)
		excon (0.95.0)
		faraday (1.10.2)
		faraday-em_http (~> 1.0)
		faraday-em_synchrony (~> 1.0)
		@@ -73,6 +73,8 @@ GEM
		fluent-plugin-cloudwatch-logs (0.14.3)
		aws-sdk-cloudwatchlogs (~> 1.0)
		fluentd (>= 1.8.0)
		fluent-plugin-concat (2.5.0)
		fluentd (>= 0.14.0, < 2)
		fluent-plugin-elasticsearch (5.2.4)
		elasticsearch
		excon
		@@ -114,16 +116,16 @@ GEM
		tzinfo-data (~> 1.0)
		webrick (>= 1.4.2, < 1.8.0)
		yajl-ruby (~> 1.0)
		google-protobuf (3.21.9)
		google-protobuf (3.21.12)
		http_parser.rb (0.8.0)
		jmespath (1.6.1)
		jmespath (1.6.2)
		ltsv (0.1.2)
		mongo (2.18.1)
		mongo (2.18.2)
		bson (>= 4.14.1, < 5.0.0)
		msgpack (1.6.0)
		multi_json (1.15.0)
		multipart-post (2.2.3)
		public_suffix (5.0.0)
		public_suffix (5.0.1)
		rake (13.0.6)
		ruby-kafka (1.5.0)
		digest-crc
		@@ -134,7 +136,7 @@ GEM
		strptime (0.2.5)
		tzinfo (2.0.5)
		concurrent-ruby (~> 1.0)
		tzinfo-data (1.2022.6)
		tzinfo-data (1.2022.7)
		tzinfo (>= 1.0.0)
		webhdfs (0.10.2)
		addressable
		@@ -146,6 +148,7 @@ PLATFORMS

		DEPENDENCIES
		fluent-plugin-cloudwatch-logs
		fluent-plugin-concat
		fluent-plugin-elasticsearch
		fluent-plugin-kafka
		fluent-plugin-kinesis
		@@ -157,4 +160,4 @@ DEPENDENCIES
		fluentd

		BUNDLED WITH
		2.3.24
		2.3.26

pkgs/tools/misc/fluentd/default.nix

+2 −1

Original line number	Diff line number	Diff line
		{ lib, bundlerEnv, ruby, bundlerUpdateScript }:
		{ lib, bundlerEnv, ruby, bundlerUpdateScript, nixosTests }:

		bundlerEnv {
		inherit ruby;
		@@ -7,6 +7,7 @@ bundlerEnv {
		gemdir = ./.;

		passthru.updateScript = bundlerUpdateScript "fluentd";
		passthru.tests.fluentd = nixosTests.fluentd;

		meta = with lib; {
		description = "A data collector";

pkgs/tools/misc/fluentd/gemset.nix

+41 −30

Original line number	Diff line number	Diff line
		@@ -25,10 +25,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "15bw7jm2n7kxjz65amg9s837zlxsf98fn6wf6x20ngz1x4i8n0j6";
		sha256 = "1c6w07lm5ssn0v06sh90g3swqb42ma65pfz0qlk3hqlj1fs5zd9b";
		type = "gem";
		};
		version = "1.661.0";
		version = "1.677.0";
		};
		aws-sdk-cloudwatchlogs = {
		dependencies = ["aws-sdk-core" "aws-sigv4"];
		@@ -36,10 +36,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1iy8r65hwqlqaifhv7yxwapizrf02ch800xl90i9vg9293p5545w";
		sha256 = "0yhwbr3g9brh7g8vjxygfvhlc9sa04g5bzyhkdcdkl7faqpy93z3";
		type = "gem";
		};
		version = "1.56.0";
		version = "1.58.0";
		};
		aws-sdk-core = {
		dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
		@@ -47,10 +47,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "095nj7sf8914y60m1grnpy7cm6ybnw4ywnc0j84gz2vgv1m8awfk";
		sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc";
		type = "gem";
		};
		version = "3.167.0";
		version = "3.168.4";
		};
		aws-sdk-firehose = {
		dependencies = ["aws-sdk-core" "aws-sigv4"];
		@@ -58,10 +58,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0vhrld6gpa8idw51qfpvy2d624jbwmvickpfr8bnb4a5b06im80a";
		sha256 = "02lznpqdmla1i5ilxn6kkbdwasl2w4m9ml09whig9wwrlwjfkdnm";
		type = "gem";
		};
		version = "1.49.0";
		version = "1.50.0";
		};
		aws-sdk-kinesis = {
		dependencies = ["aws-sdk-core" "aws-sigv4"];
		@@ -80,10 +80,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0lq1f03gy02f8z5fpc61kngkja8kkgk2m8cc6g42aij0iszjw03c";
		sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy";
		type = "gem";
		};
		version = "1.59.0";
		version = "1.61.0";
		};
		aws-sdk-s3 = {
		dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
		@@ -91,10 +91,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "17ah9j82313ynb8nkcbq21fa3dy1a3v6lk5kdrhphazbpb2xmxkn";
		sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91";
		type = "gem";
		};
		version = "1.117.1";
		version = "1.117.2";
		};
		aws-sdk-sqs = {
		dependencies = ["aws-sdk-core" "aws-sigv4"];
		@@ -102,10 +102,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1jf878ncdkxz3z507pa2fl47h2a9yvi01cx2pg3camqmal1nd1x7";
		sha256 = "1hirj20g7nnyf0xhxwvgfl12nypm1r5id16ccc8y1rbasclxs897";
		type = "gem";
		};
		version = "1.52.0";
		version = "1.52.1";
		};
		aws-sigv4 = {
		dependencies = ["aws-eventstream"];
		@@ -176,10 +176,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "19jbvm6rzm19vzd3d83icchs0l4qgh7kp3cfi4pd2lcfiy635qil";
		sha256 = "0mwrf667p3n0xdashlk3m66a7vcqsg4vnr5icm7jgdd71qr4yvds";
		type = "gem";
		};
		version = "8.5.1";
		version = "8.5.2";
		};
		elasticsearch-api = {
		dependencies = ["multi_json"];
		@@ -187,20 +187,20 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "00b6lhfs4r9jp3dkphly9qqyyrd7sx4s1186kcjf8zhsxyq0m310";
		sha256 = "138s5rcy5j63sjf6k8av8gaxn46nh8nf1bwxyxfygyy3q2q9m4vs";
		type = "gem";
		};
		version = "8.5.1";
		version = "8.5.2";
		};
		excon = {
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "094kbi32i56p08348b95amg9dz5c9prn5jywhkcghsd3d6kll981";
		sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby";
		type = "gem";
		};
		version = "0.94.0";
		version = "0.95.0";
		};
		faraday = {
		dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
		@@ -336,6 +336,17 @@
		};
		version = "0.14.3";
		};
		fluent-plugin-concat = {
		dependencies = ["fluentd"];
		groups = ["default"];
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1b9z6hrjcsvccfimmgczzcbhvf2zwyqzvsdc29i2biqhk1mcwn3k";
		type = "gem";
		};
		version = "2.5.0";
		};
		fluent-plugin-elasticsearch = {
		dependencies = ["elasticsearch" "excon" "faraday" "fluentd"];
		groups = ["default"];
		@@ -440,10 +451,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1p4aa5nnkkrdd3v3i57092vj2agj7ih3zavymw451j52k8anqras";
		sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab";
		type = "gem";
		};
		version = "3.21.9";
		version = "3.21.12";
		};
		"http_parser.rb" = {
		groups = ["default"];
		@@ -460,10 +471,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
		sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
		type = "gem";
		};
		version = "1.6.1";
		version = "1.6.2";
		};
		ltsv = {
		groups = ["default"];
		@@ -481,10 +492,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "16dzacmhz4g4n4kmw9qfg7hjh4xj71rzb7nd7n8vl1788x9h3sp5";
		sha256 = "1ldpcyqhgvdn7rd1vdbv2n3xnr6ajw7964yb9gr44nv7z35fd7kn";
		type = "gem";
		};
		version = "2.18.1";
		version = "2.18.2";
		};
		msgpack = {
		groups = ["default"];
		@@ -521,10 +532,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
		sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
		type = "gem";
		};
		version = "5.0.0";
		version = "5.0.1";
		};
		rake = {
		groups = ["default"];
		@@ -605,10 +616,10 @@
		platforms = [];
		source = {
		remotes = ["https://rubygems.org"];
		sha256 = "0dpwi70x9jrpvc7p103ci0kppam79wqqrskq9n39r3jrp4b4j27w";
		sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp";
		type = "gem";
		};
		version = "1.2022.6";
		version = "1.2022.7";
		};
		webhdfs = {
		dependencies = ["addressable"];

Admin message