diff options
Diffstat (limited to 'applications/luci-app-statistics')
5 files changed, 62 insertions, 23 deletions
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua index 3179da63b5..bcee6efe08 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua @@ -20,6 +20,14 @@ hosts = s:option( Value, "Hosts", translate("Monitor hosts"), translate ("Add mu hosts.default = "127.0.0.1" hosts:depends( "enable", 1 ) +-- collectd_ping.adressfamily (AddressFamily) +addressfamily = s:option( ListValue, "AddressFamily", translate("Address family") ) +addressfamily.default = "any" +addressfamily:value( "any" ) +addressfamily:value( "ipv4" ) +addressfamily:value( "ipv6" ) +addressfamily:depends( "enable", 1 ) + -- collectd_ping.ttl (TTL) ttl = s:option( Value, "TTL", translate("TTL for ping packets") ) ttl.isinteger = true diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua index 84ca4951f9..df6da3580b 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua @@ -8,23 +8,35 @@ end function rrdargs( graph, plugin, plugin_instance, dtype ) - local voltages = { - title = "%H: Voltages on UPS \"%pi\"", + local voltages_ac = { + title = "%H: AC voltages on UPS \"%pi\"", vlabel = "V", number_format = "%5.1lfV", data = { instances = { - voltage = { "battery", "input", "output" } + voltage = { "input", "output" } }, - options = { voltage_output = { color = "00e000", title = "Output voltage", noarea=true, overlay=true }, - voltage_battery = { color = "0000ff", title = "Battery voltage", noarea=true, overlay=true }, voltage_input = { color = "ffb000", title = "Input voltage", noarea=true, overlay=true } } } } + local voltages_dc = { + title = "%H: Battery voltage on UPS \"%pi\"", + vlabel = "V", + number_format = "%5.1lfV", + data = { + instances = { + voltage = { "battery" } + }, + options = { + voltage = { color = "0000ff", title = "Battery voltage", noarea=true, overlay=true } + } + } + } + local currents = { title = "%H: Current on UPS \"%pi\"", vlabel = "A", @@ -33,7 +45,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) instances = { current = { "battery", "output" } }, - options = { current_output = { color = "00e000", title = "Output current", noarea=true, overlay=true }, current_battery = { color = "0000ff", title = "Battery current", noarea=true, overlay=true } @@ -52,8 +63,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) percent = { "charge", "load" } }, options = { - percent_charge = { color = "00ff00", title = "Charge level" }, - percent_load = { color = "ff0000", title = "Load" } + percent_charge = { color = "00ff00", title = "Charge level", noarea=true, overlay=true }, + percent_load = { color = "ff0000", title = "Load", noarea=true, overlay=true } } } } @@ -67,9 +78,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) instances = { temperature = "battery" }, - options = { - temperature_battery = { color = "ffb000", title = "Battery temperature" } + temperature_battery = { color = "ffb000", title = "Battery temperature", noarea=true } } } } @@ -110,12 +120,11 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) instances = { frequency = { "input", "output" } }, - options = { frequency_output = { color = "00e000", title = "Output frequency", noarea=true, overlay=true }, frequency_input = { color = "ffb000", title = "Input frequency", noarea=true, overlay=true } } } } - return { voltages, currents, percentage, temperature, timeleft, power, frequencies } + return { voltages_ac, voltages_dc, currents, percentage, temperature, timeleft, power, frequencies } end diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index 14ff41067b..5c512b5b04 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:41+0200\n" -"PO-Revision-Date: 2019-03-02 12:57-0300\n" +"PO-Revision-Date: 2019-05-28 16:08-0300\n" "Last-Translator: José Vicente <josevteg@gmail.com>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.3\n" "Language-Team: \n" #: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:26 @@ -322,6 +322,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/sensors.lua:86 msgid "Hold Ctrl to select multiple items or to deselect entries." msgstr "" +"Mantenga presionada la tecla Ctrl para seleccionar varios elementos o para " +"deseleccionar entradas." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/olsrd.lua:13 msgid "Host" @@ -761,7 +763,7 @@ msgstr "Tabla" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:6 msgid "The APCUPS plugin collects statistics about the APC UPS." -msgstr "" +msgstr "El complemento APCUPS recopila estadísticas sobre el APC UPS." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/nut.lua:5 msgid "The NUT plugin reads information about Uninterruptible Power Supplies." @@ -782,6 +784,8 @@ msgid "" "The OpenVPN plugin gathers information about the current vpn connection " "status." msgstr "" +"El complemento OpenVPN recopila información sobre el estado actual de la " +"conexión vpn." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:6 msgid "" @@ -949,12 +953,16 @@ msgid "" "The sensors plugin uses the Linux Sensors framework to gather environmental " "statistics." msgstr "" +"El plugin \"sensors\" usa el marco de trabajo de sensores de Linux para " +"recopilar estadísticas ambientales." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua:6 msgid "" "The splash leases plugin uses libuci to collect statistics about splash " "leases." msgstr "" +"El plugin \"splash leases\" usa libuci para recopilar estadísticas sobre los " +"arrendamientos de salpicaduras." #: applications/luci-app-statistics/luasrc/view/admin_statistics/index.htm:11 msgid "" @@ -962,6 +970,9 @@ msgid "" "to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " "render diagram images." msgstr "" +"El paquete de estadísticas utiliza <a href=\"https://collectd.org/" +"\">Collectd</a> para recopilar datos y <a href=\"http://oss.oetiker.ch/" +"rrdtool/\">RRDtool</a> para renderizar imágenes de diagramas." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/tcpconns.lua:6 msgid "" @@ -977,6 +988,9 @@ msgid "" "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be " "read, e.g. thermal_zone1 )" msgstr "" +"El plugin \"thermal\" controlará la temperatura del sistema. Los datos se " +"leen normalmente desde /sys/class/thermal/*/temp ('*' indica el dispositivo " +"térmico que se va a leer, por ejemplo, thermal_zone1)" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/unixsock.lua:6 msgid "" @@ -989,6 +1003,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:6 msgid "The uptime plugin collects statistics about the uptime of the system." msgstr "" +"El plugin \"uptime\" recopila estadísticas sobre el tiempo de actividad del " +"sistema." #: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:56 #: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/thermal.lua:6 @@ -1002,10 +1018,14 @@ msgstr "Configuración del plugin Thermal" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:5 msgid "This plugin collects statistics about the processor context switches." msgstr "" +"Este plugin recopila estadísticas sobre los cambios de contexto del " +"procesador." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:5 msgid "This plugin collects statistics about the processor frequency scaling." msgstr "" +"Este plugin recopila estadísticas sobre la escala de frecuencia del " +"procesador." #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:25 msgid "" @@ -1059,11 +1079,11 @@ msgstr "Tiempo activo" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/uptime.lua:5 msgid "Uptime Plugin Configuration" -msgstr "" +msgstr "Configuración del plugin Uptime" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/openvpn.lua:35 msgid "Use improved naming schema" -msgstr "" +msgstr "Usar un esquema de nombres mejorado" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/collectd.lua:36 msgid "Used PID file" @@ -1091,6 +1111,8 @@ msgstr "Configuración plugin \"Wireless iwinfo\"" msgid "" "You can install additional collectd-mod-* plugins to enable more statistics." msgstr "" +"Puede instalar plugins collectd-mod-* adicionales para habilitar más " +"estadísticas." #: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:32 #: applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua:7 @@ -1099,7 +1121,7 @@ msgstr "cUrl" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:5 msgid "cUrl Plugin Configuration" -msgstr "" +msgstr "Configuración de plugin de cUrl" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:109 msgid "e.g. br-ff" @@ -1127,4 +1149,4 @@ msgstr "segundos (varios separados por espacio)" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45 msgid "server interfaces" -msgstr "interfaces servidores" +msgstr "interfaces de servidores" diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics index 1e841fec8a..f84f67d1fc 100644 --- a/applications/luci-app-statistics/root/etc/config/luci_statistics +++ b/applications/luci-app-statistics/root/etc/config/luci_statistics @@ -137,7 +137,7 @@ config statistics 'collectd_netlink' config statistics 'collectd_nut' option enable '0' - option UPS 'myupsname' + list UPS 'myupsname' config statistics 'collectd_olsrd' option enable '0' diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 7d1349b249..cb091ae672 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -393,9 +393,9 @@ plugins = { network = config_network, nut = { - { "UPS" }, { }, - { } + { }, + { "UPS" } }, olsrd = { @@ -411,7 +411,7 @@ plugins = { }, ping = { - { "TTL", "Interval" }, + { "TTL", "Interval", "AddressFamily" }, { }, { "Hosts" } }, |