pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #129890 from flokli/grafana-agent-0.16.1

grafana-agent: 0.15.0 -> 0.16.1

authored by

Maximilian Bosch and committed by
GitHub b2c82b44 f899fd3c

+23 -3
unified split
+8 -3
pkgs/servers/monitoring/grafana-agent/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "grafana-agent"; 5 - version = "0.15.0"; 5 + version = "0.16.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 rev = "v${version}"; 9 9 owner = "grafana"; 10 10 repo = "agent"; 11 - sha256 = "sha256-mRDd9G/VMbDwp/GYPoUE0v9j+BmUd08wOMJjgcg2qdo="; 11 + sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5"; 12 12 }; 13 13 14 - vendorSha256 = "sha256-sQFWdBOjfYb1e7ZzHGgtgnuEQCU4xnkJTyzC/9DRcYs="; 14 + vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph"; 15 + 16 + patches = [ 17 + # https://github.com/grafana/agent/issues/731 18 + ./skip_test_requiring_network.patch 19 + ]; 15 20 16 21 # uses go-systemd, which uses libsystemd headers 17 22 # https://github.com/coreos/go-systemd/issues/351
+15
pkgs/servers/monitoring/grafana-agent/skip_test_requiring_network.patch
··· 1 + diff --git a/pkg/operator/selector_eventhandler_test.go b/pkg/operator/selector_eventhandler_test.go 2 + index 7b6ec602..e79bae0e 100644 3 + --- a/pkg/operator/selector_eventhandler_test.go 4 + +++ b/pkg/operator/selector_eventhandler_test.go 5 + @@ -39,6 +39,10 @@ var ( 6 + // TestEnqueueRequestForSelector creates an example Kubenretes cluster and runs 7 + // EnqueueRequestForSelector to validate it works. 8 + func TestEnqueueRequestForSelector(t *testing.T) { 9 + + // Requires network access, which is not available during 10 + + // the nixpkgs sandboxed build 11 + + t.Skip() 12 + + 13 + l := log.NewNopLogger() 14 + 15 + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)