diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2011-11-28 15:50:57 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2011-11-28 15:50:57 +0000 |
| commit | da9929e2cb311b25fc7e4b85f313d347a16f1b63 (patch) | |
| tree | c879c12c1ea09e57e4b15aa0daf144c3beb16d99 | |
| parent | 44a18906e57a8f5da574e970c932f6aa0cb863a8 (diff) | |
applications/luci-statistics: Saner defaults for processes to monitor and add helptext
3 files changed, 5 insertions, 3 deletions
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua index 6607b36406..c5f980e762 100644 --- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua +++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua @@ -28,8 +28,9 @@ enable = s:option( Flag, "enable", translate("Enable this plugin") ) enable.default = 0 -- collectd_processes.processes (Process) -processes = s:option( Value, "Processes", translate("Monitor processes") ) -processes.default = "olsrd bmxd httpd dnsmasq dropbear tinc" +processes = s:option( Value, "Processes", translate("Monitor processes"), + translate("Processes to monitor seperated by space") ) processes:depends( "enable", 1 ) +processes.default = "uhttpd dropbear dnsmasq" return m diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua index bc0fa4349c..093f9923b2 100644 --- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua @@ -16,7 +16,7 @@ function rrdargs( graph, host, plugin, plugin_instance, dtype ) return { title = "%H: Memory usage", vlabel = "MB", - number_format = "%5.1lf%%", + number_format = "%5.1lf%s", data = { instances = { memory = { "free", "buffered", "cached", "used" } diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics index b8a9968be9..9d1c2b777a 100644 --- a/applications/luci-statistics/root/etc/config/luci_statistics +++ b/applications/luci-statistics/root/etc/config/luci_statistics @@ -96,6 +96,7 @@ config 'statistics' 'collectd_network' config 'statistics' 'collectd_processes' option 'enable' '1' + option 'Processes' 'uhttpd dnsmasq dropbear' config 'statistics' 'collectd_tcpconns' option 'enable' '1' |