diff options
Diffstat (limited to 'applications/luci-app-statistics')
30 files changed, 51 insertions, 42 deletions
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua index f827e92309..4586b23caa 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua @@ -62,7 +62,7 @@ function Graph._mkpath( self, plugin, plugin_instance, dtype, dtype_instance ) end function Graph.mkrrdpath( self, ... ) - return string.format( "%s/%s.rrd", self.opts.rrdpath, self:_mkpath( ... ) ) + return string.format( "%s/%s.rrd", self.opts.rrdpath, self:_mkpath( ... ):gsub("\\", "\\\\"):gsub(":", "\\:") ) end function Graph.mkpngpath( self, ... ) 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/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po index de10eb60dd..f30a6f7019 100644 --- a/applications/luci-app-statistics/po/ca/statistics.po +++ b/applications/luci-app-statistics/po/ca/statistics.po @@ -208,8 +208,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po index d7fc23b1b6..6b318016d5 100644 --- a/applications/luci-app-statistics/po/cs/statistics.po +++ b/applications/luci-app-statistics/po/cs/statistics.po @@ -204,8 +204,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po index 8ed2bc7ea3..80beeea7f8 100644 --- a/applications/luci-app-statistics/po/de/statistics.po +++ b/applications/luci-app-statistics/po/de/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po index 4de9c38e00..156bb8d74b 100644 --- a/applications/luci-app-statistics/po/el/statistics.po +++ b/applications/luci-app-statistics/po/el/statistics.po @@ -208,8 +208,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po index d998f04fcd..bbfccc60e6 100644 --- a/applications/luci-app-statistics/po/en/statistics.po +++ b/applications/luci-app-statistics/po/en/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po index 14ff41067b..603844f5b7 100644 --- a/applications/luci-app-statistics/po/es/statistics.po +++ b/applications/luci-app-statistics/po/es/statistics.po @@ -206,8 +206,8 @@ msgstr "Habilitar" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po index 5e457bcdce..0534a2668d 100644 --- a/applications/luci-app-statistics/po/fr/statistics.po +++ b/applications/luci-app-statistics/po/fr/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po index 2c818902c0..8d1ed3614d 100644 --- a/applications/luci-app-statistics/po/he/statistics.po +++ b/applications/luci-app-statistics/po/he/statistics.po @@ -203,8 +203,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po index 030658f65d..d93b30efa5 100644 --- a/applications/luci-app-statistics/po/hu/statistics.po +++ b/applications/luci-app-statistics/po/hu/statistics.po @@ -204,8 +204,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po index 6bda3b9b39..ddabf112f0 100644 --- a/applications/luci-app-statistics/po/it/statistics.po +++ b/applications/luci-app-statistics/po/it/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index e68426eea5..f6d33b8337 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -205,8 +205,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po index d3dff62029..728fc6a549 100644 --- a/applications/luci-app-statistics/po/ms/statistics.po +++ b/applications/luci-app-statistics/po/ms/statistics.po @@ -200,8 +200,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po index 525a7307f2..f13714ed0e 100644 --- a/applications/luci-app-statistics/po/no/statistics.po +++ b/applications/luci-app-statistics/po/no/statistics.po @@ -197,8 +197,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po index 06ad09c99a..4c362a265f 100644 --- a/applications/luci-app-statistics/po/pl/statistics.po +++ b/applications/luci-app-statistics/po/pl/statistics.po @@ -207,8 +207,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po index 0ab5351ad7..10cc1fb8a4 100644 --- a/applications/luci-app-statistics/po/pt-br/statistics.po +++ b/applications/luci-app-statistics/po/pt-br/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po index 928aba7a90..9671e17917 100644 --- a/applications/luci-app-statistics/po/pt/statistics.po +++ b/applications/luci-app-statistics/po/pt/statistics.po @@ -206,8 +206,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po index 486e155f3b..5e98c704d6 100644 --- a/applications/luci-app-statistics/po/ro/statistics.po +++ b/applications/luci-app-statistics/po/ro/statistics.po @@ -207,8 +207,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po index 83395573f2..6e03404f72 100644 --- a/applications/luci-app-statistics/po/ru/statistics.po +++ b/applications/luci-app-statistics/po/ru/statistics.po @@ -207,8 +207,8 @@ msgstr "Включить" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po index 5bbc165276..46e0a9440f 100644 --- a/applications/luci-app-statistics/po/sk/statistics.po +++ b/applications/luci-app-statistics/po/sk/statistics.po @@ -198,8 +198,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po index 6bdede9cb4..14cd2777d7 100644 --- a/applications/luci-app-statistics/po/sv/statistics.po +++ b/applications/luci-app-statistics/po/sv/statistics.po @@ -202,8 +202,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot index c95e0e8726..13ebb7d496 100644 --- a/applications/luci-app-statistics/po/templates/statistics.pot +++ b/applications/luci-app-statistics/po/templates/statistics.pot @@ -191,8 +191,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po index cffaee79e8..b66455a34b 100644 --- a/applications/luci-app-statistics/po/tr/statistics.po +++ b/applications/luci-app-statistics/po/tr/statistics.po @@ -199,8 +199,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po index ff31fe5f51..9556526fc7 100644 --- a/applications/luci-app-statistics/po/uk/statistics.po +++ b/applications/luci-app-statistics/po/uk/statistics.po @@ -204,8 +204,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po index 2b752abef7..e986cdfa0d 100644 --- a/applications/luci-app-statistics/po/vi/statistics.po +++ b/applications/luci-app-statistics/po/vi/statistics.po @@ -207,8 +207,8 @@ msgstr "" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index 33fee69b07..d5dae6b01b 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.po @@ -208,8 +208,8 @@ msgstr "启用" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po index ac029ca35d..881f208888 100644 --- a/applications/luci-app-statistics/po/zh-tw/statistics.po +++ b/applications/luci-app-statistics/po/zh-tw/statistics.po @@ -208,8 +208,8 @@ msgstr "啟用" #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:10 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11 -#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12 +#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15 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..55cc6979e5 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 = { |