diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile index c83262afa..4841aaf38 100644 --- a/net-mgmt/telegraf/Makefile +++ b/net-mgmt/telegraf/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= telegraf -PLUGIN_VERSION= 1.7.5 +PLUGIN_VERSION= 1.7.6 PLUGIN_COMMENT= Agent for collecting metrics and data PLUGIN_DEPENDS= telegraf PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr index 2cdb28f10..d67637557 100644 --- a/net-mgmt/telegraf/pkg-descr +++ b/net-mgmt/telegraf/pkg-descr @@ -11,6 +11,12 @@ Kafka, MQTT, NSQ, and many others. Plugin Changelog ================ +1.7.6 + +* Add 'Debug' and 'Quiet' setting +* Add log viewer +* Fix 'Round Interval' setting not working + 1.7.5 * Add Graphite tag support diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml index 751392b89..ff2eea081 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/general.xml @@ -59,4 +59,16 @@ checkbox If set to true, do no set the "host" tag in the Telegraf agent. + + general.quiet + + checkbox + Log only error level messages. + + + general.debug + + checkbox + Log at debug level. + diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml index 85139997c..e994cd877 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/General.xml @@ -1,7 +1,7 @@ //OPNsense/telegraf/general Telegraf general configuration - 1.0.0 + 1.0.1 0 @@ -43,5 +43,13 @@ 0 Y + + 1 + Y + + + 0 + Y + diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Menu/Menu.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Menu/Menu.xml index a65cadbdf..5995d8b64 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Menu/Menu.xml +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Menu/Menu.xml @@ -4,6 +4,7 @@ + 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 8f6acb27c..f8d01fab7 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 @@ -14,7 +14,7 @@ {% if helpers.exists('OPNsense.telegraf.general.interval') and OPNsense.telegraf.general.interval != '' %} interval = "{{ OPNsense.telegraf.general.interval }}s" {% endif %} -{% if helpers.exists('OPNsense.telegraf.general.round_interval') and OPNsense.telegraf.general.round_interval == '1' %} +{% if helpers.exists('OPNsense.telegraf.general.roundinterval') and OPNsense.telegraf.general.roundinterval == '1' %} round_interval = true {% else %} round_interval = false @@ -32,8 +32,16 @@ flush_jitter = "{{ OPNsense.telegraf.general.flush_jitter }}s" {% endif %} precision = "" +{% if helpers.exists('OPNsense.telegraf.general.debug') and OPNsense.telegraf.general.debug == '1' %} + debug = true +{% else %} debug = false +{% endif %} +{% if helpers.exists('OPNsense.telegraf.general.quiet') and OPNsense.telegraf.general.quiet == '1' %} quiet = true +{% else %} + quiet = false +{% endif %} {% if helpers.exists('OPNsense.telegraf.general.hostname') and OPNsense.telegraf.general.hostname != '' %} hostname = "{{ OPNsense.telegraf.general.hostname }}" {% endif %} diff --git a/net-mgmt/telegraf/src/www/diag_logs_telegraf.php b/net-mgmt/telegraf/src/www/diag_logs_telegraf.php new file mode 100644 index 000000000..4f99b1e0e --- /dev/null +++ b/net-mgmt/telegraf/src/www/diag_logs_telegraf.php @@ -0,0 +1,7 @@ +