all required changes that luci-statistics works with collectd-mod-splash-leases.
Including an menu entry to enable/disalbe the plugin and the rrdtool
diagram definition.
Signed-off-by: Michael Wendland <mich...@michiwend.com>
Reviewed-by: Manuel Munz <freif...@somakoma.de>
Index:
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
===================================================================
---
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
(Revision 9930)
+++
applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
(Arbeitskopie)
@@ -54,6 +54,7 @@
ping = _("Ping"),
processes = _("Processes"),
rrdtool = _("RRDTool"),
+ splash_leases = _("Splash Leases"),
tcpconns = _("TCP Connections"),
unixsock = _("UnixSock"),
uptime = _("Uptime")
@@ -63,7 +64,7 @@
local collectd_menu = {
output = { "csv", "network", "rrdtool", "unixsock" },
system = { "cpu", "df", "disk", "email", "exec", "irq",
"load", "memory", "nut", "processes", "uptime" },
- network = { "conntrack", "dns", "interface", "iptables",
"netlink", "olsrd", "ping", "tcpconns", "iwinfo" }
+ network = { "conntrack", "dns", "interface", "iptables",
"netlink", "olsrd", "ping", "splash_leases", "tcpconns", "iwinfo" }
}
-- create toplevel menu nodes
Index:
applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
===================================================================
---
applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
(Revision 0)
+++
applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua
(Arbeitskopie)
@@ -0,0 +1,24 @@
+--[[
+
+Luci configuration model for statistics - collectd splash_leases plugin
configuration
+(c) 2013 Freifunk Augsburg / Michael Wendland <mich...@michiwend.com>
+
+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("Splash Leases Plugin Configuration"),
+ translate("The splash leases plugin uses libuci to collect statistics
about splash leases."))
+
+s = m:section( NamedSection, "collectd_splash_leases", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 1
+
+return m
+
Index:
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
===================================================================
---
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
(Revision 0)
+++
applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
(Arbeitskopie)
@@ -0,0 +1,37 @@
+--[[
+
+Luci statistics - splash_leases plugin diagram definition
+(c) 2013 Freifunk Augsburg / Michael Wendland <mich...@michiwend.com>
+
+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.splash_leases", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+ return {
+ title = "%H: Splash Leases",
+ vlabel = "Active Clients",
+ y_min = "0",
+ number_format = "%5.1lf",
+ data = {
+ sources = {
+ splash_leases = { "leased", "whitelisted", "blacklisted" }
+ },
+
+ options = {
+ splash_leases__leased = { color = "00CC00", title =
"Leased", overlay = false },
+ splash_leases__whitelisted = { color = "0000FF", title =
"Whitelisted", overlay = false },
+ splash_leases__blacklisted = { color = "FF0000", title =
"Blacklisted", overlay = false }
+ }
+ }
+ }
+
+end
Index: applications/luci-statistics/root/etc/config/luci_statistics
===================================================================
--- applications/luci-statistics/root/etc/config/luci_statistics
(Revision 9930)
+++ applications/luci-statistics/root/etc/config/luci_statistics
(Arbeitskopie)
@@ -98,6 +98,9 @@
option 'enable' '1'
option 'Processes' 'uhttpd dnsmasq dropbear'
+config statistics 'collectd_splash_leases'
+ option enable '1'
+
config 'statistics' 'collectd_tcpconns'
option 'enable' '1'
option 'ListeningPorts' '0'
Index: applications/luci-statistics/root/usr/bin/stat-genconfig
===================================================================
--- applications/luci-statistics/root/usr/bin/stat-genconfig (Revision 9930)
+++ applications/luci-statistics/root/usr/bin/stat-genconfig (Arbeitskopie)
@@ -387,6 +387,12 @@
{ "RRATimespans" }
},
+ splash_leases = {
+ { },
+ { },
+ { }
+ },
+
tcpconns = {
{ },
{ "ListeningPorts" },
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
