applications/luci-statistics: rework handling of index and detail graphs

[project/luci.git] / applications / luci-statistics / luasrc / statistics / rrdtool / definitions / processes.lua

diff --git a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
index fcbb982..6f83c8e 100644 (file)
--- a/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
+++ b/applications/luci-statistics/luasrc/statistics/rrdtool/definitions/processes.lua
@@ -15,10 +15,10 @@ $Id$
 
 module("luci.statistics.rrdtool.definitions.processes", package.seeall)
 
-function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
+function rrdargs( graph, plugin, plugin_instance, dtype )
 
-       if is_index then 
-               return {
+       return {
+               {
                        title = "%H: Processes",
                        vlabel = "Processes/s",
                        data = {
@@ -37,73 +37,74 @@ function rrdargs( graph, plugin, plugin_instance, dtype, is_index )
                                        ps_state_zombies  = { color = "ff0000" }
                                }
                        }
-               }
-       else
-               return {
-                       {
-                               title = "%H: CPU time used by %pi",
-                               vlabel = "Jiffies",
-                               data = {
-                                       sources = {
-                                               ps_cputime = { "syst", "user" }
-                                       },
+               },
 
-                                       options = {
-                                               ps_cputime__user = {
-                                                       color   = "0000ff",
-                                                       overlay = true
-                                               },
+               {
+                       title = "%H: CPU time used by %pi",
+                       vlabel = "Jiffies",
+                       data = {
+                               sources = {
+                                       ps_cputime = { "syst", "user" }
+                               },
 
-                                               ps_cputime__syst = {
-                                                       color   = "ff0000",
-                                                       overlay = true
-                                               }
-                                       }
-                               }
-                       },
-
-                       {
-                               title = "%H: Threads and processes belonging to %pi",
-                               vlabel = "Count",
-                               data = {
-                                       sources = {
-                                               ps_count = { "threads", "processes" }
+                               options = {
+                                       ps_cputime__user = {
+                                               color   = "0000ff",
+                                               overlay = true
                                        },
 
-                                       options = {
-                                               ps_count__threads   = { color = "00ff00" },
-                                               ps_count__processes = { color = "0000bb" }
+                                       ps_cputime__syst = {
+                                               color   = "ff0000",
+                                               overlay = true
                                        }
                                }
-                       },
-
-                       {
-                               title = "%H: Page faults in %pi",
-                               vlabel = "Pagefaults",
-                               data = {
-                                       sources = {
-                                               ps_pagefaults = { "minflt", "majflt" }
-                                       },
+                       }
+               },
 
-                                       options = {
-                                               ps_pagefaults__minflt = { color = "ff0000" },
-                                               ps_pagefaults__majflt = { color = "ff5500" }
-                                       }
+               {
+                       title = "%H: Threads and processes belonging to %pi",
+                       vlabel = "Count",
+                       detail = true,
+                       data = {
+                               sources = {
+                                       ps_count = { "threads", "processes" }
+                               },
+
+                               options = {
+                                       ps_count__threads   = { color = "00ff00" },
+                                       ps_count__processes = { color = "0000bb" }
                                }
-                       },
+                       }
+               },
 
-                       {
-                               title = "%H: Virtual memory size of %pi",
-                               vlabel = "Bytes",
-                               number_format = "%5.1lf%sB",
-                               data = {
-                                       types = { "ps_rss" },
+               {
+                       title = "%H: Page faults in %pi",
+                       vlabel = "Pagefaults",
+                       detail = true,
+                       data = {
+                               sources = {
+                                       ps_pagefaults = { "minflt", "majflt" }
+                               },
 
-                                       options = {
-                                               ps_rss = { color = "0000ff" }
-                                       }
+                               options = {
+                                       ps_pagefaults__minflt = { color = "ff0000" },
+                                       ps_pagefaults__majflt = { color = "ff5500" }
+                               }
+                       }
+               },
+
+               {
+                       title = "%H: Virtual memory size of %pi",
+                       vlabel = "Bytes",
+                       detail = true,
+                       number_format = "%5.1lf%sB",
+                       data = {
+                               types = { "ps_rss" },
+
+                               options = {
+                                       ps_rss = { color = "0000ff" }
                                }
                        }
                }
-       end
+       }
 end