- for core, processor in sorted(self.object_table.items()):
- i = {
- "core" : core,
- "colour" : self.core_colours.get(core, "#000000"),
- "name" : processor.name,
- }
-
- core_graph = [
- "DEF:current_%(core)s=%%(%(core)s)s:current:AVERAGE",
- "DEF:minimum_%(core)s=%%(%(core)s)s:minimum:AVERAGE",
- "DEF:maximum_%(core)s=%%(%(core)s)s:maximum:AVERAGE",
-
- "VDEF:avg_%(core)s=current_%(core)s,AVERAGE",
-
- "LINE2:current_%(core)s%(colour)s:%(name)-10s",
- "GPRINT:avg_%(core)s:%%6.2lf %%sHz\l",
+ for processor, colour in zip(self.objects, self.processor_colours):
+ rrd_graph += processor.make_rrd_defs(processor.id) + [
+ "LINE2:%s%s:%-10s" % (processor.id, colour, processor.name),
+ "GPRINT:%s:%%6.2lf %%sHz" % processor.id,