Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-statistics: fix whitespaces in rrdtool definitions

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
View file

@ -19,8 +19,7 @@ function rrdargs( graph, plugin, plugin_instance )
ups_inst[t] = graph.tree:data_instances( plugin, plugin_instance, t )
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 )
for _, v in pairs(t) do
@ -57,8 +56,8 @@ function rrdargs( graph, plugin, plugin_instance )
end
-- Graph definitions for APC UPS measurements MUST use only 'instances':
-- e.g. instances = { voltage = { "input", "output" } }
-- Graph definitions for APC UPS measurements MUST use only 'instances':
-- e.g. instances = { voltage = { "input", "output" } }
local voltagesdc = {
title = "%H: Voltages on APC UPS - Battery",

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
View file

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

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua
View file

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

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
View file

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

5
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
View file

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

14
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
View file

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

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
View file

@ -4,6 +4,7 @@
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",

12
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
View file

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

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua
View file

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

43
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
View file

@ -1,27 +1,26 @@
-- Copyright 2013 Freifunk Augsburg / Michael Wendland <michael@michiwend.com>
-- Licensed to the public under the Apache License 2.0.
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

1
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
View file

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

19
applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
View file

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