summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-statistics/luasrc/statistics
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2019-01-21 14:05:57 +0100
committerFlorian Eckert <fe@dev.tdt.de>2019-01-21 14:42:01 +0100
commitd78f79a404db4610a9a92ca44e9258a02ee4a53c (patch)
tree715494a3139fcd84c78d4e28dcbfb3fa15d60167 /applications/luci-app-statistics/luasrc/statistics
parenta86c068870dea59844a282ca43885ef4fcbfa07f (diff)
luci-app-statistics: fix whitespaces in rrdtool definitions
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'applications/luci-app-statistics/luasrc/statistics')
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua7
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua5
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua14
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua12
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua41
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua1
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua19
12 files changed, 51 insertions, 53 deletions
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
index 9f7a51a868..37055f5861 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
index fbc47731ef..5212b736e2 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/conntrack.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua
index 89a65a6b5f..2bbdfb08fb 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/curl.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
index 8aabb7f64e..b6f7d6d5f8 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/disk.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
index a612126ed0..f485048538 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/netlink.lua
@@ -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
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
index a69469568e..481557bb7f 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/olsrd.lua
@@ -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",
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 6ecdb5c8ad..5b575bfff2 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
index 62d0545973..010ac1cd2e 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -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
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua
index f8bddb96e3..b3119234a4 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/sensors.lua
@@ -4,6 +4,7 @@
module("luci.statistics.rrdtool.definitions.sensors", package.seeall)
function rrdargs( graph, plugin, plugin_instance )
+
return {
{
per_instance = true,
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
index 65fba5299d..1a192ae6a6 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/splash_leases.lua
@@ -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
+ 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
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
index 50a9470de5..7e7ed238f4 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/tcpconns.lua
@@ -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",
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
index 077ec57e83..a50e78491f 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
@@ -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