test: vault-snapshot-fix bitte branch, patroni-metrics cell branch

johnalotoski · johnalotoski · commit b0ab6ad362a0 · 2022-07-19T21:49:36.000-05:00
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,11 +5,12 @@
     n2c.url = "github:nlewo/nix2container";
     data-merge.url = "github:divnix/data-merge";
     # --- Bitte Stack ----------------------------------------------
-    bitte.url = "github:input-output-hk/bitte/nomad132-pkg";
-    # bitte.url = "path:/home/jlotoski/work/iohk/bitte-wt/dockerd-pkg";
+    # bitte.url = "github:input-output-hk/bitte/nomad132-pkg";
+    # bitte.url = "github:input-output-hk/bitte/dockerd-pkg";
+    bitte.url = "path:/home/jlotoski/work/iohk/bitte-wt/vault-snap-fix";
     # bitte.url = "path:/home/manveru/github/input-output-hk/bitte";
-    bitte-cells.url = "github:input-output-hk/bitte-cells";
-    # bitte-cells.url = "path:/home/jlotoski/work/iohk/bitte-cells-wt/monitoring-update";
+    bitte-cells.url = "github:input-output-hk/bitte-cells/patroni-metrics";
+    # bitte-cells.url = "path:/home/jlotoski/work/iohk/bitte-cells-wt/patroni-metrics";
     bitte.inputs.nomad-driver-nix.follows = "nomad-driver-nix";
     # --------------------------------------------------------------
     # --- Auxiliary Nixpkgs ----------------------------------------
diff --git a/nix/cloud/hydrationProfile.nix b/nix/cloud/hydrationProfile.nix
@@ -217,6 +217,11 @@ in {
             bitte-vm-standalone
             bitte-vmagent
             ;
+
+          inherit
+            (inputs.bitte-cells.patroni.alerts)
+            bitte-cells-patroni
+            ;
         }
         # Dashboard attrset
         {
@@ -241,6 +246,11 @@ in {
             bitte-vm
             bitte-vulnix
             ;
+
+          inherit
+            (inputs.bitte-cells.patroni.dashboards)
+            bitte-cells-patroni
+            ;
         };
     };
 
diff --git a/nix/cloud/nomadEnvs/default.nix b/nix/cloud/nomadEnvs/default.nix
@@ -26,6 +26,7 @@ in {
           attribute = "\${attr.platform.aws.placement.availability-zone}";
         }
       ];
+      job.database.update.min_healthy_time = "2m";
       job.database.group.database.task.patroni.resources = {inherit (patroniMods.resources) cpu memory;};
       job.database.group.database.task.patroni.env = {inherit WALG_S3_PREFIX;};
       job.database.group.database.task.backup-walg.env = {inherit WALG_S3_PREFIX;};

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,11 @@ in {`
`217`	`217`	`bitte-vm-standalone`
`218`	`218`	`bitte-vmagent`
`219`	`219`	`;`
	`220`	`+`
	`221`	`+ inherit`
	`222`	`+ (inputs.bitte-cells.patroni.alerts)`
	`223`	`+ bitte-cells-patroni`
	`224`	`+ ;`
`220`	`225`	`}`
`221`	`226`	`# Dashboard attrset`
`222`	`227`	`{`
`@@ -241,6 +246,11 @@ in {`
`241`	`246`	`bitte-vm`
`242`	`247`	`bitte-vulnix`
`243`	`248`	`;`
	`249`	`+`
	`250`	`+ inherit`
	`251`	`+ (inputs.bitte-cells.patroni.dashboards)`
	`252`	`+ bitte-cells-patroni`
	`253`	`+ ;`
`244`	`254`	`};`
`245`	`255`	`};`
`246`	`256`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ in {`
`26`	`26`	`attribute = "\${attr.platform.aws.placement.availability-zone}";`
`27`	`27`	`}`
`28`	`28`	`];`
	`29`	`+ job.database.update.min_healthy_time = "2m";`
`29`	`30`	`job.database.group.database.task.patroni.resources = {inherit (patroniMods.resources) cpu memory;};`
`30`	`31`	`job.database.group.database.task.patroni.env = {inherit WALG_S3_PREFIX;};`
`31`	`32`	`job.database.group.database.task.backup-walg.env = {inherit WALG_S3_PREFIX;};`