From 89c9255d38bd58ec10271d1bce8699b74fc2db98 Mon Sep 17 00:00:00 2001
From: Jonatan <jonatan@jsteuernagel.de>
Date: Mon, 8 Jan 2024 16:07:42 +0100
Subject: [PATCH] sysutils/node_exporter: Allow setting IPv6 address as Listen
 Address (#3707)

* Node Exporter: Allow setting IPv6 listenaddress

* Node Exporter: Change IntegerField to PortField

* Node Exporter: Increment version and add changelog
---
 sysutils/node_exporter/Makefile                      |  2 +-
 sysutils/node_exporter/pkg-descr                     |  4 ++++
 .../mvc/app/models/OPNsense/NodeExporter/General.xml | 12 +++++-------
 .../templates/OPNsense/NodeExporter/node_exporter    |  8 +++++++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/sysutils/node_exporter/Makefile b/sysutils/node_exporter/Makefile
index 985de5c2e..bb52769b4 100644
--- a/sysutils/node_exporter/Makefile
+++ b/sysutils/node_exporter/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		node_exporter
-PLUGIN_VERSION=		1.1
+PLUGIN_VERSION=		1.2
 PLUGIN_COMMENT=		Prometheus exporter for machine metrics
 PLUGIN_DEPENDS=		node_exporter
 PLUGIN_MAINTAINER=	jkegh@k123.eu
diff --git a/sysutils/node_exporter/pkg-descr b/sysutils/node_exporter/pkg-descr
index 16c736a18..862f31809 100644
--- a/sysutils/node_exporter/pkg-descr
+++ b/sysutils/node_exporter/pkg-descr
@@ -7,6 +7,10 @@ WWW: https://github.com/prometheus/node_exporter
 Changelog
 ---------
 
+1.2
+
+* Allow setting IPv6 addresses as ListenAddress
+
 1.1
 
 * Allow to toggle the "zfs" collector
diff --git a/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.xml b/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.xml
index c47915f10..4f1d24539 100644
--- a/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.xml
+++ b/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.xml
@@ -3,23 +3,21 @@
     <description>
         node_exporter - Prometheus exporter for hardware and OS metrics.
     </description>
-    <version>0.1.0</version>
+    <version>0.2.0</version>
     <items>
         <enabled type="BooleanField">
           <default>0</default>
           <Required>Y</Required>
         </enabled>
-        <listenaddress type="TextField">
+        <listenaddress type="NetworkField">
           <default>0.0.0.0</default>
           <Required>Y</Required>
-          <mask>/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-4]|2[0-5][0-9]|[01]?[0-9][0-9]?)$/</mask>
-          <ValidationMessage>Please provide a valid IPv4 address.</ValidationMessage>
+          <NetMaskAllowed>N</NetMaskAllowed>
+          <ValidationMessage>Please provide a valid IP address.</ValidationMessage>
         </listenaddress>
-        <listenport type="IntegerField">
+        <listenport type="PortField">
           <default>9100</default>
           <Required>Y</Required>
-          <MinimumValue>1</MinimumValue>
-          <MaximumValue>65535</MaximumValue>
           <ValidationMessage>Please provide a valid port number between 1 and 65535. Port 9100 is the default.</ValidationMessage>
         </listenport>
         <cpu type="BooleanField">
diff --git a/sysutils/node_exporter/src/opnsense/service/templates/OPNsense/NodeExporter/node_exporter b/sysutils/node_exporter/src/opnsense/service/templates/OPNsense/NodeExporter/node_exporter
index a5d3b02fc..e7ea96fbc 100644
--- a/sysutils/node_exporter/src/opnsense/service/templates/OPNsense/NodeExporter/node_exporter
+++ b/sysutils/node_exporter/src/opnsense/service/templates/OPNsense/NodeExporter/node_exporter
@@ -46,8 +46,14 @@
     {%- set zfs = no_collector + "zfs " -%}
 {%- endif -%}
 
+{%- if ':' in OPNsense.NodeExporter.listenaddress -%}
+  {%- set listenaddress = '[' + OPNsense.NodeExporter.listenaddress + ']' -%}
+{%- else -%}
+  {%- set listenaddress = OPNsense.NodeExporter.listenaddress -%}
+{%- endif -%}
+
 node_exporter_args="{{ cpu }}{{ exec }}{{ filesystem }}{{ loadavg }}{{ meminfo }}{{ netdev }}{{ ntp }}{{ time }}{{ devstat }}{{ zfs }}"
-node_exporter_listen_address="{{ OPNsense.NodeExporter.listenaddress }}:{{ OPNsense.NodeExporter.listenport }}"
+node_exporter_listen_address="{{ listenaddress }}:{{ OPNsense.NodeExporter.listenport }}"
 node_exporter_enable="YES"
 
 {%- else -%}