From a186a30eb30a15165981d19ce80338f5589132a1 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 30 Apr 2022 23:31:54 +0200
Subject: [PATCH] Use zpool_influxdb instead of disk for zfs monitoring with
 telegraf

---
 machines/kharbranth/default.nix        | 2 +-
 machines/kholinar/default.nix          | 2 +-
 machines/lasting-integrity/default.nix | 2 +-
 machines/urithiru/default.nix          | 2 +-
 modules/base/telegraf/default.nix      | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index 551b44b8..0921114e 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -47,5 +47,5 @@
     work.enable = true;
   };
 
-  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/" "/boot" ];
+  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/boot" ];
 }
diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index 19e8b358..46b5390e 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -50,5 +50,5 @@
     work.enable = true;
   };
 
-  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/" "/boot" ];
+  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/boot" ];
 }
diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix
index 6d9edc78..9ed89896 100644
--- a/machines/lasting-integrity/default.nix
+++ b/machines/lasting-integrity/default.nix
@@ -112,5 +112,5 @@
     };
   };
   programs.msmtp.enable = false;
-  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/" "/boot/ESP0" "/boot/ESP1" "/srv/data" ];
+  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/boot/ESP0" "/boot/ESP1" ];
 }
diff --git a/machines/urithiru/default.nix b/machines/urithiru/default.nix
index 2cefea52..bba260b5 100644
--- a/machines/urithiru/default.nix
+++ b/machines/urithiru/default.nix
@@ -56,5 +56,5 @@
     };
   };
 
-  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/" "/boot/ESP0" "/boot/ESP1" "/srv/data" ];
+  services.telegraf.extraConfig.inputs.disk.mount_points = [ "/boot/ESP0" "/boot/ESP1" ];
 }
diff --git a/modules/base/telegraf/default.nix b/modules/base/telegraf/default.nix
index 89f7adb9..2b6238d4 100644
--- a/modules/base/telegraf/default.nix
+++ b/modules/base/telegraf/default.nix
@@ -29,6 +29,11 @@
           report_active = false;
         };
         diskio = { };
+        exec = {
+          commands = [ "${pkgs.zfs}/libexec/zfs/zpool_influxdb" ];
+          timeout = "5s";
+          data_format = "influx";
+        };
         kernel = { };
         mem = { };
         processes = { };