Merge pull request #1240 from bobmseagithub/luci-app-statistics_Voltage_graphs

luci-app-statistics: Voltage graphs - AC and DC
This commit is contained in:
Hannu Nyman 2017-07-24 08:02:18 +03:00 committed by GitHub
commit 17de308ab7

View file

@ -5,18 +5,34 @@ module("luci.statistics.rrdtool.definitions.apcups",package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
local voltages = { local voltagesdc = {
title = "%H: Voltages on APC UPS ", title = "%H: Voltages on APC UPS - Battery",
vlabel = "V", vlabel = "Volts DC",
alt_autoscale = true,
number_format = "%5.1lfV", number_format = "%5.1lfV",
data = { data = {
instances = { instances = {
voltage = { "battery", "input", "output" } voltage = { "battery" }
},
options = {
voltage = { title = "Battery voltage", noarea=true }
}
}
}
local voltages = {
title = "%H: Voltages on APC UPS - AC",
vlabel = "Volts AC",
alt_autoscale = true,
number_format = "%5.1lfV",
data = {
instances = {
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 }
} }
} }
@ -97,5 +113,5 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
} }
} }
return { voltages, percentload, charge_percent, temperature, timeleft, frequency } return { voltages, voltagesdc, percentload, charge_percent, temperature, timeleft, frequency }
end end