Merge branch 'fc-21.11-dev' into fc-21.11-staging

flyingcircusio · Jun 2, 2022 · 0524a52 · 0524a52
2 parents e1a085b + 8e582fb
commit 0524a52
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/nixos/roles/elasticsearch.nix b/nixos/roles/elasticsearch.nix
@@ -172,6 +172,14 @@ in
       '');
     };
 
+    flyingcircus.services.sensu-client = {
+      expectedDiskCapacity = {
+        # same as https://www.elastic.co/guide/en/elasticsearch/reference/7.17/modules-cluster.html#disk-based-shard-allocation
+        warning = 85;
+        critical = 90;
+      };
+    };
+
     systemd.services.elasticsearch = {
       startLimitIntervalSec = 480;
       startLimitBurst = 3;

diff --git a/versions.json b/versions.json
@@ -2,8 +2,8 @@
   "nixpkgs": {
     "owner": "flyingcircusio",
     "repo": "nixpkgs",
-    "rev": "45595e44034670ebfd06c9a62f63170be974f354",
-    "sha256": "t6niQHCGIpsfbdsWgfhou6q32BDn63zLDGmbB2wWcSk="
+    "rev": "397669babd51cebd19b07e3f70fd4b6960f0fb1a",
+    "sha256": "laJBzNX07O8YPEvcJGWGD3pDttOmnG6AqZQFVbsO3Xc="
   },
   "nixos-mailserver": {
     "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/",