promtail: move alongside grafana-loki

2 years ago · de25676c9f
parent 8ff7b290e6
commit de25676c9f
2 changed files with 8 additions and 6 deletions
--- a/pkgs/servers/monitoring/loki/promtail.nix
+++ 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;
+})
--- 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 { };