luci-app-statistics: fix memory plugin config

Fix d064cbcf9 by actually enabling ValuesAbsolute in the
config file and also prevent removing that option by LuCI.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
index e5f3360c05045bc6aae2b4f128b24c2cffce80d8..2e09ea9a74c027e4c95f950c1039361f993d7ce5 100644 (file)
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
@@ -11,17 +11,19 @@ enable = s:option( Flag, "enable", translate("Enable this plugin") )
 enable.default = 0
 
 -- collectd_memory.valuesabsolute (ValuesAbsolute)
-valuespercentage = s:option( Flag, "ValuesAbsolute",
+valuesabsolute = s:option( Flag, "ValuesAbsolute",
        translate("Absolute values"),
        translate("When set to true, we request absolute values"))
-valuespercentage.default = 1
-valuespercentage:depends( "enable", 1 )
+valuesabsolute.default = 1
+valuesabsolute.optional = false
+valuesabsolute:depends( "enable", 1 )
 
 -- collectd_memory.valuespercentage (ValuesPercentage)
 valuespercentage = s:option( Flag, "ValuesPercentage",
        translate("Percent values"),
        translate("When set to true, we request percentage values"))
 valuespercentage.default = 0
+valuespercentage.optional = false
 valuespercentage:depends( "enable", 1 )
 
 return m

diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics
index f84f67d1fcbd06c8d234b1a95780c94e03c11df4..d97087d1908c70f3b59487a24cec9071f26c225a 100644 (file)
--- a/applications/luci-app-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/config/luci_statistics
@@ -128,6 +128,8 @@ config statistics 'collectd_load'
 
 config statistics 'collectd_memory'
        option enable '1'
+       option ValuesAbsolute '1'
+       option ValuesPercentage '0'
 
 config statistics 'collectd_netlink'
        option enable '0'