Change default image format to SVG

SVG is much better scalable and much faster to generate.
It can be resized and exported very well and therefore is
our preferred choice for graph images for now.

The image format can be requested when generating a graph
image.

diff --git a/src/collecty/client.py b/src/collecty/client.py
index 4570c69357486e150b8b5eea8c5321f2871eb7ff..1f072256b3afb8cb9eb4379afe010e8c6f65ae13 100644 (file)
--- a/src/collecty/client.py
+++ b/src/collecty/client.py
@@ -56,6 +56,7 @@ class CollectyClient(object):
 
        def generate_graph_cli(self, ns):
                kwargs = {
+                       "format"    : ns.format,
                        "object_id" : ns.object,
                }
 
@@ -85,6 +86,8 @@ class CollectyClient(object):
                parser_generate_graph.set_defaults(func=self.generate_graph_cli)
                parser_generate_graph.add_argument("--filename",
                        help=_("filename"), required=True)
+               parser_generate_graph.add_argument("--format",
+                       help=_("image format"), default=DEFAULT_IMAGE_FORMAT)
                parser_generate_graph.add_argument("--interval", help=_("interval"))
                parser_generate_graph.add_argument("--object",
                        help=_("Object identifier"), default="default")

diff --git a/src/collecty/constants.py b/src/collecty/constants.py
index 6094808cb481f4b4ade3755b07aa71ec51ce46ea..8580d144780b3cf00c59250d061c72ec108baf5c 100644 (file)
--- a/src/collecty/constants.py
+++ b/src/collecty/constants.py
@@ -25,10 +25,9 @@ DATABASE_DIR = "/var/lib/collecty"
 
 BUS_DOMAIN = "org.ipfire.collecty1"
 
-GRAPH_DEFAULT_ARGUMENTS = (
-       # Always generate graphs in PNG format.
-       "--imgformat", "PNG",
+DEFAULT_IMAGE_FORMAT = "SVG"
 
+GRAPH_DEFAULT_ARGUMENTS = (
        # Disable the border around the image.
        "--border", "0",
 

diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py
index 8d38cad5789d809f194378bd67ecd36a8406c58e..74bc7122a812fe8935d2e36dd6eeda84ec67843c 100644 (file)
--- a/src/collecty/plugins/base.py
+++ b/src/collecty/plugins/base.py
@@ -410,12 +410,14 @@ class GraphTemplate(object):
        def log(self):
                return self.plugin.log
 
-       def _make_command_line(self, interval, width=None, height=None):
+       def _make_command_line(self, interval, format=DEFAULT_IMAGE_FORMAT,
+                       width=None, height=None):
                args = []
 
                args += GRAPH_DEFAULT_ARGUMENTS
 
                args += [
+                       "--imgformat", format,
                        "--height", "%s" % (height or self.height),
                        "--width", "%s" % (width or self.width),
                ]
@@ -462,6 +464,9 @@ class GraphTemplate(object):
                return self.write_graph(*args)
 
        def write_graph(self, *args):
+               # Convert all arguments to string
+               args = [str(e) for e in args]
+
                with tempfile.NamedTemporaryFile() as f:
                        rrdtool.graph(f.name, *args)