Merge pull request #902 from Mic92/joerg-ci

flake.lock: Update
Mic92 · Sep 18, 2023 · a583357 · a583357
2 parents 54cbb12 + df7b60a
commit a583357
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/devshell/flake-module.nix b/devshell/flake-module.nix
@@ -26,7 +26,6 @@
               pkgs.python3.pkgs.invoke
             ];
           };
-          "nixos/eve/modules/buildbot" = { };
           "nixos/eva/modules/prometheus" = { };
           "openwrt" = { };
           "home-manager/modules/neovim" = {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -43,9 +43,10 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-    buildbot-nix.url = "github:Mic92/buildbot-nix";
+    buildbot-nix.url = "github:Mic92/buildbot-nix/cleanups";
     buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
     buildbot-nix.inputs.flake-parts.follows = "flake-parts";
+    buildbot-nix.inputs.treefmt-nix.follows = "treefmt-nix";
 
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/nixos/eva/modules/prometheus/rules.nix b/nixos/eva/modules/prometheus/rules.nix
@@ -55,11 +55,8 @@
           annotations.description = "{{$labels.instance}}: gitea instances error rate went up: {{$value}} errors in 5 minutes";
         };
 
-        Uptime = lib.mkForce {
-          # too scared to upgrade matchbox
-          expr = ''system_uptime {host!="matchbox"} > 2592000'';
-          annotations.description = "Uptime monster: {{$labels.host}} has been up for more than 30 days";
-        };
+        # too scared to upgrade matchbox
+        Uptime.expr = lib.mkForce ''system_uptime {host!="matchbox"} > 2592000'';
 
         PublicRunnerActionOnline = {
           expr = ''count(http_busy{name=~"runner.*", status="online"}) < 2'';