Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

1 files changed, 209 insertions, 0 deletions

diff --git a/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
new file mode 100644
index 0000000000..5729bb186a
--- /dev/null
+++ b/applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -0,0 +1,209 @@
+--[[
+
+Luci statistics - statistics controller module
+(c) 2008 Freifunk Leipzig / Jo-Philipp Wich <xm@leipzig.freifunk.net>
+(c) 2012 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
+
+]]--
+
+module("luci.controller.luci_statistics.luci_statistics", package.seeall)
+
+function index()
+
+	require("nixio.fs")
+	require("luci.util")
+	require("luci.statistics.datatree")
+
+	-- override entry(): check for existance <plugin>.so where <plugin> is derived from the called path
+	function _entry( path, ... )
+		local file = path[5] or path[4]
+		if nixio.fs.access( "/usr/lib/collectd/" .. file .. ".so" ) then
+			entry( path, ... )
+		end
+	end
+
+	local labels = {
+		s_output	= _("Output plugins"),
+		s_system	= _("System plugins"),
+		s_network	= _("Network plugins"),
+
+		conntrack	= _("Conntrack"),
+		cpu			= _("Processor"),
+		csv			= _("CSV Output"),
+		df			= _("Disk Space Usage"),
+		disk		= _("Disk Usage"),
+		dns			= _("DNS"),
+		email		= _("Email"),
+		exec		= _("Exec"),
+		interface	= _("Interfaces"),
+		iptables	= _("Firewall"),
+		irq			= _("Interrupts"),
+		iwinfo		= _("Wireless"),
+		load		= _("System Load"),
+		memory		= _("Memory"),
+		netlink		= _("Netlink"),
+		network		= _("Network"),
+		nut			= _("UPS"),
+		olsrd		= _("OLSRd"),
+		ping		= _("Ping"),
+		processes	= _("Processes"),
+		rrdtool		= _("RRDTool"),
+		splash_leases = _("Splash Leases"),
+		tcpconns	= _("TCP Connections"),
+		unixsock	= _("UnixSock"),
+		uptime		= _("Uptime")
+	}
+
+	-- our collectd menu
+	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", "splash_leases", "tcpconns", "iwinfo" }
+	}
+
+	-- create toplevel menu nodes
+	local st = entry({"admin", "statistics"}, template("admin_statistics/index"), _("Statistics"), 80)
+	st.index = true
+
+	entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true
+
+
+	-- populate collectd plugin menu
+	local index = 1
+	for section, plugins in luci.util.kspairs( collectd_menu ) do
+		local e = entry(
+			{ "admin", "statistics", "collectd", section },
+			firstchild(), labels["s_"..section], index * 10
+		)
+
+		e.index = true
+
+		for j, plugin in luci.util.vspairs( plugins ) do
+			_entry(
+				{ "admin", "statistics", "collectd", section, plugin },
+				cbi("luci_statistics/" .. plugin ),
+				labels[plugin], j * 10
+			)
+		end
+
+		index = index + 1
+	end
+
+	-- output views
+	local page = entry( { "admin", "statistics", "graph" }, template("admin_statistics/index"), _("Graphs"), 80)
+	      page.setuser  = "nobody"
+	      page.setgroup = "nogroup"
+
+	local vars = luci.http.formvalue(nil, true)
+	local span = vars.timespan or nil
+	local host = vars.host or nil
+
+	-- get rrd data tree
+	local tree = luci.statistics.datatree.Instance(host)
+
+	local _, plugin, idx
+	for _, plugin, idx in luci.util.vspairs( tree:plugins() ) do
+
+		-- get plugin instances
+		local instances = tree:plugin_instances( plugin )
+
+		-- plugin menu entry
+		entry(
+			{ "admin", "statistics", "graph", plugin },
+			call("statistics_render"), labels[plugin], idx
+		).query = { timespan = span , host = host }
+
+		-- if more then one instance is found then generate submenu
+		if #instances > 1 then
+			local _, inst, idx2
+			for _, inst, idx2 in luci.util.vspairs(instances) do
+				-- instance menu entry
+				entry(
+					{ "admin", "statistics", "graph", plugin, inst },
+					call("statistics_render"), inst, idx2
+				).query = { timespan = span , host = host }
+			end
+		end
+	end
+end
+
+function statistics_render()
+
+	require("luci.statistics.rrdtool")
+	require("luci.template")
+	require("luci.model.uci")
+
+	local vars  = luci.http.formvalue()
+	local req   = luci.dispatcher.context.request
+	local path  = luci.dispatcher.context.path
+	local uci   = luci.model.uci.cursor()
+	local spans = luci.util.split( uci:get( "luci_statistics", "collectd_rrdtool", "RRATimespans" ), "%s+", nil, true )
+	local span  = vars.timespan or uci:get( "luci_statistics", "rrdtool", "default_timespan" ) or spans[1]
+	local host  = vars.host     or uci:get( "luci_statistics", "collectd", "Hostname" ) or luci.sys.hostname()
+	local opts = { host = vars.host }
+	local graph = luci.statistics.rrdtool.Graph( luci.util.parse_units( span ), opts )
+	local hosts = graph.tree:host_instances()
+
+	local is_index = false
+	local i, p, inst, idx
+
+	-- deliver image
+	if vars.img then
+		local l12 = require "luci.ltn12"
+		local png = io.open(graph.opts.imgpath .. "/" .. vars.img:gsub("%.+", "."), "r")
+		if png then
+			luci.http.prepare_content("image/png")
+			l12.pump.all(l12.source.file(png), luci.http.write)
+			png:close()
+		end
+		return
+	end
+
+	local plugin, instances
+	local images = { }
+
+	-- find requested plugin and instance
+    for i, p in ipairs( luci.dispatcher.context.path ) do
+        if luci.dispatcher.context.path[i] == "graph" then
+            plugin    = luci.dispatcher.context.path[i+1]
+            instances = { luci.dispatcher.context.path[i+2] }
+        end
+    end
+
+	-- no instance requested, find all instances
+	if #instances == 0 then
+		--instances = { graph.tree:plugin_instances( plugin )[1] }
+		instances = graph.tree:plugin_instances( plugin )
+		is_index = true
+
+	-- index instance requested
+	elseif instances[1] == "-" then
+		instances[1] = ""
+		is_index = true
+	end
+
+
+	-- render graphs
+	for i, inst in luci.util.vspairs( instances ) do
+		for i, img in luci.util.vspairs( graph:render( plugin, inst, is_index ) ) do
+			table.insert( images, graph:strippngpath( img ) )
+			images[images[#images]] = inst
+		end
+	end
+
+	luci.template.render( "public_statistics/graph", {
+		images           = images,
+		plugin           = plugin,
+		timespans        = spans,
+		current_timespan = span,
+		hosts            = hosts,
+		current_host     = host,
+		is_index         = is_index
+	} )
+end