Add support for collectd-mod-uptime to luci-statistics

collectd-mod-uptime is already there, but there has been no Luci support for
it, so no graphs are shown.

Based on forum discussion (see
https://forum.openwrt.org/viewtopic.php?id=42478 ), I submit a patch to add
the support to luci-statistics.

Patch is for Luci trunk and the functionality can be enabled by selecting
collectd-mod-uptime in menuconfig.

signed-off-by: hannu.nyman@iki.fi

5 files changed, 61 insertions, 2 deletions

diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index d69b68e17..1f2016490 100644
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -55,13 +55,14 @@ function index()
 		processes	= _("Processes"),
 		rrdtool		= _("RRDTool"),
 		tcpconns	= _("TCP Connections"),
-		unixsock	= _("UnixSock")
+		unixsock	= _("UnixSock"),
+		uptime		= _("Uptime")
 	}
 
 	-- our collectd menu
 	local collectd_menu = {
 		output  = { "csv", "network", "rrdtool", "unixsock" },
-		system  = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "nut", "processes" },
+		system  = { "cpu", "df", "disk", "email", "exec", "irq", "load", "memory", "nut", "processes", "uptime" },
 		network = { "conntrack", "dns", "interface", "iptables", "netlink", "olsrd", "ping", "tcpconns", "iwinfo" }
 	}
 
diff --git a/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
new file mode 100644
index 000000000..3a6c4644e
--- /dev/null
+++ b/applications/luci-statistics/luasrc/model/cbi/luci_statistics/uptime.lua
@@ -0,0 +1,22 @@
+--[[
+
+Copyright 2013 Thomas Endt <tmo26@gmx.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+m = Map("luci_statistics",
+        translate("Uptime Plugin Configuration"),
+        translate("The uptime plugin collects statistics about the uptime of the system."))
+
+s = m:section( NamedSection, "collectd_uptime", "luci_statistics" )
+
+enable = s:option( Flag, "enable", translate("Enable this plugin") )
+enable.default = 0
+
+return m
+
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
new file mode 100644
index 000000000..077ec57e8
--- /dev/null
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/uptime.lua
@@ -0,0 +1,27 @@
+--[[
+
+Copyright 2013 Thomas Endt <tmo26@gmx.de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+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 }
+                        }
+                }
+        }
+
+end
+
diff --git a/applications/luci-statistics/root/etc/config/luci_statistics b/applications/luci-statistics/root/etc/config/luci_statistics
index 5267a0262..1bbe76ce2 100644
--- a/applications/luci-statistics/root/etc/config/luci_statistics
+++ b/applications/luci-statistics/root/etc/config/luci_statistics
@@ -135,3 +135,6 @@ config 'statistics' 'collectd_iwinfo'
 config 'statistics' 'collectd_nut'
 	option 'enable' '0'
 	option 'UPS' 'myupsname'
+
+config 'statistics' 'collectd_uptime'
+	option 'enable' '1'
diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig
index 0a9fa1ab3..46d23a67a 100755
--- a/applications/luci-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-statistics/root/usr/bin/stat-genconfig
@@ -399,6 +399,12 @@ plugins = {
 		{ }
 	},
 
+	uptime = {
+		{ },
+		{ },
+		{ }
+	},
+
 	wireless = {
 		{ },
 		{ },