cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vector: 0.28.1 -> 0.29.1

Browse source
This commit is contained in:
happysalada 2023-04-23 19:53:51 -04:00 committed by Yt
parent 6af56a90ad
commit 2909d9b117
3 changed files with 1180 additions and 906 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/logging/vector.nix
View file

@ -26,13 +26,9 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
# for cli usage
environment.systemPackages = [ pkgs.vector ];
users.groups.vector = { };
users.users.vector = {
description = "Vector service user";
group = "vector";
isSystemUser = true;
};
systemd.services.vector = { systemd.services.vector = {
description = "Vector event and log aggregator"; description = "Vector event and log aggregator";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -52,8 +48,7 @@ in
in in
{ {
ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";
User = "vector"; DynamicUser = true;
Group = "vector";
Restart = "no"; Restart = "no";
StateDirectory = "vector"; StateDirectory = "vector";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

2060
pkgs/tools/misc/vector/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

15
pkgs/tools/misc/vector/default.nix
View file

@ -17,6 +17,7 @@
, tzdata , tzdata
, cmake , cmake
, perl , perl
, git
# nix has a problem with the `?` in the feature list # nix has a problem with the `?` in the feature list
# enabling kafka will produce a vector with no features at all # enabling kafka will produce a vector with no features at all
, enableKafka ? false , enableKafka ? false
@ -33,7 +34,7 @@
let let
pname = "vector"; pname = "vector";
version = "0.28.1"; version = "0.29.1";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
inherit pname version; inherit pname version;
@ -42,20 +43,22 @@ rustPlatform.buildRustPackage {
owner = "vectordotdev"; owner = "vectordotdev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-hBEw5sAxex4o/b1nr60dEwZs7nosXU7pUChT1VoI25k="; sha256 = "sha256-4WqO7i1xthUU2bTzaS5poTh+wemjvqNAUFIDN73f7kw=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"azure_core-0.5.0" = "sha256-fojO7dhntpymMjV58TtYb7N4UN6rOp30D54x09RDXfQ="; "azure_core-0.5.0" = "sha256-fojO7dhntpymMjV58TtYb7N4UN6rOp30D54x09RDXfQ=";
"chrono-0.4.22" = "sha256-c5xHLte0+NpM+UUHEwxu2qdBFUBw62YN9vNkD12llwI="; "chrono-0.4.24" = "sha256-SVPRfixSt0m14MmOcmBVseC/moj1DIA3B+m0pvT41K0=";
"datadog-filter-0.1.0" = "sha256-CNAIoDyJJo+D2Qzt6Fb2FwpQpzX02XurT8j1gHkz1bE=";
"heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo="; "heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo=";
"nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg=";
"tokio-util-0.7.4" = "sha256-rAzj44O+GOZhG+o6FVN5qCcG/NWxW8fUpScm+xsRjIs="; "tokio-util-0.7.4" = "sha256-rAzj44O+GOZhG+o6FVN5qCcG/NWxW8fUpScm+xsRjIs=";
"tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M="; "tracing-0.2.0" = "sha256-YAxeEofFA43PX2hafh3RY+C81a2v6n1fGzYz2FycC3M=";
}; };
}; };
nativeBuildInputs = [ pkg-config cmake perl ]; nativeBuildInputs = [ pkg-config cmake perl git ];
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
@ -106,10 +109,6 @@ rustPlatform.buildRustPackage {
postPatch = '' postPatch = ''
substituteInPlace ./src/dns.rs \ substituteInPlace ./src/dns.rs \
--replace "#[tokio::test]" "" --replace "#[tokio::test]" ""
${lib.optionalString (!builtins.elem "transforms-geoip" features) ''
substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""
''}
''; '';
passthru = { passthru = {