luci-app-statistics: Adjust ping graphs to show target hosts separately

Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).

Clarify the plugin definition with some additional line spacing.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 53d767de5ea8c596936fbf0bddce357efe0c4425)

diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index 347d756f7c592469ec714874a5dea22389419c69..f0a59481695e797ef9e61a49db4dd5f1772acf9e 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -6,24 +6,33 @@ module("luci.statistics.rrdtool.definitions.ping", package.seeall)
 function rrdargs( graph, plugin, plugin_instance, dtype )
        return {
                -- Ping roundtrip time
-               { title = "%H: ICMP Round Trip Time", vlabel = "ms",
-                 number_format = "%5.1lf ms", data = {
+               { title = "%H: ICMP Round Trip Time",
+                 vlabel = "ms",
+                 number_format = "%5.1lf ms",
+                 data = {
                        sources = { ping = { "value" } },
-                       options = { ping__value = { noarea = true, title = "%di" } }
+                       options = { ping__value = {
+                               noarea = true, overlay = true, title = "%di" } }
                } },
 
                -- Ping droprate
-               { title = "%H: ICMP Drop Rate", vlabel = "%",
-                 number_format = "%5.2lf %%", data = {
+               { title = "%H: ICMP Drop Rate",
+                 vlabel = "%",
+                 number_format = "%5.2lf %%",
+                 data = {
                        types   = { "ping_droprate" },
-                       options = { ping_droprate = { title = "%di" } }
+                       options = { ping_droprate = {
+                               noarea = true, overlay = true, title = "%di" } }
                } },
 
                -- Ping standard deviation
-               { title = "%H: ICMP Standard Deviation", vlabel = "ms",
-                 number_format = "%5.2lf ms", data = {
+               { title = "%H: ICMP Standard Deviation",
+                 vlabel = "ms",
+                 number_format = "%5.2lf ms",
+                 data = {
                        types   = { "ping_stddev" },
-                       options = { ping_stddev = { title = "%di" } }
+                       options = { ping_stddev = {
+                               noarea = true, overlay = true, title = "%di" } }
                } },
        }
 end