From: Manuel Munz <freifunk@somakoma.de>
Date: Mon, 28 Nov 2011 15:50:57 +0000 (+0000)
Subject: applications/luci-statistics: Saner defaults for processes to monitor and add helptext
X-Git-Tag: 0.11.0~1311
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=da9929e2cb311b25fc7e4b85f313d347a16f1b63;p=project%2Fluci.git

applications/luci-statistics: Saner defaults for processes to monitor and add helptext
---

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'