From de25676c9f0954c9fdbb703cdb9326af9301ad50 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 9 Oct 2022 15:43:34 +1000 Subject: [PATCH] promtail: move alongside grafana-loki --- pkgs/servers/monitoring/loki/promtail.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/monitoring/loki/promtail.nix diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/servers/monitoring/loki/promtail.nix new file mode 100644 index 00000000000..e8539ee60a3 --- /dev/null +++ b/pkgs/servers/monitoring/loki/promtail.nix @@ -0,0 +1,7 @@ +{ lib, grafana-loki }: + +grafana-loki.overrideAttrs (o: { + pname = "promtail"; + subPackages = ["clients/cmd/promtail"]; + CGO_ENABLED = 1; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 547ca93ef8d..b51c0bbbe3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23219,15 +23219,10 @@ with pkgs; grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-loki = callPackage ../servers/monitoring/loki { }; + promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; - promtail = grafana-loki.overrideAttrs (o: { - pname = "promtail"; - subPackages = ["clients/cmd/promtail"]; - CGO_ENABLED = 1; - }); - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };