applications/luci-statistics: drop support for wireless plugin, add iwinfo replacement

2 files changed, 38 insertions, 30 deletions

diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
new file mode 100644
index 0000000000..5e9340dc46
--- /dev/null
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/iwinfo.lua
@@ -0,0 +1,38 @@
+--[[
+
+Luci configuration model for statistics - collectd interface plugin configuration
+(c) 2011 Jo-Philipp Wich <xm@subsignal.org>
+
+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
+
+$Id$
+
+]]--
+
+local m, s, o
+
+m = Map("luci_statistics",
+	translate("Wireless iwinfo Plugin Configuration"),
+	translate("The iwinfo plugin collects statistics about wireless signal strength, noise and quality."))
+
+s = m:section(NamedSection, "collectd_iwinfo", "luci_statistics")
+
+o = s:option(Flag, "enable", translate("Enable this plugin"))
+o.default = 0
+
+o = s:option(Value, "Interfaces", translate("Monitor interfaces"),
+	translate("Leave unselected to automatically determine interfaces to monitor."))
+o.template = "cbi/network_ifacelist"
+o.widget   = "checkbox"
+o.nocreate = true
+o:depends("enable", 1)
+
+o = s:option(Flag, "IgnoreSelected", translate("Monitor all except specified"))
+o.default = 0
+o:depends("enable", 1)
+
+return m
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua
deleted file mode 100644
index f971c8cfc4..0000000000
--- a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/wireless.lua
+++ /dev/null
@@ -1,30 +0,0 @@
---[[
-
-Luci configuration model for statistics - collectd wireless plugin configuration
-(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-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
-
-$Id$
-
-]]--
-
-m = Map("luci_statistics",
-	translate("Wireless Plugin Configuration"),
-	translate(
-		"The wireless plugin collects statistics about wireless signal " ..
-		"strength, noise and quality."
-	))
-
--- collectd_wireless config section
-s = m:section( NamedSection, "collectd_wireless", "luci_statistics" )
-
--- collectd_wireless.enable
-enable = s:option( Flag, "enable", translate("Enable this plugin") )
-enable.default = 0
-
-return m