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

luci-app-statistics: CPU plugin: backport defaults from master

Browse source 
Backport from master the current defaults based on 1cff1002.
(The part related to 'idle' state is not backported, yet)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2020-11-08 18:26:20 +02:00
parent 167c1fa4b4
commit 7460e9d720
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
View file

@ -17,6 +17,7 @@ reportbycpu = s:option( Flag, "ReportByCpu",
translate("Report by CPU"), translate("Report by CPU"),
translate("By setting this, CPU is not aggregate of all processors on the system")) translate("By setting this, CPU is not aggregate of all processors on the system"))
reportbycpu.default = 1 reportbycpu.default = 1
reportbycpu.rmempty = false
reportbycpu:depends( "enable", 1 ) reportbycpu:depends( "enable", 1 )
-- collectd_cpu.reportbystate (ReportByState) -- collectd_cpu.reportbystate (ReportByState)
@ -24,13 +25,15 @@ reportbystate = s:option( Flag, "ReportByState",
translate("Report by state"), translate("Report by state"),
translate("When set to true, reports per-state metric (system, user, idle)")) translate("When set to true, reports per-state metric (system, user, idle)"))
reportbystate.default = 1 reportbystate.default = 1
reportbystate.rmempty = false
reportbystate:depends( "enable", 1 ) reportbystate:depends( "enable", 1 )
-- collectd_cpu.valuespercentage (ValuesPercentage) -- collectd_cpu.valuespercentage (ValuesPercentage)
valuespercentage = s:option( Flag, "ValuesPercentage", valuespercentage = s:option( Flag, "ValuesPercentage",
translate("Report in percent"), translate("Report in percent"),
translate("When set to true, we request percentage values")) translate("When set to true, we request percentage values"))
valuespercentage.default = 0 valuespercentage.default = 1
valuespercentage.rmempty = false
valuespercentage:depends({ enable = 1, ReportByCpu = 1, ReportByState = 1 }) valuespercentage:depends({ enable = 1, ReportByCpu = 1, ReportByState = 1 })
return m return m

3
applications/luci-app-statistics/root/etc/config/luci_statistics
View file

@ -62,6 +62,9 @@ config statistics 'collectd_contextswitch'
config statistics 'collectd_cpu' config statistics 'collectd_cpu'
option enable '1' option enable '1'
option ReportByCpu '1'
option ReportByState '1'
option ValuesPercentage '1'
config statistics 'collectd_cpufreq' config statistics 'collectd_cpufreq'
option enable '0' option enable '0'