summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2020-04-15 10:35:59 +0100
committerKevin Darbyshire-Bryant <6500011+ldir-EDB0@users.noreply.github.com>2020-05-05 12:02:01 +0100
commit9c4f3454d23dc8edd81d9ad7462a2e51d7ca3c3f (patch)
tree49e84724d43c2cfbc9ba91924ca9443e19ec9d04 /applications
parent4259b5ee1f324e47ac7b5699456aa99d73bd9965 (diff)
luci-app-statistics: add graphs for sqm-collect
Add graphs for sqm data collected by 'sqm_collect.sh' An overall sqm graph displays bandwidth (Kb/s), Backlog (Bytes) and drops for each supported qdisc. Sqm-cake supports cake's tin structure and displays many(!) graphs per tin: Bandwidth: Bandwidth (Kb/s), bandwidth threshold (Kb/s). Latency: Target latency, Peak, Average, Sparse flow latency Backlog v Drops: Backlog (Bytes), Drops, ECN marks, Ack-filter drops Flow counts: Sparse flows, Bulk flows, Unresponsive flows Fun for all the family :-) Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqm.js28
-rw-r--r--applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqmcake.js78
-rw-r--r--applications/luci-app-statistics/root/etc/config/luci_statistics6
3 files changed, 112 insertions, 0 deletions
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqm.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqm.js
new file mode 100644
index 000000000..bde179602
--- /dev/null
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqm.js
@@ -0,0 +1,28 @@
+/* Licensed to the public under the Apache License 2.0. */
+
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+ title: _('SQM'),
+
+ rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
+ var overview = {
+ per_instance: false,
+ title: "%H: SQM qdisc %pi Overview",
+ rrdopts: [ "--logarithmic" ],
+ vlabel: " ",
+ alt_autoscale: true,
+ number_format: "%5.0lf",
+ data: {
+ types: [ "qdisc_bytes", "qdisc_backlog", "qdisc_drops" ],
+ options: {
+ qdisc_bytes: { title: "kb/s:", overlay: true, noarea: false, color: "0000ff", transform_rpn: "125,/" },
+ qdisc_backlog: { title: "Backlog/B:", overlay: true, noarea: true, color: "8000ff" },
+ qdisc_drops: { title: "Drops/s:", overlay: true, noarea: true, color: "00ffff", }
+ }
+ }
+ };
+ return [ overview ];
+ }
+});
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqmcake.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqmcake.js
new file mode 100644
index 000000000..a45c43af4
--- /dev/null
+++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sqmcake.js
@@ -0,0 +1,78 @@
+/* Licensed to the public under the Apache License 2.0. */
+
+'use strict';
+'require baseclass';
+
+return baseclass.extend({
+ title: _('SQM-Cake'),
+
+ rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
+ var tindrops = {
+ per_instance: true,
+ title: "%H: CAKE %pi %di Drops/s & Backlog",
+ vlabel: "Bytes & Drops/s",
+ rrdopts: [ "--logarithmic" ],
+ number_format: "%5.0lf",
+ data: {
+ types: [ "qdisct_backlog", "qdisct_drops" ],
+ sources: { qdisct_drops: [ "ack", "drops", "ecn" ] },
+ options: {
+ qdisct_backlog: { title: "Backlog:", overlay: true, color: "0000ff" },
+ qdisct_drops__ack: { title: "Ack:", overlay: true, noarea: true, color: "ff00ff" },
+ qdisct_drops__drops: { title: "Drops:", overlay: true, noarea: true, color: "00ffff" },
+ qdisct_drops__ecn: { title: "Ecn:", overlay: true, noarea: true, color: "00ff00" }
+ }
+ }
+ };
+
+ var tinlatency = {
+ per_instance: true,
+ title: "%H: CAKE %pi %di Latency",
+ vlabel: "ms",
+ number_format: "%4.3lf",
+ data: {
+ types: [ "qdisct_latencyus" ],
+ sources: { qdisct_latencyus: [ "tg", "pk", "av", "sp" ] },
+ options: {
+ qdisct_latencyus__tg: { title: "Target:", overlay: true, noarea: true, color: "000000", transform_rpn: "1000,/" },
+ qdisct_latencyus__pk: { title: "Peak:", overlay: true, noarea: true, color: "ff0000", transform_rpn: "1000,/" },
+ qdisct_latencyus__av: { title: "Avg:", overlay: true, noarea: true, color: "00ff00", transform_rpn: "1000,/" },
+ qdisct_latencyus__sp: { title: "Sparse:", overlay: true, noarea: true, color: "0000ff", transform_rpn: "1000,/" }
+ }
+ }
+ };
+
+ var tinflows = {
+ per_instance: true,
+ title: "%H: CAKE %pi %di Flow Counts",
+ vlabel: "Flows",
+ number_format: "%4.0lf",
+ data: {
+ types: [ "qdisct_flows" ],
+ sources: { qdisct_flows: [ "sp", "bu", "un" ] },
+ options: {
+ qdisct_flows__sp: { title: "Sparse:", overlay: true, noarea: true, color: "00ff00" },
+ qdisct_flows__bu: { title: "Bulk:", overlay: true, noarea: true, color: "0000ff" },
+ qdisct_flows__un: { title: "Unresponsive:", overlay: true, noarea: true, color: "ff0000" }
+ }
+ }
+ };
+
+ var tinbytes = {
+ per_instance: true,
+ title: "%H: CAKE %pi %di Traffic",
+ vlabel: "Kb/s",
+ number_format: "%5.0lf",
+ rrdopts: [ "--logarithmic" ],
+ data: {
+ types: [ "qdisct_bytes", "qdisct_thres" ],
+ options: {
+ qdisct_bytes: { title: "Kb/s:", noarea: false, color: "0000ff", transform_rpn: "125,/" },
+ qdisct_thres: { title: "Thres:", overlay: true, noarea: true, color: "000000", transform_rpn: "125,/" }
+ }
+ }
+ };
+
+ return [ tinbytes, tinlatency, tindrops, tinflows ];
+ }
+});
diff --git a/applications/luci-app-statistics/root/etc/config/luci_statistics b/applications/luci-app-statistics/root/etc/config/luci_statistics
index c2f27c2a5..71bbfa445 100644
--- a/applications/luci-app-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-app-statistics/root/etc/config/luci_statistics
@@ -97,6 +97,12 @@ config statistics 'collectd_entropy'
config statistics 'collectd_exec'
option enable '0'
+#example for sqm_collect plugin
+#config collectd_exec_input
+# option cmduser 'nobody'
+# option cmdgroup 'nogroup'
+# option cmdline '/usr/libexec/collectd/sqm_collectd.sh eth0 ifb4eth0'
+
config statistics 'collectd_interface'
option enable '1'
option Interfaces 'br-lan'