From 306a119ad8e55e075d566b7e2ce599c8068c55c3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 21 Sep 2020 10:50:37 +0000 Subject: [PATCH] processor: Add guest_nice usage, too Signed-off-by: Michael Tremer --- src/collecty/colours.py | 19 ++++++++++--------- src/collecty/plugins/processor.py | 11 +++++++++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/collecty/colours.py b/src/collecty/colours.py index c17710d..570a619 100644 --- a/src/collecty/colours.py +++ b/src/collecty/colours.py @@ -125,15 +125,16 @@ COLOUR_DCCP = LIGHT_BLUE COLOUR_OTHER = COLOUR_IPVX # Processor -CPU_USER = LIGHT_GREEN -CPU_NICE = BLUE -CPU_SYS = RED -CPU_WAIT = DEEP_PURPLE -CPU_IRQ = ORANGE -CPU_SIRQ = YELLOW -CPU_STEAL = LIGHT_BLUE -CPU_GUEST = PINK -CPU_IDLE = LIGHT_GREY +CPU_USER = LIGHT_GREEN +CPU_NICE = BLUE +CPU_SYS = RED +CPU_WAIT = DEEP_PURPLE +CPU_IRQ = ORANGE +CPU_SIRQ = YELLOW +CPU_STEAL = LIGHT_BLUE +CPU_GUEST = PINK +CPU_GUEST_NICE = lighten(PINK, 0.8) +CPU_IDLE = LIGHT_GREY # Memory MEMORY_USED = GREEN diff --git a/src/collecty/plugins/processor.py b/src/collecty/plugins/processor.py index 68d144a..6a4aec2 100644 --- a/src/collecty/plugins/processor.py +++ b/src/collecty/plugins/processor.py @@ -33,7 +33,7 @@ class GraphTemplateProcessor(base.GraphTemplate): _ = self.locale.translate return [ - "CDEF:total=user,nice,+,sys,+,wait,+,irq,+,sirq,+,steal,+,guest,+,idle,+", + "CDEF:total=user,nice,+,sys,+,wait,+,irq,+,sirq,+,steal,+,guest,+,guest_nice,+,idle,+", "CDEF:user_p=100,user,*,total,/", "AREA:user_p%s:%-15s" % (CPU_USER, _("User")), @@ -83,6 +83,12 @@ class GraphTemplateProcessor(base.GraphTemplate): "GPRINT:guest_p_min:%12s\:" % _("Minimum") + " %6.2lf%%", "GPRINT:guest_p_avg:%12s\:" % _("Average") + " %6.2lf%%\\n", + "CDEF:guest_nice_p=100,guest_nice,*,total,/", + "STACK:guest_nice_p%s:%-15s" % (CPU_GUEST_NICE, _("Guest Nice")), + "GPRINT:guest_nice_p_max:%12s\:" % _("Maximum") + " %6.2lf%%", + "GPRINT:guest_nice_p_min:%12s\:" % _("Minimum") + " %6.2lf%%", + "GPRINT:guest_nice_p_avg:%12s\:" % _("Average") + " %6.2lf%%\\n", + "CDEF:idle_p=100,idle,*,total,/", "STACK:idle_p%s:%-15s" % (CPU_IDLE, _("Idle")), "GPRINT:idle_p_max:%12s\:" % _("Maximum") + " %6.2lf%%", @@ -115,6 +121,7 @@ class ProcessorObject(base.Object): "DS:sirq:DERIVE:0:U", "DS:steal:DERIVE:0:U", "DS:guest:DERIVE:0:U", + "DS:guest_nice:DERIVE:0:U", ] def init(self, cpu_id=None): @@ -141,7 +148,7 @@ class ProcessorObject(base.Object): # Convert values into a list values = values.split() - if not len(values) == 10: + if not len(values) == len(self.rrd_schema): raise ValueError("Received unexpected output from /proc/stat: %s" % values) return values -- 2.47.2