applications/luci-statistics: rework handling of index and detail graphs

Instead of coding the display logic into the graph models, simply annotate
graph models with .detail = true/false and let the renderer decide which
to pick when.

applications/luci-statistics/luasrc/statistics/rrdtool.lua

@@ -513,7 +513,7 @@ function Graph.render( self, plugin, plugin_instance, is_index )
 
 		-- get diagram definitions
 		for i, opts in ipairs( self:_forcelol( def.rrdargs( self, plugin, plugin_instance, nil, is_index ) ) ) do
-
+			if not is_index or not opts.detail then
 				_images[i] = { }
 
 				-- get diagram definition instances
@@ -521,7 +521,6 @@ function Graph.render( self, plugin, plugin_instance, is_index )
 
 				-- render all diagrams
 				for j, def in ipairs( diagrams ) do
-
 					-- remember image
 					_images[i][j] = def[1]
 
@@ -529,6 +528,7 @@ function Graph.render( self, plugin, plugin_instance, is_index )
 					self:_rrdtool( def )
 				end
 			end
+		end
 
 		-- remember images - XXX: fixme (will cause probs with asymmetric data)
 		for y = 1, #_images[1] do

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/disk.lua

@@ -49,6 +49,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 			vlabel = "Bytes/s",
 			number_format = "%5.1lf%sB/s",
 
+			detail = true,
+
 			data = {
 				types = { "disk_octets" },
 				sources = {

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua

@@ -53,7 +53,7 @@ function rrdargs( graph, plugin, plugin_instance )
 	--
 	local packets = {
 		title = "%H: Netlink - Packets on %pi",
-		vlabel = "Packets/s",
+		vlabel = "Packets/s", detail = true,
 
 		-- diagram data description
 		data = {
@@ -123,7 +123,7 @@ function rrdargs( graph, plugin, plugin_instance )
 	--
 	local multicast = {
 		title = "%H: Netlink - Multicast on %pi",
-		vlabel = "Packets/s",
+		vlabel = "Packets/s", detail = true,
 
 		-- diagram data description
 		data = {
@@ -147,7 +147,7 @@ function rrdargs( graph, plugin, plugin_instance )
 	--
 	local collisions = {
 		title = "%H: Netlink - Collisions on %pi",
-		vlabel = "Collisions/s",
+		vlabel = "Collisions/s", detail = true,
 
 		-- diagram data description
 		data = {
@@ -171,7 +171,7 @@ function rrdargs( graph, plugin, plugin_instance )
 	--
 	local errors = {
 		title = "%H: Netlink - Errors on %pi",
-		vlabel = "Errors/s",
+		vlabel = "Errors/s", detail = true,
 
 		-- diagram data description
 		data = {

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua

@@ -15,8 +15,7 @@ module("luci.statistics.rrdtool.definitions.olsrd", package.seeall)
 
 local tree = luci.statistics.datatree.Instance()
 
-function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
-
+function rrdargs( graph, plugin, plugin_instance, dtype )
 	local g = { }
 
 	if plugin_instance == "routes" then
@@ -35,9 +34,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 	                }
         	}
 
-		if not is_index then
 		g[#g+1] = {
-				title = "%H: Average route ETX", vlabel = "ETX",
+			title = "%H: Average route ETX", vlabel = "ETX", detail = true,
 			number_format = "%5.1lf",data = {
 				instances = { "average" }, -- falls es irgendwann mal welche pro ip gibt, wie bei links, dann werden die hier excludiert
 				types = { "route_etx" },
@@ -50,7 +48,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 		}
 
 		g[#g+1] = {
-				title = "%H: Average route metric", vlabel = "metric",
+			title = "%H: Average route metric", vlabel = "metric", detail = true,
 			number_format = "%5.1lf", data = {
 				instances = { "average" }, -- falls es irgendwann mal welche pro ip gibt, wie bei links, dann werden die hier excludiert
 				types = { "route_metric" },
@@ -61,7 +59,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 				}
 			}
 		}
-		end
 
 	elseif plugin_instance == "links" then
 
@@ -80,7 +77,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 			}
 		}
 
-		if not is_index then
 		local instances = tree:data_instances(plugin, plugin_instance, "signal_quality")
 		table.sort(instances)
 
@@ -93,7 +89,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 
 			g[#g+1] = {
 				title = "%H: Signal Quality" .. " (" .. (host or "avg") ..")", vlabel = "ETX",
-				number_format = "%5.2lf", data = {
+				number_format = "%5.2lf", detail = true,
+				data = {
 					types = { "signal_quality" },
 	
 					instances = {
@@ -114,7 +111,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 				}
 			}
 		end
-		end
 
 	elseif plugin_instance == "topology" then
 
@@ -124,7 +120,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 				instances = { "" },
 	                        types = { "links" },
 				options = {
-					links = { -- or: links__value is aber egal weils eh nur eines davon gibt
+					links = {
 						color = "0000ff",
 						title = "Total number of links"
 					}
@@ -132,10 +128,10 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 			}
 	        }
 
-		if not is_index then
 		g[#g+1] = {
 			title= "%H: Average signal quality", vlabel = "n",
-				number_format = "%5.2lf", data = {
+			number_format = "%5.2lf", detail = true,
+			data = {
 				instances = { "average" }, -- exclude possible per-ip stuff
 				types = { "signal_quality" },
 				options = {
@@ -147,7 +143,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 			}
 		}
 	end
-	end
 
 	return g
 end

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/ping.lua

@@ -15,7 +15,7 @@ $Id: ping.lua 6810 2011-01-29 03:33:48Z jow $
 
 module("luci.statistics.rrdtool.definitions.ping", package.seeall)
 
-function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
+function rrdargs( graph, plugin, plugin_instance, dtype )
 	return {
 		-- Ping roundtrip time
 		{ title = "%H: ICMP Round Trip Time", vlabel = "ms",

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua

@@ -15,10 +15,10 @@ $Id$
 
 module("luci.statistics.rrdtool.definitions.processes", package.seeall)
 
-function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
+function rrdargs( graph, plugin, plugin_instance, dtype )
 
-	if is_index then 
 	return {
+		{
 			title = "%H: Processes",
 			vlabel = "Processes/s",
 			data = {
@@ -37,9 +37,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 					ps_state_zombies  = { color = "ff0000" }
 				}
 			}
-		}
-	else
-		return {
+		},
+
 		{
 			title = "%H: CPU time used by %pi",
 			vlabel = "Jiffies",
@@ -65,6 +64,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 		{
 			title = "%H: Threads and processes belonging to %pi",
 			vlabel = "Count",
+			detail = true,
 			data = {
 				sources = {
 					ps_count = { "threads", "processes" }
@@ -80,6 +80,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 		{
 			title = "%H: Page faults in %pi",
 			vlabel = "Pagefaults",
+			detail = true,
 			data = {
 				sources = {
 					ps_pagefaults = { "minflt", "majflt" }
@@ -95,6 +96,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 		{
 			title = "%H: Virtual memory size of %pi",
 			vlabel = "Bytes",
+			detail = true,
 			number_format = "%5.1lf%sB",
 			data = {
 				types = { "ps_rss" },
@@ -105,5 +107,4 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
 			}
 		}
 	}
-	end
 end

applications/luci-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua

@@ -28,9 +28,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
 					"LAST_ACK", "TIME_WAIT", "CLOSING", "CLOSE_WAIT",
 					"CLOSED", "FIN_WAIT1", "FIN_WAIT2"
 				},
-				options = { for k, v in (tcp_connections) do
-					v = { title = "%di", noarea = true }
-					end
+				options = {
+					load__ESTABLISHED = { title = "%di", noarea = true }
 				}
 			}
 		}