From 78c61d6de000c0839dda6da4f9ec5e1e6bdc98ac Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 5 Oct 2015 19:11:51 +0200 Subject: [PATCH] luci-app-statistics: reorder interface, netlink and openvpn datasources This aligns the order and grouping of RX and TX network datasources. Signed-off-by: Jo-Philipp Wich --- .../statistics/rrdtool/definitions/interface.lua | 12 ++++++++---- .../statistics/rrdtool/definitions/netlink.lua | 6 ++++++ .../statistics/rrdtool/definitions/openvpn.lua | 16 ++++++++-------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua index efa631d557..6f687d218d 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/interface.lua @@ -66,36 +66,40 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- processed packets (tx DS) if_packets__tx = { + weight = 1, overlay = true, -- don't summarize total = true, -- report total amount of bytes color = "00ff00", -- processed tx is green - title = "Processed (tx)" + title = "Processed (TX)" }, -- processed packets (rx DS) if_packets__rx = { + weight = 2, overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of bytes color = "0000ff", -- processed rx is blue - title = "Processed (rx)" + title = "Processed (RX)" }, -- packet errors (tx DS) if_errors__tx = { + weight = 0, overlay = true, -- don't summarize total = true, -- report total amount of packets color = "ff5500", -- tx errors are orange - title = "Errors (tx)" + title = "Errors (TX)" }, -- packet errors (rx DS) if_errors__rx = { + weight = 3, overlay = true, -- don't summarize flip = true, -- flip rx line total = true, -- report total amount of packets color = "ff0000", -- rx errors are red - title = "Errors (rx)" + title = "Errors (RX)" } } } 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 9e879a44a6..7b6acf3663 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua @@ -61,6 +61,7 @@ function rrdargs( graph, plugin, plugin_instance ) options = { -- processed packets (tx DS) if_packets__tx = { + weight = 2, title = "Total (TX)", overlay = true, -- don't summarize total = true, -- report total amount of bytes @@ -69,6 +70,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- processed packets (rx DS) if_packets__rx = { + weight = 3, title = "Total (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line @@ -78,6 +80,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- dropped packets (tx DS) if_dropped__tx = { + weight = 1, title = "Dropped (TX)", overlay = true, -- don't summarize total = true, -- report total amount of bytes @@ -86,6 +89,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- dropped packets (rx DS) if_dropped__rx = { + weight = 4, title = "Dropped (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line @@ -95,6 +99,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- packet errors (tx DS) if_errors__tx = { + weight = 0, title = "Errors (TX)", overlay = true, -- don't summarize total = true, -- report total amount of packets @@ -103,6 +108,7 @@ function rrdargs( graph, plugin, plugin_instance ) -- packet errors (rx DS) if_errors__rx = { + weight = 5, title = "Errors (RX)", overlay = true, -- don't summarize flip = true, -- flip rx line diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua index 50efddbc2b..876e871d1d 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/openvpn.lua @@ -18,10 +18,10 @@ function rrdargs( graph, plugin, plugin_instance ) if_octets = { "tx", "rx" } }, options = { - if_octets_traffic_tx = { title = "Bytes (TX)", total = true, color = "00ff00" }, - if_octets_overhead_tx = { title = "Overhead (TX)", total = true, color = "ff9900" }, - if_octets_traffic_rx = { title = "Bytes (RX)", total = true, flip = true, color = "0000ff" }, - if_octets_overhead_rx = { title = "Overhead (RX)", total = true, flip = true, color = "ff00ff" } + if_octets_traffic_tx = { weight = 0, title = "Bytes (TX)", total = true, color = "00ff00" }, + if_octets_overhead_tx = { weight = 1, title = "Overhead (TX)", total = true, color = "ff9900" }, + if_octets_overhead_rx = { weight = 2, title = "Overhead (RX)", total = true, flip = true, color = "ff00ff" }, + if_octets_traffic_rx = { weight = 3, title = "Bytes (RX)", total = true, flip = true, color = "0000ff" } } } }, @@ -37,10 +37,10 @@ function rrdargs( graph, plugin, plugin_instance ) compression = { "uncompressed", "compressed" } }, options = { - compression_data_out_compressed = { title = "Compressed (TX)", total = true, color = "008800" }, - compression_data_out_uncompressed = { title = "Uncompressed (TX)", total = true, color = "00ff00" }, - compression_data_in_compressed = { title = "Compressed (RX)", total = true, flip = true, color = "000088" }, - compression_data_in_uncompressed = { title = "Uncompressed (RX)", total = true, flip = true, color = "0000ff" } + compression_data_out_uncompressed = { weight = 0, title = "Uncompressed (TX)", total = true, color = "00ff00" }, + compression_data_out_compressed = { weight = 1, title = "Compressed (TX)", total = true, color = "008800" }, + compression_data_in_compressed = { weight = 2, title = "Compressed (RX)", total = true, flip = true, color = "000088" }, + compression_data_in_uncompressed = { weight = 3, title = "Uncompressed (RX)", total = true, flip = true, color = "0000ff" } } } } -- 2.30.2