diff options
| author | Fabian Schmid-Michels <mail@wohnheimnetz-bielefeld.de> | 2019-01-03 00:29:59 +0100 |
|---|---|---|
| committer | Florian Eckert <fe@dev.tdt.de> | 2019-05-14 09:13:05 +0200 |
| commit | 50bb1185da2c59d3d833df89d089052e7ac65829 (patch) | |
| tree | 2df551a31357e601c634b264f262228d87a1961a /applications | |
| parent | 1e206cd32dfc63233c016250f3c53f803a0c84a0 (diff) | |
luci-app-statistics: change nut voltage graph combines view.
This change splits the graph into two graphs like in apcups and makes it so
possible to see variations in AC Input/Output voltages. Battery charge and
load are indepentent variables. This change also overlays them and display
them as simply two lines. Battery temperature is also displayed as a line now,
as an area under a temperature line makes no sense. Also removed some empty
lines.
Closes: #2417
Signed-off-by: Fabian Schmid-Michels <mail@wohnheimnetz-bielefeld.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua | 33 |
1 files changed, 21 insertions, 12 deletions
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 84ca4951f..df6da3580 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 |