* ffluci/statistics: move contrib files from files/ to root/
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 23 May 2008 20:23:51 +0000 (20:23 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 23 May 2008 20:23:51 +0000 (20:23 +0000)
applications/luci-statistics/files/etc/config/luci_statistics [deleted file]
applications/luci-statistics/files/usr/bin/stat-genconfig [deleted file]
applications/luci-statistics/root/etc/config/luci_statistics
applications/luci-statistics/root/usr/bin/stat-genconfig [new file with mode: 0755]

diff --git a/applications/luci-statistics/files/etc/config/luci_statistics b/applications/luci-statistics/files/etc/config/luci_statistics
deleted file mode 100644 (file)
index b8642b6..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-config 'statistics' 'general'
-       option 'BaseDir' '/var/run/collectd'
-       option 'Include' '/etc/collectd/conf.d'
-       option 'PIDFile' '/var/run/collectd.pid'
-       option 'PluginDir' '/usr/lib/collectd'
-       option 'TypesDB' '/etc/collectd/types.db'
-       option 'Interval' '30'
-       option 'ReadThreads' '2'
-
-config 'statistics' 'collectd_ping'
-       option 'enable' '0'
-       option 'TTL' '127'
-       option 'Hosts' '127.0.0.1'
-
-config 'statistics' 'collectd_csv'
-       option 'enable' '0'
-       option 'StoreRates' '0'
-       option 'DataDir' '/tmp'
-
-config 'statistics' 'collectd_df'
-       option 'enable' '0'
-       option 'Devices' '/dev/mtdblock/4'
-       option 'MountPoints' '/jffs'
-       option 'FSTypes' 'tmpfs'
-       option 'IgnoreSelected' '0'
-
-config 'statistics' 'collectd_disk'
-       option 'enable' '0'
-       option 'Disks' 'hda1 hdb'
-       option 'IgnoreSelected' '0'
-
-config 'statistics' 'collectd_dns'
-       option 'enable' '0'
-       option 'Interfaces' 'ffdhcp ff br-lan'
-       option 'IgnoreSources' '127.0.0.1'
-
-config 'statistics' 'collectd_email'
-       option 'enable' '0'
-       option 'SocketFile' '/var/run/collectd/email.sock'
-       option 'SocketGroup' 'nogroup'
-
-config 'statistics' 'collectd_exec'
-       option 'enable' '1'
-
-config 'collectd_exec_input'
-       option 'cmdline' '/usr/bin/stat-input-olsr'
-
-config 'collectd_exec_notify'
-       option 'cmdline' '/usr/bin/stat-output-syslog'
-
-config 'statistics' 'collectd_interface'
-       option 'enable' '1'
-       option 'Interfaces' 'br-lan br-ff'
-       option 'IgnoreSelected' '0'
-
-config 'statistics' 'collectd_iptables'
-       option 'enable' '1'
-
-config 'collectd_iptables_match'
-       option 'table' 'nat'
-       option 'chain' 'luci_freifunk_postrouting'
-       option 'target' 'MASQUERADE'
-       option 'source' '192.168.1.0/24'
-       option 'outputif' 'br-ff'
-       option 'name' 'Verkehr LAN-Clients'
-
-config 'collectd_iptables_match'
-       option 'chain' 'luci_freifunk_postrouting'
-       option 'table' 'nat'
-       option 'target' 'MASQUERADE'
-       option 'source' '10.61.230.0/24'
-       option 'outputif' 'br-ff'
-       option 'name' 'Verkehr WLAN-Clients'
-
-config 'statistics' 'collectd_irq'
-       option 'enable' '0'
-       option 'Irqs' '2 3 4 7'
-
-config 'statistics' 'collectd_logfile'
-       option 'enable' '0'
-       option 'LogLevel' 'notice'
-       option 'File' '/var/log/collectd.log'
-       option 'Timestamp' '1'
-
-config 'statistics' 'collectd_netlink'
-       option 'enable' '1'
-       option 'IgnoreSelected' '0'
-       option 'VerboseInterfaces' 'br-lan br-ff'
-       option 'QDiscs' 'br-lan br-ff'
-
-config 'statistics' 'collectd_network'
-       option 'enable' '0'
-
-config 'collectd_network_listen'
-       option 'host' '0.0.0.0'
-
-config 'collectd_network_server'
-       option 'host' '0.0.0.0'
-
-config 'statistics' 'collectd_processes'
-       option 'enable' '1'
-
-config 'statistics' 'collectd_tcpconns'
-       option 'enable' '1'
-       option 'ListeningPorts' '0'
-       option 'LocalPorts' '22 80 443'
-
-config 'statistics' 'collectd_unixsock'
-       option 'enable' '0'
-       option 'SocketFile' '/var/run/collectd/query.sock'
-       option 'SocketGroup' 'nogroup'
-
-config 'statistics' 'collectd_wireless'
-       option 'enable' '1'
-
-config 'statistics' 'collectd_rrdtool'
-       option 'enable' '1'
-       option 'DataDir' '/tmp'
-       option 'RRARows' '100'
-       option 'RRASingle' '1'
-       option 'RRATimespans' '600 86400 604800 2678400'
diff --git a/applications/luci-statistics/files/usr/bin/stat-genconfig b/applications/luci-statistics/files/usr/bin/stat-genconfig
deleted file mode 100755 (executable)
index cd707c6..0000000
+++ /dev/null
@@ -1,336 +0,0 @@
-#!/usr/bin/lua
-
---[[
-
-Luci statistics - collectd configuration generator
-(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$
-
-]]--
-
-
-require("ffluci.model.uci")
-require("ffluci.sys.iptparser")
-require("ffluci.util")
-
-local ipt = ffluci.sys.iptparser.IptParser()
-local uci = ffluci.model.uci.Session()
-local sections, names = uci:sections( "luci_statistics" )
-
-
-function section( plugin )
-
-       local config = sections[ "collectd_" .. plugin ] or sections["general"]
-
-       if type(config) == "table" and ( plugin == "general" or config.enable == "1" ) then
-
-               local params = ""
-
-               if type( plugins[plugin] ) == "function" then
-                       params = plugins[plugin]( config )
-               else
-                       params = config_generic( config, plugins[plugin][1], plugins[plugin][2], plugins[plugin][3], plugin == "general" )
-               end
-
-
-               if plugin ~= "general" then
-                       print( "LoadPlugin " .. plugin )
-
-                       if params:len() > 0 then
-                               print( "<Plugin " .. plugin .. ">\n" .. params .. "</Plugin>\n" )
-                       else
-                               print( "" )
-                       end
-               else
-                       print( params .. "\n" )
-               end
-       end
-end
-
-function config_generic( c, singles, bools, lists, nopad )
-       local str = ""
-
-       if type(c) == "table" then
-
-               if type(singles) == "table" then
-                       for i, key in ipairs( singles ) do
-                               str = str .. _string( c[key], key, nopad )
-                       end
-               end
-
-               if type(bools) == "table" then
-                       for i, key in ipairs( bools ) do
-                               str = str .. _bool( c[key], key, nopad )
-                       end
-               end
-
-               if type(lists) == "table" then
-                       str = str .. _list_expand( c, lists, nopad )
-               end
-       end
-
-       return str
-end
-
-function config_exec( c )
-       local str = ""
-
-       for s in pairs(sections) do
-               for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do
-                       if sections[s][".type"] == type then
-
-                               cmd   = sections[s].cmdline
-                               user  = sections[s].cmduser  or "nobody"
-                               group = sections[s].cmdgroup or "nogroup"
-
-                               str = str .. "\t" .. key .. " " .. user .. ":" .. group .. ' "' .. cmd .. "\"\n"
-                       end
-               end
-       end
-
-       return str
-end
-
-function config_iptables( c )
-       local str = ""
-
-       for s in pairs(sections) do
-               if sections[s][".type"] == "collectd_iptables_match" then
-
-                       search = { }
-
-                       for i, k in ipairs( {
-                               "table", "chain", "target", "protocol", "source", "destination",
-                               "inputif", "outputif", "options"
-                       } ) do
-                               v = sections[s][k]
-
-                               if type(v) == "string" then
-                                       if k == "options" then v = ffluci.util.split( v, "%s+", nil, true ) end
-                                       search[k] = v
-                               end
-                       end
-
-                       for i, rule in ipairs( ipt:find( search ) ) do
-
-                               name = sections[s].name:gsub( "%s+", "_" )
-                               if i > 1 then name = name .. "_(" .. i .. ")" end
-
-                               str = str .. "\tChain " .. rule.table .. " " .. rule.chain .. " " .. rule.index .. ' "' .. name .. "\"\n"
-                       end
-               end
-       end
-
-       return str
-end
-
-function config_network( c )
-       local str = ""
-
-       for s in pairs(sections) do
-               for key, type in pairs({ Listen="collectd_network_listen", Server="collectd_network_server" }) do
-                       if sections[s][".type"] == type then
-
-                               host = sections[s].host
-                               port = sections[s].port
-
-                               if host then
-                                       if port then
-                                               str = str .. "\t" .. key .. " " .. host .. " " .. port .. "\n"
-                                       else
-                                               str = str .. "\t" .. key .. " " .. host .. "\n"
-                                       end
-                               end
-                        end
-                end
-        end
-
-       return str .. _string( c["TimeToLive"], "TimeToLive" )
-                  .. _string( c["CacheFlush"], "CacheFlush" )
-                  .. _bool(   c["Forward"],    "Forward"    )
-end
-
-
-function _list_expand( c, l, nopad )
-       local str = ""
-
-       for i, n in ipairs(l) do
-               if c[n] then
-                       if n:find("(%w+)ses") then
-                               k = n:gsub("(%w+)ses", "%1s")
-                       else
-                               k = n:gsub("(%w+)s", "%1")
-                       end
-
-                       str = str .. _expand( c[n], k, nopad )
-               end
-       end
-
-       return str
-end
-
-function _expand( s, n, nopad )
-       if type(s) == "string" then
-               local str = ""
-
-               for i, v in ipairs( ffluci.util.split( s, "%s+", nil, true ) ) do
-                       str = str .. _string( v, n, nopad )
-               end
-
-               return str
-       end
-end
-
-function _bool( s, n, nopad )
-
-       local str = ""
-       local pad = ""
-       if not nopad then pad = "\t" end
-
-       if s and s == "1" then
-               str = pad .. n .. " true"
-       else
-               str = pad .. n .. " false"
-       end
-
-       return str .. "\n"
-end
-
-function _string( s, n, nopad )
-
-       local str = ""
-       local pad = ""
-       if not nopad then pad = "\t" end
-
-       if s then
-               if s:find("[^%d]") then
-                       if not s:find("[^%w]") then
-                               str = pad .. n .. " " .. s
-                       else
-                               str = pad .. n .. ' "' .. s .. '"'
-                       end
-               else
-                       str = pad .. n .. " " .. s
-               end
-
-               str = str .. "\n"
-       end
-
-       return str
-end            
-
-
-plugins = {
-       general = {
-               { "BaseDir", "Include", "PIDFile", "PluginDir", "TypesDB", "Interval", "ReadThreads" },
-               { },
-               { }
-       },
-
-       csv     = { 
-               { "DataDir" },
-               { "StoreRates" },
-               { }
-       },
-
-       df      = {
-               { },
-               { "IgnoreSelected" },
-               { "Devices", "MountPoints", "FSTypes" }
-       },
-
-       disk    = {
-               { },
-               { "IgnoreSelected" },
-               { "Disks" }
-       },
-
-       dns     = {
-               { },
-               { },
-               { "Interfaces", "IgnoreSources" }
-       },
-
-       email   = {
-               { "SocketFile", "SocketGroup", "SocketPerms", "MaxConns" },
-               { },
-               { }
-       },
-
-       exec    = config_exec,
-
-       interface = {
-               { },
-               { "IgnoreSelected" },
-               { "Interfaces" }
-       },
-
-       iptables = config_iptables,
-
-       irq     = {
-               { },
-               { "IgnoreSelected" },
-               { "Irqs" }
-       },
-
-       logfile = {
-               { "LogLevel", "File" },
-               { "Timestamp" },
-               { }
-       },
-
-       netlink = {
-               { },
-               { "IgnoreSelected" },
-               { "Interfaces", "VerboseInterfaces", "QDiscs", "Classes", "Filters" }
-       },
-
-       network = config_network,
-
-       processes = {
-               { },
-               { },
-               { "Processes" }
-       },
-
-       rrdtool = {
-               { "DataDir", "StepSize", "HeartBeat", "RRARows", "XFF", "CacheFlush", "CacheTimeout" },
-               { "RRASingle" },
-               { "RRATimespans" }
-       },
-
-       tcpconns = {
-               { },
-               { "ListeningPorts" },
-               { "LocalPorts", "RemotePorts" }
-       },
-
-       unixsock = {
-               { "SocketFile", "SocketGroup", "SocketPerms" },
-               { },
-               { }
-       },
-
-       wireless = {
-               { },
-               { },
-               { }
-       },
-
-}
-
-
-section("general")
-
-for plugin in pairs(plugins) do
-       if plugin ~= "general" then
-               section( plugin )
-       end
-end
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b8642b68012bb50398be6bf3ce5830ae125d047d 100644 (file)
@@ -0,0 +1,121 @@
+config 'statistics' 'general'
+       option 'BaseDir' '/var/run/collectd'
+       option 'Include' '/etc/collectd/conf.d'
+       option 'PIDFile' '/var/run/collectd.pid'
+       option 'PluginDir' '/usr/lib/collectd'
+       option 'TypesDB' '/etc/collectd/types.db'
+       option 'Interval' '30'
+       option 'ReadThreads' '2'
+
+config 'statistics' 'collectd_ping'
+       option 'enable' '0'
+       option 'TTL' '127'
+       option 'Hosts' '127.0.0.1'
+
+config 'statistics' 'collectd_csv'
+       option 'enable' '0'
+       option 'StoreRates' '0'
+       option 'DataDir' '/tmp'
+
+config 'statistics' 'collectd_df'
+       option 'enable' '0'
+       option 'Devices' '/dev/mtdblock/4'
+       option 'MountPoints' '/jffs'
+       option 'FSTypes' 'tmpfs'
+       option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_disk'
+       option 'enable' '0'
+       option 'Disks' 'hda1 hdb'
+       option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_dns'
+       option 'enable' '0'
+       option 'Interfaces' 'ffdhcp ff br-lan'
+       option 'IgnoreSources' '127.0.0.1'
+
+config 'statistics' 'collectd_email'
+       option 'enable' '0'
+       option 'SocketFile' '/var/run/collectd/email.sock'
+       option 'SocketGroup' 'nogroup'
+
+config 'statistics' 'collectd_exec'
+       option 'enable' '1'
+
+config 'collectd_exec_input'
+       option 'cmdline' '/usr/bin/stat-input-olsr'
+
+config 'collectd_exec_notify'
+       option 'cmdline' '/usr/bin/stat-output-syslog'
+
+config 'statistics' 'collectd_interface'
+       option 'enable' '1'
+       option 'Interfaces' 'br-lan br-ff'
+       option 'IgnoreSelected' '0'
+
+config 'statistics' 'collectd_iptables'
+       option 'enable' '1'
+
+config 'collectd_iptables_match'
+       option 'table' 'nat'
+       option 'chain' 'luci_freifunk_postrouting'
+       option 'target' 'MASQUERADE'
+       option 'source' '192.168.1.0/24'
+       option 'outputif' 'br-ff'
+       option 'name' 'Verkehr LAN-Clients'
+
+config 'collectd_iptables_match'
+       option 'chain' 'luci_freifunk_postrouting'
+       option 'table' 'nat'
+       option 'target' 'MASQUERADE'
+       option 'source' '10.61.230.0/24'
+       option 'outputif' 'br-ff'
+       option 'name' 'Verkehr WLAN-Clients'
+
+config 'statistics' 'collectd_irq'
+       option 'enable' '0'
+       option 'Irqs' '2 3 4 7'
+
+config 'statistics' 'collectd_logfile'
+       option 'enable' '0'
+       option 'LogLevel' 'notice'
+       option 'File' '/var/log/collectd.log'
+       option 'Timestamp' '1'
+
+config 'statistics' 'collectd_netlink'
+       option 'enable' '1'
+       option 'IgnoreSelected' '0'
+       option 'VerboseInterfaces' 'br-lan br-ff'
+       option 'QDiscs' 'br-lan br-ff'
+
+config 'statistics' 'collectd_network'
+       option 'enable' '0'
+
+config 'collectd_network_listen'
+       option 'host' '0.0.0.0'
+
+config 'collectd_network_server'
+       option 'host' '0.0.0.0'
+
+config 'statistics' 'collectd_processes'
+       option 'enable' '1'
+
+config 'statistics' 'collectd_tcpconns'
+       option 'enable' '1'
+       option 'ListeningPorts' '0'
+       option 'LocalPorts' '22 80 443'
+
+config 'statistics' 'collectd_unixsock'
+       option 'enable' '0'
+       option 'SocketFile' '/var/run/collectd/query.sock'
+       option 'SocketGroup' 'nogroup'
+
+config 'statistics' 'collectd_wireless'
+       option 'enable' '1'
+
+config 'statistics' 'collectd_rrdtool'
+       option 'enable' '1'
+       option 'DataDir' '/tmp'
+       option 'RRARows' '100'
+       option 'RRASingle' '1'
+       option 'RRATimespans' '600 86400 604800 2678400'
diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
new file mode 100755 (executable)
index 0000000..cd707c6
--- /dev/null
@@ -0,0 +1,336 @@
+#!/usr/bin/lua
+
+--[[
+
+Luci statistics - collectd configuration generator
+(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$
+
+]]--
+
+
+require("ffluci.model.uci")
+require("ffluci.sys.iptparser")
+require("ffluci.util")
+
+local ipt = ffluci.sys.iptparser.IptParser()
+local uci = ffluci.model.uci.Session()
+local sections, names = uci:sections( "luci_statistics" )
+
+
+function section( plugin )
+
+       local config = sections[ "collectd_" .. plugin ] or sections["general"]
+
+       if type(config) == "table" and ( plugin == "general" or config.enable == "1" ) then
+
+               local params = ""
+
+               if type( plugins[plugin] ) == "function" then
+                       params = plugins[plugin]( config )
+               else
+                       params = config_generic( config, plugins[plugin][1], plugins[plugin][2], plugins[plugin][3], plugin == "general" )
+               end
+
+
+               if plugin ~= "general" then
+                       print( "LoadPlugin " .. plugin )
+
+                       if params:len() > 0 then
+                               print( "<Plugin " .. plugin .. ">\n" .. params .. "</Plugin>\n" )
+                       else
+                               print( "" )
+                       end
+               else
+                       print( params .. "\n" )
+               end
+       end
+end
+
+function config_generic( c, singles, bools, lists, nopad )
+       local str = ""
+
+       if type(c) == "table" then
+
+               if type(singles) == "table" then
+                       for i, key in ipairs( singles ) do
+                               str = str .. _string( c[key], key, nopad )
+                       end
+               end
+
+               if type(bools) == "table" then
+                       for i, key in ipairs( bools ) do
+                               str = str .. _bool( c[key], key, nopad )
+                       end
+               end
+
+               if type(lists) == "table" then
+                       str = str .. _list_expand( c, lists, nopad )
+               end
+       end
+
+       return str
+end
+
+function config_exec( c )
+       local str = ""
+
+       for s in pairs(sections) do
+               for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do
+                       if sections[s][".type"] == type then
+
+                               cmd   = sections[s].cmdline
+                               user  = sections[s].cmduser  or "nobody"
+                               group = sections[s].cmdgroup or "nogroup"
+
+                               str = str .. "\t" .. key .. " " .. user .. ":" .. group .. ' "' .. cmd .. "\"\n"
+                       end
+               end
+       end
+
+       return str
+end
+
+function config_iptables( c )
+       local str = ""
+
+       for s in pairs(sections) do
+               if sections[s][".type"] == "collectd_iptables_match" then
+
+                       search = { }
+
+                       for i, k in ipairs( {
+                               "table", "chain", "target", "protocol", "source", "destination",
+                               "inputif", "outputif", "options"
+                       } ) do
+                               v = sections[s][k]
+
+                               if type(v) == "string" then
+                                       if k == "options" then v = ffluci.util.split( v, "%s+", nil, true ) end
+                                       search[k] = v
+                               end
+                       end
+
+                       for i, rule in ipairs( ipt:find( search ) ) do
+
+                               name = sections[s].name:gsub( "%s+", "_" )
+                               if i > 1 then name = name .. "_(" .. i .. ")" end
+
+                               str = str .. "\tChain " .. rule.table .. " " .. rule.chain .. " " .. rule.index .. ' "' .. name .. "\"\n"
+                       end
+               end
+       end
+
+       return str
+end
+
+function config_network( c )
+       local str = ""
+
+       for s in pairs(sections) do
+               for key, type in pairs({ Listen="collectd_network_listen", Server="collectd_network_server" }) do
+                       if sections[s][".type"] == type then
+
+                               host = sections[s].host
+                               port = sections[s].port
+
+                               if host then
+                                       if port then
+                                               str = str .. "\t" .. key .. " " .. host .. " " .. port .. "\n"
+                                       else
+                                               str = str .. "\t" .. key .. " " .. host .. "\n"
+                                       end
+                               end
+                        end
+                end
+        end
+
+       return str .. _string( c["TimeToLive"], "TimeToLive" )
+                  .. _string( c["CacheFlush"], "CacheFlush" )
+                  .. _bool(   c["Forward"],    "Forward"    )
+end
+
+
+function _list_expand( c, l, nopad )
+       local str = ""
+
+       for i, n in ipairs(l) do
+               if c[n] then
+                       if n:find("(%w+)ses") then
+                               k = n:gsub("(%w+)ses", "%1s")
+                       else
+                               k = n:gsub("(%w+)s", "%1")
+                       end
+
+                       str = str .. _expand( c[n], k, nopad )
+               end
+       end
+
+       return str
+end
+
+function _expand( s, n, nopad )
+       if type(s) == "string" then
+               local str = ""
+
+               for i, v in ipairs( ffluci.util.split( s, "%s+", nil, true ) ) do
+                       str = str .. _string( v, n, nopad )
+               end
+
+               return str
+       end
+end
+
+function _bool( s, n, nopad )
+
+       local str = ""
+       local pad = ""
+       if not nopad then pad = "\t" end
+
+       if s and s == "1" then
+               str = pad .. n .. " true"
+       else
+               str = pad .. n .. " false"
+       end
+
+       return str .. "\n"
+end
+
+function _string( s, n, nopad )
+
+       local str = ""
+       local pad = ""
+       if not nopad then pad = "\t" end
+
+       if s then
+               if s:find("[^%d]") then
+                       if not s:find("[^%w]") then
+                               str = pad .. n .. " " .. s
+                       else
+                               str = pad .. n .. ' "' .. s .. '"'
+                       end
+               else
+                       str = pad .. n .. " " .. s
+               end
+
+               str = str .. "\n"
+       end
+
+       return str
+end            
+
+
+plugins = {
+       general = {
+               { "BaseDir", "Include", "PIDFile", "PluginDir", "TypesDB", "Interval", "ReadThreads" },
+               { },
+               { }
+       },
+
+       csv     = { 
+               { "DataDir" },
+               { "StoreRates" },
+               { }
+       },
+
+       df      = {
+               { },
+               { "IgnoreSelected" },
+               { "Devices", "MountPoints", "FSTypes" }
+       },
+
+       disk    = {
+               { },
+               { "IgnoreSelected" },
+               { "Disks" }
+       },
+
+       dns     = {
+               { },
+               { },
+               { "Interfaces", "IgnoreSources" }
+       },
+
+       email   = {
+               { "SocketFile", "SocketGroup", "SocketPerms", "MaxConns" },
+               { },
+               { }
+       },
+
+       exec    = config_exec,
+
+       interface = {
+               { },
+               { "IgnoreSelected" },
+               { "Interfaces" }
+       },
+
+       iptables = config_iptables,
+
+       irq     = {
+               { },
+               { "IgnoreSelected" },
+               { "Irqs" }
+       },
+
+       logfile = {
+               { "LogLevel", "File" },
+               { "Timestamp" },
+               { }
+       },
+
+       netlink = {
+               { },
+               { "IgnoreSelected" },
+               { "Interfaces", "VerboseInterfaces", "QDiscs", "Classes", "Filters" }
+       },
+
+       network = config_network,
+
+       processes = {
+               { },
+               { },
+               { "Processes" }
+       },
+
+       rrdtool = {
+               { "DataDir", "StepSize", "HeartBeat", "RRARows", "XFF", "CacheFlush", "CacheTimeout" },
+               { "RRASingle" },
+               { "RRATimespans" }
+       },
+
+       tcpconns = {
+               { },
+               { "ListeningPorts" },
+               { "LocalPorts", "RemotePorts" }
+       },
+
+       unixsock = {
+               { "SocketFile", "SocketGroup", "SocketPerms" },
+               { },
+               { }
+       },
+
+       wireless = {
+               { },
+               { },
+               { }
+       },
+
+}
+
+
+section("general")
+
+for plugin in pairs(plugins) do
+       if plugin ~= "general" then
+               section( plugin )
+       end
+end