Add graph info functionality

The GraphInfo interface will return some basic information about
a graph (like title, etc.) and can be extended in the future.

This patch also changed the return value of the GenerateGraph
interface which is now a dictionary which is more extensible
and comes with some metrics about the graph now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/collecty/bus.py b/src/collecty/bus.py
index 463f4224cac8af0d8e54c55f7ff2b038e98c3147..fe22fea157da491bd618f2256c4c80247321be9c 100644 (file)
--- a/src/collecty/bus.py
+++ b/src/collecty/bus.py
@@ -78,14 +78,25 @@ class GraphGenerator(dbus.service.Object):
 
                self.collecty = collecty
 
-       @dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="ay")
+       @dbus.service.method(BUS_DOMAIN, in_signature="sa{sv}", out_signature="a{sv}")
        def GenerateGraph(self, template_name, kwargs):
                """
                        Returns a graph generated from the given template and object.
                """
                graph = self.collecty.generate_graph(template_name, **kwargs)
 
-               return dbus.ByteArray(graph or [])
+               # Convert the graph back to normal Python format
+               if graph:
+                       graph["image"] = dbus.ByteArray(graph["image"] or [])
+
+               return graph
+
+       @dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="a{sv}")
+       def GraphInfo(self, template_name, kwargs):
+               """
+                       Returns a dictionary with information about the graph.
+               """
+               return self.collecty.graph_info(template_name, **kwargs)
 
        @dbus.service.method(BUS_DOMAIN, in_signature="", out_signature="as")
        def ListTemplates(self):

diff --git a/src/collecty/client.py b/src/collecty/client.py
index 7b3c3ec71e3fc0d76cd2197f1d1142177aed4e1c..7989d1197dee30afa1fb754cc40a5d20791d1365 100644 (file)
--- a/src/collecty/client.py
+++ b/src/collecty/client.py
@@ -48,13 +48,21 @@ class CollectyClient(object):
                for t in sorted(templates):
                        print(t)
 
+       def graph_info(self, template_name, **kwargs):
+               graph_info = self.proxy.GraphInfo(template_name, kwargs,
+                       signature="sa{sv}")
+
+               return dict(graph_info)
+
        def generate_graph(self, template_name, **kwargs):
-               byte_array = self.proxy.GenerateGraph(template_name, kwargs,
+               graph = self.proxy.GenerateGraph(template_name, kwargs,
                        signature="sa{sv}")
 
                # Convert the byte array into a byte string again
-               if byte_array:
-                       return bytes(byte_array)
+               if graph:
+                       graph["image"] = bytes(graph["image"])
+
+               return graph
 
        def generate_graph_cli(self, ns):
                kwargs = {
@@ -79,9 +87,17 @@ class CollectyClient(object):
                # Generate the graph image
                graph = self.generate_graph(ns.template, **kwargs)
 
+               # Add some useful information
+               info = self.graph_info(ns.template, **kwargs)
+               if info:
+                       graph.update(info)
+
                # Write file to disk
                with open(ns.filename, "wb") as f:
-                       f.write(graph)
+                       f.write(graph["image"])
+
+               print(_("Title      : %(title)s (%(template)s - %(object_id)s)") % graph)
+               print(_("Image size : %(image_width)sx%(image_height)spx") % graph)
 
        def version_cli(self, args):
                daemon_version = self.proxy.Version()

diff --git a/src/collecty/daemon.py b/src/collecty/daemon.py
index 27c587f04547816772af511378017a6ff0f48cfb..e8d402e7e45b1150303c42b07099d59f74b74c35 100644 (file)
--- a/src/collecty/daemon.py
+++ b/src/collecty/daemon.py
@@ -196,6 +196,13 @@ class Collecty(object):
 
                return plugin.generate_graph(template_name, *args, **kwargs)
 
+       def graph_info(self, template_name, *args, **kwargs):
+               plugin = self.get_plugin_from_template(template_name)
+               if not plugin:
+                       raise RuntimeError("Could not find template %s" % template_name)
+
+               return plugin.graph_info(template_name, *args, **kwargs)
+
        def create_worker_threads(self, num=None):
                """
                        Creates a number of worker threads

diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py
index c9e815c52d48ebd831af1a5a05f188adc0473df9..ca98ef721df25085098e1a744e2b860a15d8cd18 100644 (file)
--- a/src/collecty/plugins/base.py
+++ b/src/collecty/plugins/base.py
@@ -255,6 +255,15 @@ class Plugin(object, metaclass=PluginRegistration):
 
                return graph
 
+       def graph_info(self, template_name, object_id="default",
+                       timezone=None, locale=None, **kwargs):
+               template = self.get_template(template_name, object_id=object_id,
+                       timezone=timezone, locale=locale)
+               if not template:
+                       raise RuntimeError("Could not find template %s" % template_name)
+
+               return template.graph_info()
+
 
 class Object(object):
        # The schema of the RRD database.
@@ -550,4 +559,19 @@ class GraphTemplate(object):
                with Environment(self.timezone, self.locale.lang):
                        graph = rrdtool.graphv("-", *args)
 
-               return graph.get("image")
+               return {
+                       "image"        : graph.get("image"),
+                       "image_height" : graph.get("image_height"),
+                       "image_width"  : graph.get("image_width"),
+               }
+
+       def graph_info(self):
+               """
+                       Returns a dictionary with useful information
+                       about this graph.
+               """
+               return {
+                       "title"        : self.graph_title,
+                       "object_id"    : self.object_id or "",
+                       "template"     : self.name,
+               }