diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index dff338073..6c5c50881 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.8.1
+PLUGIN_VERSION=		1.8.2
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr
index 4765e48ad..5dd3e3a58 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -11,6 +11,10 @@ Kafka, MQTT, NSQ, and many others.
 Plugin Changelog
 ================
 
+1.8.2
+
+* Add 'ntpq' input
+
 1.8.1
 
 * Fix 'flush interval' templating by @Jontron123
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 a17f02e64..2e1f41a09 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
@@ -111,4 +111,16 @@
         <type>checkbox</type>
         <help>Enable the collection of ZFS statistics.</help>
     </field>
+    <field>
+        <id>input.ntpq</id>
+        <label>NTPQ</label>
+        <type>checkbox</type>
+        <help>Enable the collection of NTP query metrics.</help>
+    </field>
+    <field>
+        <id>input.ntpq_dns_lookup</id>
+        <label>NTPQ DNS Lookup</label>
+        <type>checkbox</type>
+        <help>Can increase metric gather times.</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 b2860ed04..4dd827965 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.2</version>
+    <version>1.0.3</version>
     <items>
         <cpu type="BooleanField">
             <default>1</default>
@@ -74,5 +74,13 @@
             <default>0</default>
             <Required>N</Required>
         </zfs>
+        <ntpq type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </ntpq>
+        <ntpq_dns_lookup type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </ntpq_dns_lookup>
     </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 84f994bc4..f9396633e 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
@@ -224,4 +224,13 @@
   poolMetrics = true
 {% endif %}
 
+{% if helpers.exists('OPNsense.telegraf.input.ntpq') and OPNsense.telegraf.input.ntpq == '1' %}
+[[inputs.ntpq]]
+{%   if helpers.exists('OPNsense.telegraf.input.ntpq_dns_lookup') and OPNsense.telegraf.input.ntpq_dns_lookup == '1' %}
+  dns_lookup = true
+{%   else %}
+  dns_lookup = false
+{%   endif %}
+{% endif %}
+
 {% endif %}