diff options
4 files changed, 67 insertions, 2 deletions
diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index 1a7472781..2508f9308 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -40,6 +40,7 @@ function index() rrdtool = _("RRDTool"), network = _("Network"), unixsock = _("UnixSock"), + conntrack = _("Conntrack"), csv = _("CSV Output"), exec = _("Exec"), email = _("Email"), @@ -50,6 +51,7 @@ function index() processes = _("Processes"), load = _("System Load"), interface = _("Interfaces"), + memory = _("Memory"), netlink = _("Netlink"), iptables = _("Firewall"), tcpconns = _("TCP Connections"), @@ -62,8 +64,8 @@ function index() -- our collectd menu local collectd_menu = { output = { "rrdtool", "network", "unixsock", "csv" }, - system = { "exec", "email", "cpu", "df", "disk", "irq", "processes", "load" }, - network = { "interface", "netlink", "iptables", "tcpconns", "ping", "dns", "wireless", "olsrd" } + system = { "exec", "email", "cpu", "df", "disk", "irq", "memory", "processes", "load" }, + network = { "interface", "netlink", "iptables", "conntrack", "tcpconns", "ping", "dns", "wireless", "olsrd" } } -- create toplevel menu nodes diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua new file mode 100644 index 000000000..5510a5a8e --- /dev/null +++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/memory.lua @@ -0,0 +1,21 @@ +--[[ + +Copyright 2011 Manuel Munz <freifunk at somakoma dot de> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 +]]-- + +m = Map("luci_statistics", + translate("Memory Plugin Configuration"), + translate("The memory plugin collects statistics about the memory usage.")) + +s = m:section( NamedSection, "collectd_memory", "luci_statistics" ) + +enable = s:option( Flag, "enable", translate("Enable this plugin") ) +enable.default = 0 + +return m diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua new file mode 100644 index 000000000..bc0fa4349 --- /dev/null +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/memory.lua @@ -0,0 +1,33 @@ +--[[ + +(c) 2011 Manuel Munz <freifunk at somakoma dot de> + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 +]]-- + +module("luci.statistics.rrdtool.definitions.memory",package.seeall) + +function rrdargs( graph, host, plugin, plugin_instance, dtype ) + + return { + title = "%H: Memory usage", + vlabel = "MB", + number_format = "%5.1lf%%", + data = { + instances = { + memory = { "free", "buffered", "cached", "used" } + }, + + options = { + memory_buffered = { color = "0000ff", title = "Buffered" }, + memory_cached = { color = "ff00ff", title = "Cached" }, + memory_used = { color = "ff0000", title = "Used" }, + memory_free = { color = "00ff00", title = "Free" } + } + } + } +end diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig index 2b312cccf..97c3628ab 100755 --- a/applications/luci-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-statistics/root/usr/bin/stat-genconfig @@ -192,6 +192,7 @@ function _list_expand( c, l, nopad ) k = n:gsub("(%w+)s", "%1") end + str = str .. _expand( c[n], k, nopad ) end end @@ -257,6 +258,12 @@ plugins = { { } }, + conntrack = { + { }, + { }, + { } + }, + cpu = { { }, { }, @@ -327,6 +334,8 @@ plugins = { { "Interfaces", "WatchAdds" } }, + memory = { }, + netlink = { { }, { "IgnoreSelected" }, |