luci-app-statistics: fix whitespaces in rrdtool definitions

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2019-01-21 14:05:57 +01:00
parent a86c068870
commit d78f79a404
12 changed files with 52 additions and 54 deletions

View file

@ -19,8 +19,7 @@ function rrdargs( graph, plugin, plugin_instance )
ups_inst[t] = graph.tree:data_instances( plugin, plugin_instance, t ) ups_inst[t] = graph.tree:data_instances( plugin, plugin_instance, t )
end end
-- Check if hash table or array is empty or nil-filled
-- Check if hash table or array is empty or nil-filled
local function empty( t ) local function empty( t )
for _, v in pairs(t) do for _, v in pairs(t) do
@ -57,8 +56,8 @@ function rrdargs( graph, plugin, plugin_instance )
end end
-- Graph definitions for APC UPS measurements MUST use only 'instances': -- Graph definitions for APC UPS measurements MUST use only 'instances':
-- e.g. instances = { voltage = { "input", "output" } } -- e.g. instances = { voltage = { "input", "output" } }
local voltagesdc = { local voltagesdc = {
title = "%H: Voltages on APC UPS - Battery", title = "%H: Voltages on APC UPS - Battery",

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.conntrack",package.seeall) module("luci.statistics.rrdtool.definitions.conntrack",package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
title = "%H: Conntrack entries", title = "%H: Conntrack entries",
vlabel = "Count", vlabel = "Count",

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.curl", package.seeall) module("luci.statistics.rrdtool.definitions.curl", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
title = "%H: cUrl Response Time for #%pi", title = "%H: cUrl Response Time for #%pi",
y_min = "0", y_min = "0",

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.disk", package.seeall) module("luci.statistics.rrdtool.definitions.disk", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
{ {
title = "%H: Disk I/O operations on %pi", title = "%H: Disk I/O operations on %pi",

View file

@ -37,7 +37,6 @@ function rrdargs( graph, plugin, plugin_instance )
} }
} }
-- --
-- packet diagram -- packet diagram
-- --
@ -119,7 +118,6 @@ function rrdargs( graph, plugin, plugin_instance )
} }
} }
-- --
-- multicast diagram -- multicast diagram
-- --
@ -144,7 +142,6 @@ function rrdargs( graph, plugin, plugin_instance )
} }
} }
-- --
-- collision diagram -- collision diagram
-- --
@ -169,7 +166,6 @@ function rrdargs( graph, plugin, plugin_instance )
} }
} }
-- --
-- error diagram -- error diagram
-- --
@ -206,6 +202,5 @@ function rrdargs( graph, plugin, plugin_instance )
} }
} }
return { traffic, packets, multicast, collisions, errors } return { traffic, packets, multicast, collisions, errors }
end end

View file

@ -9,18 +9,18 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
if plugin_instance == "routes" then if plugin_instance == "routes" then
g[#g+1] = { g[#g+1] = {
-- diagram data description -- diagram data description
title = "%H: Total amount of OLSR routes", vlabel = "n", title = "%H: Total amount of OLSR routes", vlabel = "n",
number_format = "%5.0lf", data = { number_format = "%5.0lf", data = {
types = { "routes" }, types = { "routes" },
options = { options = {
routes = { routes = {
color = "ff0000", color = "ff0000",
title = "Total number of routes" title = "Total number of routes"
} }
} }
} }
} }
g[#g+1] = { g[#g+1] = {
title = "%H: Average route ETX", vlabel = "ETX", detail = true, title = "%H: Average route ETX", vlabel = "ETX", detail = true,
@ -80,7 +80,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
number_format = "%5.2lf", detail = true, number_format = "%5.2lf", detail = true,
data = { data = {
types = { "signal_quality" }, types = { "signal_quality" },
instances = { instances = {
signal_quality = { instances[i], instances[i+1] }, signal_quality = { instances[i], instances[i+1] },
}, },
@ -106,7 +106,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
title= "%H: Total amount of OLSR links", vlabel = "n", title= "%H: Total amount of OLSR links", vlabel = "n",
number_format = "%5.0lf", data = { number_format = "%5.0lf", data = {
instances = { "" }, instances = { "" },
types = { "links" }, types = { "links" },
options = { options = {
links = { links = {
color = "0000ff", color = "0000ff",
@ -114,7 +114,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
} }
} }
} }
} }
g[#g+1] = { g[#g+1] = {
title= "%H: Average signal quality", vlabel = "n", title= "%H: Average signal quality", vlabel = "n",

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.ping", package.seeall) module("luci.statistics.rrdtool.definitions.ping", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
-- Ping roundtrip time -- Ping roundtrip time
{ title = "%H: ICMP Round Trip Time", { title = "%H: ICMP Round Trip Time",

View file

@ -5,8 +5,8 @@ module("luci.statistics.rrdtool.definitions.processes", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
if plugin_instance == "" then if plugin_instance == "" then
return { return {
title = "%H: Processes", title = "%H: Processes",
vlabel = "Processes/s", vlabel = "Processes/s",
data = { data = {
@ -26,9 +26,9 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
ps_state_zombies = { color = "ff0000", title = "Zombies" } ps_state_zombies = { color = "ff0000", title = "Zombies" }
} }
} }
} }
else else
return { return {
{ {
title = "%H: CPU time used by %pi", title = "%H: CPU time used by %pi",
vlabel = "Jiffies", vlabel = "Jiffies",
@ -113,5 +113,5 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
} }
} }
} }
end end
end end

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.sensors", package.seeall) module("luci.statistics.rrdtool.definitions.sensors", package.seeall)
function rrdargs( graph, plugin, plugin_instance ) function rrdargs( graph, plugin, plugin_instance )
return { return {
{ {
per_instance = true, per_instance = true,

View file

@ -1,27 +1,26 @@
-- Copyright 2013 Freifunk Augsburg / Michael Wendland <michael@michiwend.com> -- Copyright 2013 Freifunk Augsburg / Michael Wendland <michael@michiwend.com>
-- Licensed to the public under the Apache License 2.0. -- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.splash_leases", package.seeall) module("luci.statistics.rrdtool.definitions.splash_leases", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype )
return {
title = "%H: Splash Leases",
vlabel = "Active Clients",
y_min = "0",
number_format = "%5.1lf",
data = {
sources = {
splash_leases = { "leased", "whitelisted", "blacklisted" }
},
options = {
splash_leases__leased = { color = "00CC00", title = "Leased", overlay = false },
splash_leases__whitelisted = { color = "0000FF", title = "Whitelisted", overlay = false },
splash_leases__blacklisted = { color = "FF0000", title = "Blacklisted", overlay = false }
}
}
}
end function rrdargs( graph, plugin, plugin_instance, dtype )
return {
title = "%H: Splash Leases",
vlabel = "Active Clients",
y_min = "0",
number_format = "%5.1lf",
data = {
sources = {
splash_leases = { "leased", "whitelisted", "blacklisted" }
},
options = {
splash_leases__leased = { color = "00CC00", title = "Leased", overlay = false },
splash_leases__whitelisted = { color = "0000FF", title = "Whitelisted", overlay = false },
splash_leases__blacklisted = { color = "FF0000", title = "Blacklisted", overlay = false }
}
}
}
end

View file

@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.tcpconns", package.seeall) module("luci.statistics.rrdtool.definitions.tcpconns", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
title = "%H: TCP connections to port %pi", title = "%H: TCP connections to port %pi",
vlabel = "Connections/s", vlabel = "Connections/s",

View file

@ -13,15 +13,14 @@ module("luci.statistics.rrdtool.definitions.uptime", package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype ) function rrdargs( graph, plugin, plugin_instance, dtype )
return { return {
title = "%H: Uptime", vlabel = "seconds", title = "%H: Uptime", vlabel = "seconds",
number_format = "%5.0lf%s", data = { number_format = "%5.0lf%s", data = {
types = { "uptime" }, types = { "uptime" },
options = { options = {
uptime = { title = "Uptime %di", noarea = true } uptime = { title = "Uptime %di", noarea = true }
} }
} }
} }
end end