diff --git a/sysutils/node_exporter/Makefile b/sysutils/node_exporter/Makefile index bb52769b48..deabf1a2e0 100644 --- a/sysutils/node_exporter/Makefile +++ b/sysutils/node_exporter/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= node_exporter -PLUGIN_VERSION= 1.2 +PLUGIN_VERSION= 1.3 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 862f318098..54317c778b 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.3 + +* Add textfile collector support (fixed directory: /var/db/node_exporter/textfile) + 1.2 * Allow setting IPv6 addresses as ListenAddress diff --git a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/forms/general.xml b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/forms/general.xml index 8269302b1a..d1295959ac 100644 --- a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/forms/general.xml +++ b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/forms/general.xml @@ -83,4 +83,10 @@ checkbox Enable the ZFS collector. + + general.textfile + + checkbox + Enable the textfile collector. When enabled, .prom files placed in /var/db/node_exporter/textfile will be exposed as metrics. + 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 07eb285951..4989ce16eb 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 @@ -29,5 +29,6 @@ + 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 e7ea96fbc6..dd768e723c 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,13 +46,17 @@ {%- set zfs = no_collector + "zfs " -%} {%- endif -%} +{%- if OPNsense.NodeExporter.textfile == '1' -%} + {%- set textfile = "--collector.textfile.directory=/var/db/node_exporter/textfile " -%} +{%- 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_args="{{ cpu }}{{ exec }}{{ filesystem }}{{ loadavg }}{{ meminfo }}{{ netdev }}{{ ntp }}{{ time }}{{ devstat }}{{ zfs }}{{ textfile }}" node_exporter_listen_address="{{ listenaddress }}:{{ OPNsense.NodeExporter.listenport }}" node_exporter_enable="YES"