diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index c99b624ef..a0f9033a4 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.12.4
+PLUGIN_VERSION=		1.12.5
 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 b7919dd38..39bc8d608 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -12,6 +12,12 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/
 Plugin Changelog
 ================
 
+1.12.5
+
+* Add support for basic HTTP Authentication agains Elasticsearch (contributed by psychogun)
+* Add internet speed input plugin (contributed by rare-magma)
+* Allow to specify ping count (Kacper Michajlow)
+
 1.12.4
 
 * Add 5 second timeout to unbound input
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 7f318d9c2..d33e5e273 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
@@ -49,6 +49,24 @@
         <type>checkbox</type>
         <help>Read metrics about disk IO by device.</help>
     </field>
+    <field>
+        <id>input.internet_speed</id>
+        <label>Internet Speed Test</label>
+        <type>checkbox</type>
+        <help>Enable the collection of data about the internet speed on the system.</help>
+    </field>
+    <field>
+        <id>input.internet_speed_file</id>
+        <label>Internet Speed File Download</label>
+        <type>checkbox</type>
+        <help>Enable the file download speed test.</help>
+    </field>
+    <field>
+        <id>input.internet_speed_interval</id>
+        <label>Interval</label>
+        <type>text</type>
+        <help>Default internet speed test interval in seconds.</help>
+    </field>
     <field>
         <id>input.mem</id>
         <label>Memory</label>
@@ -91,6 +109,12 @@
         <type>checkbox</type>
         <help>Ping Hosts using IPv4 and measure the metrics.</help>
     </field>
+    <field>
+        <id>input.ping_count</id>
+        <label>Ping Count (IPv4)</label>
+        <type>text</type>
+        <help>Number of ping packets to send per interval. Corresponds to the "-c" option of the ping command.</help>
+    </field>
     <field>
         <id>input.ping_hosts</id>
         <label>Ping Hosts (IPv4)</label>
@@ -105,6 +129,12 @@
         <type>checkbox</type>
         <help>Ping Hosts using IPv6 and measure the metrics.</help>
     </field>
+    <field>
+        <id>input.ping6_count</id>
+        <label>Ping Count (IPv6)</label>
+        <type>text</type>
+        <help>Number of ping packets to send per interval. Corresponds to the "-c" option of the ping command.</help>
+    </field>
     <field>
         <id>input.ping6_hosts</id>
         <label>Ping Hosts (IPv6)</label>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
index 0b1c1a6e4..b627fa1e6 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
@@ -143,6 +143,18 @@
         <type>text</type>
         <help>Set the URL where metrics shoud be sent to.</help>
     </field>
+    <field>
+        <id>output.elastic_username</id>
+        <label>Elasticsearch Username</label>
+        <type>text</type>
+        <help>Optional HTTP basic authentication details for Elasticsearch.</help>
+    </field>
+        <field>
+        <id>output.elastic_password</id>
+        <label>Elasticsearch Password</label>
+        <type>text</type>
+        <help>Optional HTTP basic authentication details for Elasticsearch.</help>
+    </field>
     <field>
         <id>output.elastic_timeout</id>
         <label>Timeout</label>
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 3e4f6e85d..f85b74a24 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
@@ -35,6 +35,18 @@
             <default>1</default>
             <Required>N</Required>
         </diskio>
+       <internet_speed type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </internet_speed>
+        <internet_speed_file type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </internet_speed_file>
+        <internet_speed_interval type="IntegerField">
+            <default>360</default>
+            <Required>N</Required>
+        </internet_speed_interval>
         <mem type="BooleanField">
             <default>1</default>
             <Required>N</Required>
@@ -63,6 +75,9 @@
             <default>0</default>
             <Required>N</Required>
         </ping>
+        <ping_count type="IntegerField">
+            <Required>N</Required>
+        </ping_count>
         <ping_hosts type="CSVListField">
             <Required>N</Required>
         </ping_hosts>
@@ -70,6 +85,9 @@
             <default>0</default>
             <Required>N</Required>
         </ping6>
+        <ping6_count type="IntegerField">
+            <Required>N</Required>
+        </ping6_count>
         <ping6_hosts type="CSVListField">
             <Required>N</Required>
         </ping6_hosts>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
index 7e7bdb805..404bd8ddf 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
@@ -70,6 +70,12 @@
         <elastic_url type="TextField">
             <Required>N</Required>
         </elastic_url>
+        <elastic_username type="TextField">
+            <Required>N</Required>
+        </elastic_username>
+        <elastic_password type="TextField">
+            <Required>N</Required>
+        </elastic_password>
         <elastic_timeout type="IntegerField">
             <default>5</default>
             <Required>N</Required>
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 51050038f..619f0f6d6 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
@@ -127,6 +127,12 @@
 {%   if helpers.exists('OPNsense.telegraf.output.elastic_url') and OPNsense.telegraf.output.elastic_url != '' %}
   urls = ["{{ OPNsense.telegraf.output.elastic_url }}"]
 {%   endif %}
+{%   if helpers.exists('OPNsense.telegraf.output.elastic_username') and OPNsense.telegraf.output.elastic_username != '' %}
+{%     if helpers.exists('OPNsense.telegraf.output.elastic_password') and OPNsense.telegraf.output.elastic_password != '' %}
+  username = "{{ OPNsense.telegraf.output.elastic_username }}"
+  password = "{{ OPNsense.telegraf.output.elastic_password }}"
+{%     endif %}
+{%   endif %}
 {%   if helpers.exists('OPNsense.telegraf.output.elastic_timeout') and OPNsense.telegraf.output.elastic_timeout != '' %}
   timeout = "{{ OPNsense.telegraf.output.elastic_timeout }}s"
 {%   endif %}
@@ -204,6 +210,16 @@
 [[inputs.diskio]]
 {% endif %}
 
+{% if helpers.exists('OPNsense.telegraf.input.internet_speed') and OPNsense.telegraf.input.internet_speed == '1' %}
+[[inputs.internet_speed]]
+{% if helpers.exists('OPNsense.telegraf.input.internet_speed_file') and OPNsense.telegraf.input.internet_speed_file == '1' %}
+  enable_file_download = true
+{% endif %}
+{% if helpers.exists('OPNsense.telegraf.input.internet_speed_interval') and OPNsense.telegraf.input.internet_speed_interval != '' %}
+  interval = "{{ OPNsense.telegraf.input.internet_speed_interval }}s"
+{% endif %}
+{% endif %}
+
 {% if helpers.exists('OPNsense.telegraf.input.mem') and OPNsense.telegraf.input.mem == '1' %}
 [[inputs.mem]]
 {% endif %}
@@ -234,6 +250,9 @@
 {%   if helpers.exists('OPNsense.telegraf.input.ping_hosts') and OPNsense.telegraf.input.ping_hosts != '' %}
   urls = [{{ "'" + ("','".join(OPNsense.telegraf.input.ping_hosts.split(','))) + "'" }}]
 {%   endif %}
+{%   if helpers.exists('OPNsense.telegraf.input.ping_count') and OPNsense.telegraf.input.ping_count != '' %}
+  count = {{ OPNsense.telegraf.input.ping_count }}
+{%   endif %}
 {% endif %}
 
 {% if helpers.exists('OPNsense.telegraf.input.ping6') and OPNsense.telegraf.input.ping6 == '1' %}
@@ -243,6 +262,9 @@
 {%   if helpers.exists('OPNsense.telegraf.input.ping6_hosts') and OPNsense.telegraf.input.ping6_hosts != '' %}
   urls = [{{ "'" + ("','".join(OPNsense.telegraf.input.ping6_hosts.split(','))) + "'" }}]
 {%   endif %}
+{%   if helpers.exists('OPNsense.telegraf.input.ping6_count') and OPNsense.telegraf.input.ping6_count != '' %}
+  count = {{ OPNsense.telegraf.input.ping6_count }}
+{%   endif %}
 {% endif %}
 
 {% if helpers.exists('OPNsense.telegraf.input.haproxy') and OPNsense.telegraf.input.haproxy == '1' %}