Merge pull request #1015 from morucci/monitoring-flakes-shell

Remove prometheus and grafana from default shell

flake.nix

@@ -17,15 +17,16 @@
 
   nixConfig = {
     extra-substituters = "https://change-metrics.cachix.org";
-    extra-trusted-public-keys = "change-metrics.cachix.org-1:dCe8jx9vptiF6DCdZ5y2QouvDsxgFRZnbHowhPnS4C0=";
+    extra-trusted-public-keys =
+      "change-metrics.cachix.org-1:dCe8jx9vptiF6DCdZ5y2QouvDsxgFRZnbHowhPnS4C0=";
   };
 
   inputs = {
     nixpkgs.url =
       "github:NixOS/nixpkgs/ed014c27f4d0ca772fb57d3b8985b772b0503bbd";
     hspkgs.url =
       "github:podenv/hspkgs/4a25962c7beede6cfcacc66000ef783e5c98e483";
-      # "path:/srv/github.com/podenv/hspkgs";
+    # "path:/srv/github.com/podenv/hspkgs";
   };
 
   outputs = { self, nixpkgs, hspkgs }:
@@ -38,14 +39,21 @@
     in {
       devShell."x86_64-linux" = legacy.shell;
       devShells."x86_64-linux".ci = legacy.ci-shell;
+      devShells."x86_64-linux".monitoring = legacy.monitoring-shell;
       packages."x86_64-linux".default = legacy.monocle-exe;
       packages."x86_64-linux".env = legacy.monocle-light.env;
       packages."x86_64-linux".containerMonocle = legacy.containerMonocle;
-      packages."x86_64-linux".containerGrafana = legacy.containerGrafana;
-      packages."x86_64-linux".containerPrometheus = legacy.containerPrometheus;
       apps."x86_64-linux".default = {
         type = "app";
         program = "${legacy.monocle-exe}/bin/monocle";
       };
+      apps."x86_64-linux".prometheus = {
+        type = "app";
+        program = "${legacy.promStart}/bin/prometheus-start";
+      };
+      apps."x86_64-linux".grafana = {
+        type = "app";
+        program = "${legacy.grafanaStart}/bin/grafana-start";
+      };
     };
 }

nix/default.nix

@@ -135,7 +135,7 @@ in rec {
                 - CRAWLER_TARGET
     '';
   };
-  prom-home = "/var/lib/prometheus";
+  prom-home = "~/.local/share/monocle/prometheus-home";
   promStart = pkgs.writeScriptBin "prometheus-start" ''
     ${headers}
 
@@ -165,7 +165,7 @@ in rec {
     };
   };
 
-  grafana-home = "/var/lib/grafana";
+  grafana-home = "~/.local/share/monocle/grafana-home";
   grafanaPromDS = pkgs.writeTextFile {
     name = "prometheus.yml";
     text = ''
@@ -302,14 +302,8 @@ in rec {
     exec ${pkgs.nodejs}/bin/npm start
   '';
 
-  services-req = [
-    elasticsearchStart
-    promStart
-    grafanaStart
-    monocleReplStart
-    monocleWebStart
-    monocleGhcid
-  ];
+  services-req =
+    [ elasticsearchStart monocleReplStart monocleWebStart monocleGhcid ];
 
   # define the base requirements
   base-req = [ pkgs.bashInteractive hspkgs.coreutils pkgs.gnumake ];