Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-statistics / luasrc / statistics / rrdtool / definitions / ping.lua

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..b8d11c0759321ed3170e75f60751d5e03a146ed7 100644 (file)
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -3,27 +3,68 @@
 
 module("luci.statistics.rrdtool.definitions.ping", package.seeall)
 
+function item()
+       return luci.i18n.translate("Ping")
+end
+
 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 = {
-                       sources = { ping = { "value" } },
-                       options = { ping__value = { noarea = true, title = "%di" } }
-               } },
 
-               -- Ping droprate
-               { title = "%H: ICMP Drop Rate", vlabel = "%",
-                 number_format = "%5.2lf %%", data = {
-                       types   = { "ping_droprate" },
-                       options = { ping_droprate = { title = "%di" } }
-               } },
+       local ping = {
+               title = "%H: ICMP Round Trip Time",
+               vlabel = "ms",
+               number_format = "%5.1lf ms",
+               data = {
+                       sources = {
+                               ping = {
+                                       "value"
+                               }
+                       },
+                       options = {
+                               ping__value = {
+                                       noarea = true,
+                                       overlay = true,
+                                       title = "%di"
+                               }
+                       }
+               }
+       }
+
+       local droprate = {
+               title = "%H: ICMP Drop Rate",
+               vlabel = "%",
+               number_format = "%5.2lf %%",
+               data = {
+                       types   = {
+                               "ping_droprate"
+                       },
+                       options = {
+                               ping_droprate = {
+                                       noarea = true,
+                                       overlay = true,
+                                       title = "%di",
+                                       transform_rpn = "100,*"
+                               }
+                       }
+               }
+       }
 
-               -- Ping standard deviation
-               { title = "%H: ICMP Standard Deviation", vlabel = "ms",
-                 number_format = "%5.2lf ms", data = {
-                       types   = { "ping_stddev" },
-                       options = { ping_stddev = { title = "%di" } }
-               } },
+       local stddev = {
+               title = "%H: ICMP Standard Deviation",
+               vlabel = "ms",
+               number_format = "%5.1lf ms",
+               data = {
+                       types   = {
+                               "ping_stddev"
+                       },
+                       options = {
+                               ping_stddev = {
+                                       noarea = true,
+                                       overlay = true,
+                                       title = "%di"
+                               }
+                       }
+               }
        }
+
+       return { ping, droprate, stddev }
 end