From 799578e9426f72965f519403aa085611d42efa76 Mon Sep 17 00:00:00 2001
From: "Mr. Johnson" <50166184+psychogun@users.noreply.github.com>
Date: Wed, 29 Jun 2022 21:48:54 +0200
Subject: [PATCH] Enables basic HTTP Authentication agains Elasticsearch
 (#2703)

---
 .../controllers/OPNsense/Telegraf/forms/output.xml   | 12 ++++++++++++
 .../mvc/app/models/OPNsense/Telegraf/Output.xml      |  6 ++++++
 .../templates/OPNsense/Telegraf/telegraf.conf        |  6 ++++++
 3 files changed, 24 insertions(+)

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/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 699fbcc9a..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 %}