diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index dda18ec0e..0b3fdafc5 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.7.0
+PLUGIN_VERSION=		1.7.1
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
index 5c80739a0..8659d463e 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
@@ -105,4 +105,10 @@
         <type>checkbox</type>
         <help>Enable the collection of HAProxy statistics.</help>
     </field>
+    <field>
+        <id>input.zfs</id>
+        <label>ZFS</label>
+        <type>checkbox</type>
+        <help>Enable the collection of ZFS statistics.</help>
+    </field>
 </form>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
index 04956316d..b2860ed04 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/telegraf/input</mount>
     <description>Telegraf inputs configuration</description>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <items>
         <cpu type="BooleanField">
             <default>1</default>
@@ -70,5 +70,9 @@
             <default>0</default>
             <Required>N</Required>
         </haproxy>
+        <zfs type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </zfs>
     </items>
 </model>
diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
index 3d4575e7a..c45e8bf48 100644
--- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
+++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
@@ -187,4 +187,9 @@
   servers = ["socket:/var/run/haproxy.socket"]
 {% endif %}
 
+{% if helpers.exists('OPNsense.telegraf.input.zfs') and OPNsense.telegraf.input.zfs == '1' %}
+[[inputs.zfs]]
+  poolMetrics = true
+{% endif %}
+
 {% endif %}