From: Hannu Nyman Date: Tue, 9 May 2017 06:42:42 +0000 (+0300) Subject: luci-app-statistics: processes: fix graph visibility X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92c78f3e8045b297775a5bf3ecc638f08b1b3998;p=project%2Fluci.git luci-app-statistics: processes: fix graph visibility Fix graph visibility on processes page based on plugin instance. The overview instance is empty, while monitored processes have their own instances. Original version of the patch created by @koblack and discussed in #1021 Signed-off-by: Hannu Nyman (cherry picked from commit 0a6ce204234c9485549e290230e51484b1fceb64) --- 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 323c3c2308..62d0545973 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 { - { title = "%H: Processes", vlabel = "Processes/s", data = { @@ -26,8 +26,9 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) ps_state_zombies = { color = "ff0000", title = "Zombies" } } } - }, - + } + else + return { { title = "%H: CPU time used by %pi", vlabel = "Jiffies", @@ -112,4 +113,5 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) } } } + end end