Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-statistics: change nut voltage graph combines view.

Browse source 
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>
This commit is contained in:
Fabian Schmid-Michels 2019-01-03 00:29:59 +01:00 committed by Florian Eckert
parent 1e206cd32d
commit 50bb1185da
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/nut.lua
View file

@ -8,23 +8,35 @@ end
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
local voltages = { local voltages_ac = {
title = "%H: Voltages on UPS \"%pi\"", title = "%H: AC voltages on UPS \"%pi\"",
vlabel = "V", vlabel = "V",
number_format = "%5.1lfV", number_format = "%5.1lfV",
data = { data = {
instances = { instances = {
voltage = { "battery", "input", "output" } voltage = { "input", "output" }
}, },
options = { options = {
voltage_output = { color = "00e000", title = "Output voltage", noarea=true, overlay=true }, 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 } 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 = { local currents = {
title = "%H: Current on UPS \"%pi\"", title = "%H: Current on UPS \"%pi\"",
vlabel = "A", vlabel = "A",
@ -33,7 +45,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
instances = { instances = {
current = { "battery", "output" } current = { "battery", "output" }
}, },
options = { options = {
current_output = { color = "00e000", title = "Output current", noarea=true, overlay=true }, current_output = { color = "00e000", title = "Output current", noarea=true, overlay=true },
current_battery = { color = "0000ff", title = "Battery 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" } percent = { "charge", "load" }
}, },
options = { options = {
percent_charge = { color = "00ff00", title = "Charge level" }, percent_charge = { color = "00ff00", title = "Charge level", noarea=true, overlay=true },
percent_load = { color = "ff0000", title = "Load" } percent_load = { color = "ff0000", title = "Load", noarea=true, overlay=true }
} }
} }
} }
@ -67,9 +78,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
instances = { instances = {
temperature = "battery" temperature = "battery"
}, },
options = { 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 = { instances = {
frequency = { "input", "output" } frequency = { "input", "output" }
}, },
options = { options = {
frequency_output = { color = "00e000", title = "Output frequency", noarea=true, overlay=true }, frequency_output = { color = "00e000", title = "Output frequency", noarea=true, overlay=true },
frequency_input = { color = "ffb000", title = "Input 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 end