diff --git a/sysutils/node_exporter/pkg-descr b/sysutils/node_exporter/pkg-descr index 59943adb6..54317c778 100644 --- a/sysutils/node_exporter/pkg-descr +++ b/sysutils/node_exporter/pkg-descr @@ -9,7 +9,7 @@ Changelog 1.3 -* Add textfile collector directory support +* Add textfile collector support (fixed directory: /var/db/node_exporter/textfile) 1.2 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 cb5ab61d5..d1295959a 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 @@ -84,9 +84,9 @@ Enable the ZFS collector. - general.textfile_directory - - text - Path to a directory read by the textfile collector. Files ending in .prom in this directory will be exposed as metrics. Leave empty to disable. Example: /var/db/node_exporter + 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 144f669ab..679c28663 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,6 +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 e65ce07ce..dd768e723 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,8 @@ {%- set zfs = no_collector + "zfs " -%} {%- endif -%} -{%- if not helpers.empty('OPNsense.NodeExporter.textfile_directory') -%} - {%- set textfile_directory = "--collector.textfile.directory=" + OPNsense.NodeExporter.textfile_directory + " " -%} +{%- if OPNsense.NodeExporter.textfile == '1' -%} + {%- set textfile = "--collector.textfile.directory=/var/db/node_exporter/textfile " -%} {%- endif -%} {%- if ':' in OPNsense.NodeExporter.listenaddress -%} @@ -56,7 +56,7 @@ {%- set listenaddress = OPNsense.NodeExporter.listenaddress -%} {%- endif -%} -node_exporter_args="{{ cpu }}{{ exec }}{{ filesystem }}{{ loadavg }}{{ meminfo }}{{ netdev }}{{ ntp }}{{ time }}{{ devstat }}{{ zfs }}{{ textfile_directory }}" +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"