diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 42539a357..d77f00cc6 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 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 08f99911d..aa708d17d 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
@@ -77,4 +77,18 @@
         <type>checkbox</type>
         <help>Read network interface metrics.</help>
     </field>
+    <field>
+        <id>input.ping</id>
+        <label>Ping</label>
+        <type>checkbox</type>
+        <help>Ping Hosts and measure the metrics.</help>
+    </field>
+    <field>
+        <id>input.ping_hosts</id>
+        <label>Ping Hosts</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help>Set the Hosts to ping in a CSV list.</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 8550731ad..bb3a65eca 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
@@ -55,5 +55,12 @@
             <default>0</default>
             <Required>N</Required>
         </network>
-	</items>
+        <ping type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </ping>
+        <ping_hosts type="CSVListField">
+            <Required>N</Required>
+        </ping_hosts>
+    </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 01eda02e3..d9b96b704 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
@@ -132,4 +132,11 @@
 [[inputs.net]]
 {% endif %}
 
+{% if helpers.exists('OPNsense.telegraf.input.ping') and OPNsense.telegraf.input.ping == '1' %}
+[[inputs.ping]]
+{%   if helpers.exists('OPNsense.telegraf.input.ping_hosts') and OPNsense.telegraf.input.ping_hosts != '' %}
+  urls = [{{ "'" + ("','".join(OPNsense.telegraf.input.ping_hosts.split(','))) + "'" }}]
+{%   endif %}
+{% endif %}
+
 {% endif %}