diff options
Diffstat (limited to 'applications/luci-statistics/src/statistics')
11 files changed, 36 insertions, 36 deletions
diff --git a/applications/luci-statistics/src/statistics/datatree.lua b/applications/luci-statistics/src/statistics/datatree.lua index 99e7e44425..957b230a96 100644 --- a/applications/luci-statistics/src/statistics/datatree.lua +++ b/applications/luci-statistics/src/statistics/datatree.lua @@ -1,9 +1,9 @@ -module("ffluci.statistics.datatree", package.seeall) +module("luci.statistics.datatree", package.seeall) -local util = require("ffluci.util") -local sys = require("ffluci.sys") -local fs = require("ffluci.fs") -local uci = require("ffluci.model.uci").Session() +local util = require("luci.util") +local sys = require("luci.sys") +local fs = require("luci.fs") +local uci = require("luci.model.uci").Session() local sections, names = uci:sections( "luci_statistics" ) diff --git a/applications/luci-statistics/src/statistics/rrdtool.lua b/applications/luci-statistics/src/statistics/rrdtool.lua index 97772cc38f..b399866a85 100644 --- a/applications/luci-statistics/src/statistics/rrdtool.lua +++ b/applications/luci-statistics/src/statistics/rrdtool.lua @@ -1,23 +1,23 @@ -module("ffluci.statistics.rrdtool", package.seeall) +module("luci.statistics.rrdtool", package.seeall) -require("ffluci.statistics.datatree") -require("ffluci.statistics.rrdtool.colors") -require("ffluci.statistics.rrdtool.definitions") -require("ffluci.util") -require("ffluci.bits") -require("ffluci.fs") +require("luci.statistics.datatree") +require("luci.statistics.rrdtool.colors") +require("luci.statistics.rrdtool.definitions") +require("luci.util") +require("luci.bits") +require("luci.fs") -Graph = ffluci.util.class() +Graph = luci.util.class() function Graph.__init__( self, timespan, opts ) opts = opts or { } opts.width = opts.width or "400" - self.colors = ffluci.statistics.rrdtool.colors.Instance() - self.defs = ffluci.statistics.rrdtool.definitions.Instance() - self.tree = ffluci.statistics.datatree.Instance() + self.colors = luci.statistics.rrdtool.colors.Instance() + self.defs = luci.statistics.rrdtool.definitions.Instance() + self.tree = luci.statistics.datatree.Instance() -- rrdtool defalt args self.args = { @@ -77,7 +77,7 @@ function Graph._rrdtool( self, png, rrd ) -- prepare directory local dir = png:gsub("/[^/]+$","") - ffluci.fs.mkdir( dir, true ) + luci.fs.mkdir( dir, true ) -- construct commandline local cmdline = "rrdtool graph " .. png @@ -195,7 +195,7 @@ function Graph.render( self, host, plugin, plugin_instance ) local pngs = { } -- check for a whole graph handler - local plugin_def = "ffluci.statistics.rrdtool.definitions." .. plugin + local plugin_def = "luci.statistics.rrdtool.definitions." .. plugin local stat, def = pcall( require, plugin_def ) if stat and def and type(def.rrdargs) == "function" then diff --git a/applications/luci-statistics/src/statistics/rrdtool/colors.lua b/applications/luci-statistics/src/statistics/rrdtool/colors.lua index cd1e52d199..cdd6f71057 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/colors.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/colors.lua @@ -1,16 +1,16 @@ -module("ffluci.statistics.rrdtool.colors", package.seeall) +module("luci.statistics.rrdtool.colors", package.seeall) -require("ffluci.util") -require("ffluci.bits") +require("luci.util") +require("luci.bits") -Instance = ffluci.util.class() +Instance = luci.util.class() function Instance.from_string( self, s ) return { - ffluci.bits.Hex2Dec(s:sub(1,2)), - ffluci.bits.Hex2Dec(s:sub(3,4)), - ffluci.bits.Hex2Dec(s:sub(5,6)) + luci.bits.Hex2Dec(s:sub(1,2)), + luci.bits.Hex2Dec(s:sub(3,4)), + luci.bits.Hex2Dec(s:sub(5,6)) } end diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua index 9d06fa4b6d..add69e4b64 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions.lua @@ -1,10 +1,10 @@ -module("ffluci.statistics.rrdtool.definitions", package.seeall) +module("luci.statistics.rrdtool.definitions", package.seeall) -require("ffluci.util") -require("ffluci.fs") +require("luci.util") +require("luci.fs") -Instance = ffluci.util.class() +Instance = luci.util.class() function Instance.__init__( self, ... ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua index 557c5dafe1..2626d276d1 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/cpu/cpu.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.cpu.cpu",package.seeall) +module("luci.statistics.rrdtool.definitions.cpu.cpu",package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua index 1b45e25a91..b16add995d 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/iptables/ipt_packets.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall) +module("luci.statistics.rrdtool.definitions.iptables.ipt_packets", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua index de3924dc74..3cee6abc00 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/netlink.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.netlink", package.seeall) +module("luci.statistics.rrdtool.definitions.netlink", package.seeall) function rrdargs( graph, host, plugin, plugin_instance ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua index 48a5673ada..b041c015da 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/ping/ping.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.ping.ping", package.seeall) +module("luci.statistics.rrdtool.definitions.ping.ping", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua index 4261e09890..07cbe1d4af 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/processes/ps_state.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.processes.ps_state", package.seeall) +module("luci.statistics.rrdtool.definitions.processes.ps_state", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua index 81860d0990..0493574948 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/tcpconns/tcp_connections.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall) +module("luci.statistics.rrdtool.definitions.tcpconns.tcp_connections", package.seeall) function rrdargs( graph, host, plugin, plugin_instance, dtype ) diff --git a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua index 5b3acc51f8..e315ca5210 100644 --- a/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua +++ b/applications/luci-statistics/src/statistics/rrdtool/definitions/wireless.lua @@ -1,4 +1,4 @@ -module("ffluci.statistics.rrdtool.definitions.wireless", package.seeall) +module("luci.statistics.rrdtool.definitions.wireless", package.seeall) function rrdargs( graph, host, plugin, plugin_instance ) |