projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
44a1890
)
applications/luci-statistics: Saner defaults for processes to monitor and add helptext
author
Manuel Munz
<freifunk@somakoma.de>
Mon, 28 Nov 2011 15:50:57 +0000
(15:50 +0000)
committer
Manuel Munz
<freifunk@somakoma.de>
Mon, 28 Nov 2011 15:50:57 +0000
(15:50 +0000)
applications/luci-statistics/luasrc/model/cbi/luci_statistics/processes.lua
patch
|
blob
|
history
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
patch
|
blob
|
history
applications/luci-statistics/root/etc/config/luci_statistics
patch
|
blob
|
history
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 6607b36406624791136fceacf9ba993eab3856f2..c5f980e762c1a234d55666606d8a9da0a779deb4 100644
(file)
--- 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)
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:depends( "enable", 1 )
+processes.default = "uhttpd dropbear dnsmasq"
return m
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 bc0fa4349c7d5c854ca2d87e85bb632d6d7f6eab..093f9923b229fa53479fc711749672ae5c9668a6 100644
(file)
--- 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",
return {
title = "%H: Memory usage",
vlabel = "MB",
- number_format = "%5.1lf%
%
",
+ number_format = "%5.1lf%
s
",
data = {
instances = {
memory = { "free", "buffered", "cached", "used" }
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 b8a9968be94f1046a9594ba54c22fab8b7d0d9f6..9d1c2b777a0d0fdc3b075da240e1f0c99e671ec7 100644
(file)
--- 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'
config 'statistics' 'collectd_processes'
option 'enable' '1'
+ option 'Processes' 'uhttpd dnsmasq dropbear'
config 'statistics' 'collectd_tcpconns'
option 'enable' '1'
config 'statistics' 'collectd_tcpconns'
option 'enable' '1'