net-mgmt/telegraf: fixed #2369 if statements in wrong spot and wrong model form (#2370)

net-mgmt/telegraf/Makefile

@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.10.0
+PLUGIN_VERSION=		1.10.1
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com

net-mgmt/telegraf/pkg-descr

@@ -12,6 +12,10 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/
 Plugin Changelog
 ================
 
+1.10.1
+
+* Fix Suricata input controller being the output section and incorrect statement
+
 1.10.0
 
 * Add intrusion detection alert input

net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml

@@ -89,5 +89,9 @@
             <default>0</default>
             <Required>N</Required>
         </ntpq_dns_lookup>
+        <intrusion_detection_alerts type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </intrusion_detection_alerts>
     </items>
 </model>

net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml

@@ -121,9 +121,5 @@
             <default></default>
             <Required>N</Required>
         </datadog_apikey>
-        <intrusion_detection_alerts type="BooleanField">
-            <default>0</default>
-            <Required>N</Required>
-        </intrusion_detection_alerts>
     </items>
 </model>

net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf

@@ -252,6 +252,8 @@
 {%   else %}
   dns_lookup = false
 {%   endif %}
+{% endif %}
+
 {% if helpers.exists('OPNsense.telegraf.input.intrusion_detection_alerts') and OPNsense.telegraf.input.intrusion_detection_alerts == '1' %}
 [[inputs.tail]]
   data_format = "json"
@@ -260,6 +262,5 @@
   tag_keys = ["event_type","src_ip","src_port","dest_ip","dest_port"]
   json_string_fields = ["*"]
 {% endif %}
-{% endif %}
 
 {% endif %}