From 7f277620542e681f487103a6ff3ac087c947b2ac Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Tue, 29 Jun 2021 15:18:31 +0200
Subject: [PATCH] bundles/zfs: report *used*, not free storage space

---
 bundles/grafana/dashboard-rows/zfs.py  | 8 ++++----
 bundles/zfs/files/telegraf-per-dataset | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bundles/grafana/dashboard-rows/zfs.py b/bundles/grafana/dashboard-rows/zfs.py
index ab1b1c8..654de36 100644
--- a/bundles/grafana/dashboard-rows/zfs.py
+++ b/bundles/grafana/dashboard-rows/zfs.py
@@ -541,7 +541,7 @@ def dashboard_row_zfs(panel_id, node):
         r["host"] == "{node.name}"
     )
     |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)
-    |> yield(name: "out")""",
+    |> yield(name: "usedsnap")""",
                         'resultFormat': 'time_series',
                         'select': [[
                             {'type': 'field', 'params': ['value']},
@@ -644,11 +644,11 @@ def dashboard_row_zfs(panel_id, node):
     |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
     |> filter(fn: (r) =>
         r["_measurement"] == "zfs_pool" and
-        r["_field"] == "free" and
+        r["_field"] == "used" and
         r["host"] == "{node.name}"
     )
     |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)
-    |> yield(name: "in")""",
+    |> yield(name: "used")""",
                         'resultFormat': 'time_series',
                         'select': [[
                             {'type': 'field', 'params': ['value']},
@@ -671,7 +671,7 @@ def dashboard_row_zfs(panel_id, node):
         r["host"] == "{node.name}"
     )
     |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)
-    |> yield(name: "out")""",
+    |> yield(name: "size")""",
                         'resultFormat': 'time_series',
                         'select': [[
                             {'type': 'field', 'params': ['value']},
diff --git a/bundles/zfs/files/telegraf-per-dataset b/bundles/zfs/files/telegraf-per-dataset
index 44897de..b67949a 100644
--- a/bundles/zfs/files/telegraf-per-dataset
+++ b/bundles/zfs/files/telegraf-per-dataset
@@ -3,7 +3,7 @@
 from subprocess import check_output
 
 pools = check_output(
-    ['/usr/sbin/zpool', 'list', '-Hpo', 'name,free,size'],
+    ['/usr/sbin/zpool', 'list', '-Hpo', 'name,allocated,size'],
     env={
         'LC_ALL': 'C',
     },
@@ -18,14 +18,14 @@ datasets = check_output(
 
 zpools = {}
 for line in pools.splitlines():
-    name, free, total = line.split()
+    name, used, total = line.split()
 
     zpools[name] = {
-        'free': free,
+        'used': used,
         'total': total,
     }
 
-    print('zfs_pool,pool={} size={}i,free={}i'.format(name, total, free))
+    print('zfs_pool,pool={} size={}i,used={}i'.format(name, total, used))
 
 for line in datasets.splitlines():
     name, used, usedsnap, compressratio = line.split()