From ccdc6535a9e1eefa109bc491a204e32281d13063 Mon Sep 17 00:00:00 2001 From: soma Date: Fri, 10 Oct 2014 10:52:41 +0200 Subject: [PATCH] add support for splash leases plugin --- .../luci_statistics/luci_statistics.lua | 3 +- .../cbi/luci_statistics/splash_leases.lua | 24 ++++++++++++ .../rrdtool/definitions/splash_leases.lua | 37 +++++++++++++++++++ .../root/etc/config/luci_statistics | 3 ++ .../root/usr/bin/stat-genconfig | 6 +++ 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua create mode 100644 applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua 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 1f2016490..5729bb186 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -54,6 +54,7 @@ function index() ping = _("Ping"), processes = _("Processes"), rrdtool = _("RRDTool"), + splash_leases = _("Splash Leases"), tcpconns = _("TCP Connections"), unixsock = _("UnixSock"), uptime = _("Uptime") @@ -63,7 +64,7 @@ function index() 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 diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua new file mode 100644 index 000000000..a15ed0ecc --- /dev/null +++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/splash_leases.lua @@ -0,0 +1,24 @@ +--[[ + +Luci configuration model for statistics - collectd splash_leases plugin configuration +(c) 2013 Freifunk Augsburg / Michael Wendland + +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 + diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua new file mode 100644 index 000000000..69f3c113c --- /dev/null +++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua @@ -0,0 +1,37 @@ +--[[ + +Luci statistics - splash_leases plugin diagram definition +(c) 2013 Freifunk Augsburg / Michael Wendland + +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 diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics index 1bbe76ce2..e39db3513 100644 --- a/applications/luci-statistics/root/etc/config/luci_statistics +++ b/applications/luci-statistics/root/etc/config/luci_statistics @@ -98,6 +98,9 @@ config 'statistics' 'collectd_processes' 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' diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig index 46d23a67a..86773b4e5 100755 --- a/applications/luci-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-statistics/root/usr/bin/stat-genconfig @@ -387,6 +387,12 @@ plugins = { { "RRATimespans" } }, + splash_leases = { + { }, + { }, + { } + }, + tcpconns = { { }, { "ListeningPorts" }, -- 2.25.1