luci-app-statistics: improve diagram generation, add missing title

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

1 files changed, 24 insertions, 10 deletions

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
index b4f2ac185e..9e879a44a6 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
@@ -22,11 +22,13 @@ function rrdargs( graph, plugin, plugin_instance )
 			-- special options for single data lines
 			options = {
 				if_octets__tx = {
+					title = "Bytes (TX)",
 					total = true,		-- report total amount of bytes
 					color = "00ff00"	-- tx is green
 				},
 
 				if_octets__rx = {
+					title = "Bytes (RX)",
 					flip  = true,		-- flip rx line
 					total = true,		-- report total amount of bytes
 					color = "0000ff"	-- rx is blue
@@ -59,6 +61,7 @@ function rrdargs( graph, plugin, plugin_instance )
 			options = {
 				-- processed packets (tx DS)
 				if_packets__tx = {
+					title   = "Total   (TX)",
 					overlay = true,		-- don't summarize
 					total   = true,		-- report total amount of bytes
 					color   = "00ff00"	-- processed tx is green
@@ -66,6 +69,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
 				-- processed packets (rx DS)
 				if_packets__rx = {
+					title   = "Total   (RX)",
 					overlay = true,		-- don't summarize
 					flip    = true,		-- flip rx line
 					total   = true,		-- report total amount of bytes
@@ -74,6 +78,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
 				-- dropped packets (tx DS)
 				if_dropped__tx = {
+					title   = "Dropped (TX)",
 					overlay = true,		-- don't summarize
 					total   = true,		-- report total amount of bytes
 					color   = "660055"	-- dropped tx is ... dunno ;)
@@ -81,14 +86,16 @@ function rrdargs( graph, plugin, plugin_instance )
 
 				-- dropped packets (rx DS)
 				if_dropped__rx = {
+					title   = "Dropped (RX)",
 					overlay = true,		-- don't summarize
 					flip    = true,		-- flip rx line
 					total   = true,		-- report total amount of bytes
-					color   = "440066"	-- dropped rx is violett
+					color   = "ff00ff"	-- dropped rx is violett
 				},
 
 				-- packet errors (tx DS)
 				if_errors__tx = {
+					title   = "Errors  (TX)",
 					overlay = true,		-- don't summarize
 					total   = true,		-- report total amount of packets
 					color   = "ff5500"	-- tx errors are orange
@@ -96,6 +103,7 @@ function rrdargs( graph, plugin, plugin_instance )
 
 				-- packet errors (rx DS)
 				if_errors__rx = {
+					title   = "Errors  (RX)",
 					overlay = true,		-- don't summarize
 					flip    = true,		-- flip rx line
 					total   = true,		-- report total amount of packets
@@ -122,6 +130,7 @@ function rrdargs( graph, plugin, plugin_instance )
 			options = {
 				-- multicast packets
 				if_multicast = {
+					title = "Packets",
 					total = true,		-- report total amount of packets
 					color = "0000ff"	-- multicast is blue
 				}
@@ -146,6 +155,7 @@ function rrdargs( graph, plugin, plugin_instance )
 			options = {
 				-- collision rate
 				if_collisions = {
+					title = "Collisions",
 					total = true,		-- report total amount of packets
 					color = "ff0000"	-- collsions are red
 				}
@@ -173,15 +183,19 @@ function rrdargs( graph, plugin, plugin_instance )
 			},
 
 			-- special options for single data lines
-			options = {	-- XXX: fixme (define colors...)
-				if_tx_errors = {
-					total = true
-				},
-
-				if_rx_errors = {
-					flip  = true,
-					total = true
-				}
+			options = {
+				if_tx_errors_aborted_value   = { total = true, color = "ffff00", title = "Aborted   (TX)" },
+				if_tx_errors_carrier_value   = { total = true, color = "ffcc00", title = "Carrier   (TX)" },
+				if_tx_errors_fifo_value      = { total = true, color = "ff9900", title = "Fifo      (TX)" },
+				if_tx_errors_heartbeat_value = { total = true, color = "ff6600", title = "Heartbeat (TX)" },
+				if_tx_errors_window_value    = { total = true, color = "ff3300", title = "Window    (TX)" },
+
+				if_rx_errors_length_value    = { flip = true, total = true, color = "ff0000", title = "Length    (RX)" },
+				if_rx_errors_missed_value    = { flip = true, total = true, color = "ff0033", title = "Missed    (RX)" },
+				if_rx_errors_over_value      = { flip = true, total = true, color = "ff0066", title = "Over      (RX)" },
+				if_rx_errors_crc_value       = { flip = true, total = true, color = "ff0099", title = "CRC       (RX)" },
+				if_rx_errors_fifo_value      = { flip = true, total = true, color = "ff00cc", title = "Fifo      (RX)" },
+				if_rx_errors_frame_value     = { flip = true, total = true, color = "ff00ff", title = "Frame     (RX)" }
 			}
 		}
 	}