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

Merge pull request #776 from cshore/pull-request-statistics-nut

Browse source 
luci-app-statistics: nut: Add additional stats some UPSes report
This commit is contained in:
Jo-Philipp Wich 2016-10-24 11:30:50 +02:00 committed by GitHub
commit 95358ab99d
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,23 +32,24 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
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 }
} }
} }
} }
local percentage = { local percentage = {
title = "%H: Battery charge on UPS \"%pi\"", title = "%H: Battery charge/load on UPS \"%pi\"",
vlabel = "Percent", vlabel = "Percent",
y_min = "0", y_min = "0",
y_max = "100", y_max = "100",
number_format = "%5.1lf%%", number_format = "%5.1lf%%",
data = { data = {
instances = { instances = {
percent = "charge" percent = { "charge", "load" }
}, },
options = { options = {
percent_charge = { color = "00ff00", title = "Charge level" } percent_charge = { color = "00ff00", title = "Charge level" },
percent_load = { color = "ff0000", title = "Load" }
} }
} }
} }
@ -78,10 +79,39 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
timeleft = { "battery" } timeleft = { "battery" }
}, },
options = { options = {
timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/" } timeleft_battery = { color = "0000ff", title = "Time left", transform_rpn = "60,/", noarea=true }
} }
} }
} }
return { voltages, currents, percentage, temperature, timeleft } local power = {
title = "%H: Power on UPS \"%pi\"",
vlabel = "Power",
number_format = "%5.1lf%%",
data = {
instances = {
power = { "ups" }
},
options = {
power_ups = { color = "00ff00", title = "Power level" }
}
}
}
local frequencies = {
title = "%H: Frequencies on UPS \"%pi\"",
vlabel = "Hz",
number_format = "%5.1lfHz",
data = {
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 }
end end