b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

grafana-agent: 0.25.1 -> 0.28.0

Browse source
This commit is contained in:
Jörg Thalheim 2022-11-02 12:03:49 +01:00
parent 3c86c4cea7
commit b1daddccf7
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/servers/monitoring/grafana-agent/default.nix
View file

@ -1,27 +1,46 @@
{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests }:
{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests, bcc }:
buildGoModule rec {
pname = "grafana-agent";
version = "0.25.1";
version = "0.28.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "agent";
sha256 = "sha256-VbcWYH3eSKfYlSoN9HpxvhtvW36M1aYn9nLDfEbIzTY=";
sha256 = "sha256-UuDRnpb9JpghGDFsrlU7+iMboqiWVyT7qFSSPlLSFGs=";
};
vendorSha256 = "sha256-VFTz9+nf4qH8bbFijpT1uIHSAhJy/aMMlIjkvnzzAD4=";
vendorSha256 = "sha256-UEQYZbP3dzi7wZwX+InJrgHrFB1wfSUNmUMkit+Y1Lo=";
ldflags = let
prefix = "github.com/grafana/agent/pkg/build";
in [
"-s" "-w"
# https://github.com/grafana/agent/blob/d672eba4ca8cb010ad8a9caef4f8b66ea6ee3ef2/Makefile#L125
"-X ${prefix}.Version=${version}"
"-X ${prefix}.Branch=v${version}"
"-X ${prefix}.Revision=v${version}"
"-X ${prefix}.BuildUser=nix"
"-X ${prefix}.BuildDate=1980-01-01T00:00:00Z"
];
tags = [
"nonetwork"
"nodocker"
];
subPackages = [
"cmd/agent"
"cmd/agentctl"
];
# uses go-systemd, which uses libsystemd headers
# https://github.com/coreos/go-systemd/issues/351
NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ];
buildInputs = [ bcc ];
# tries to access /sys: https://github.com/grafana/agent/issues/333
preBuild = ''
rm pkg/integrations/node_exporter/node_exporter_test.go

4
pkgs/top-level/all-packages.nix
View file

@ -23548,9 +23548,7 @@ with pkgs;
grafana = callPackage ../servers/monitoring/grafana { };
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
grafana-agent = callPackage ../servers/monitoring/grafana-agent {
buildGoModule = buildGo118Module; # tests fail with 1.19
};
grafana-agent = callPackage ../servers/monitoring/grafana-agent {};
grafana-loki = callPackage ../servers/monitoring/loki { };
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };