* luci/statistics: added diagram models for process and df plugins, adept controller to recent luci core, support models with per instance diagrams and index diagrams, added new strings to language file

3 files changed, 112 insertions, 1 deletions

diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-statistics/luasrc/statistics/rrdtool.lua
index 1fe57a2257..cdcf9ff3e4 100644
--- a/applications/luci-statistics/luasrc/statistics/rrdtool.lua
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool.lua
@@ -419,7 +419,6 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index )
 	for i, instance in ipairs(instances) do
 
 		-- store title and vlabel
-		-- XXX: i18n
 		_ti( _args, "-t" )
 		_ti( _args, opts.title  or self.i18n:title( plugin, plugin_instance, _sources[1].type, instance ) )
 		_ti( _args, "-v" )
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua
new file mode 100644
index 0000000000..a6045b720a
--- /dev/null
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/df/df.lua
@@ -0,0 +1,26 @@
+module("luci.statistics.rrdtool.definitions.df.df", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance, dtype )
+
+	return {
+		per_instance  = true,
+		number_format = "%5.1lf%s",
+
+		data = {
+			sources = {
+				df = { "free", "used" }
+			},
+
+			options = {
+				df__free = {
+					color = "00ff00"
+				},
+
+				df__used = {
+					color = "ff0000",
+					flip  = true
+				}
+			}
+		}
+	}
+end
diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
new file mode 100644
index 0000000000..17f1e2b991
--- /dev/null
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -0,0 +1,86 @@
+module("luci.statistics.rrdtool.definitions.processes", package.seeall)
+
+function rrdargs( graph, plugin, plugin_instance )
+
+	if plugin_instance == "" then
+		return {
+			data = {
+				instances = {
+					ps_state = {
+						"sleeping", "running", "paging", "blocked", "stopped", "zombies"
+					}
+				},
+
+				options = {
+					ps_state_sleeping = { color = "0000ff" },
+					ps_state_running  = { color = "008000" },
+					ps_state_paging   = { color = "ffff00" },
+					ps_state_blocked  = { color = "ff5000" },
+					ps_state_stopped  = { color = "555555" },
+					ps_state_zombies  = { color = "ff0000" }
+				}
+			}
+		}
+	else
+		return {
+
+			{
+				data = {
+					sources = {
+						ps_cputime = { "syst", "user" }
+					},
+
+					options = {
+						ps_cputime__user = {
+							color   = "0000ff",
+							overlay = true
+						},
+
+						ps_cputime__syst = {
+							color   = "ff0000",
+							overlay = true
+						}
+					}
+				}
+			},
+
+			{
+				data = {
+					sources = {
+						ps_count = { "threads", "processes" }
+					},
+
+					options = {
+						ps_count__threads   = { color = "00ff00" },
+						ps_count__processes = { color = "0000bb" }
+					}
+				}
+			},
+
+			{
+				data = {
+					sources = {
+						ps_pagefaults = { "minflt", "majflt" }
+					},
+
+					options = {
+						ps_pagefaults__minflt = { color = "ff0000" },
+						ps_pagefaults__majflt = { color = "ff5500" }
+					}
+				}
+			},
+
+			{
+				number_format = "%5.1lf%s",
+
+				data = {
+					types = { "ps_rss" },
+
+					options = {
+						ps_rss = { color = "0000ff" }
+					}
+				}
+			}
+		}
+	end
+end