graph.[ch]: Implement "graph_get_rrdargs".

diff --git a/collection.conf b/collection.conf
index 58d8c4e122ce43aafaedb7efdd738bd4e10a2676..cabea9c6fbc4ac7daaf1d4384040165ae9545768 100644 (file)
--- a/collection.conf
+++ b/collection.conf
@@ -90,6 +90,7 @@
   TypeInstance "/all/"
 
   Title "Diskspace"
+  VerticalLabel "Bytes"
 
   <DEF>
     TypeInstance "used"

diff --git a/graph.c b/graph.c
index 79964f3b5b25ffb7d866fc53ea269699a6432ed5..154af77915f198f3525d788317fabdde6f6462bb 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -266,4 +266,25 @@ int graph_clear_instances (graph_config_t *cfg) /* {{{ */
   return (0);
 } /* }}} int graph_clear_instances */
 
+int graph_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
+    str_array_t *args)
+{
+  if ((cfg == NULL) || (inst == NULL) || (args == NULL))
+    return (EINVAL);
+
+  if (cfg->title != NULL)
+  {
+    array_append (args, "-t");
+    array_append (args, cfg->title);
+  }
+
+  if (cfg->vertical_label != NULL)
+  {
+    array_append (args, "-v");
+    array_append (args, cfg->vertical_label);
+  }
+
+  return (0);
+} /* }}} int graph_get_rrdargs */
+
 /* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/graph.h b/graph.h
index 25da1e0184cf52060b5018655ca50e4ca87c00d0..6e9ae07fb0e2cb03e459173bd3d6030c3d4c15ba 100644 (file)
--- a/graph.h
+++ b/graph.h
@@ -11,6 +11,7 @@ typedef struct graph_config_s graph_config_t;
 #include "graph_ident.h"
 #include "graph_instance.h"
 #include "oconfig.h"
+#include "utils_array.h"
 
 /*
  * Functions
@@ -40,5 +41,8 @@ int graph_compare (graph_config_t *cfg, const graph_ident_t *ident);
 
 int graph_clear_instances (graph_config_t *cfg);
 
+int graph_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
+    str_array_t *args);
+
 #endif /* GRAPH_H */
 /* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/graph_instance.c b/graph_instance.c
index d9821d004ce0991f2a40f2c0ae1b4d7ef82501f4..103be23860ba2b913633a9c11a4018989e670b26 100644 (file)
--- a/graph_instance.c
+++ b/graph_instance.c
@@ -288,20 +288,9 @@ int inst_get_rrdargs (graph_config_t *cfg, /* {{{ */
   if ((cfg == NULL) || (inst == NULL) || (args == NULL))
     return (EINVAL);
 
-/* FIXME: Re-enable title and vertical label stuff. */
-#if 0
-  if (cfg->title != NULL)
-  {
-    array_append (args, "-t");
-    array_append (args, cfg->title);
-  }
-
-  if (cfg->vertical_label != NULL)
-  {
-    array_append (args, "-v");
-    array_append (args, cfg->vertical_label);
-  }
-#endif
+  status = graph_get_rrdargs (cfg, inst, args);
+  if (status != 0)
+    return (status);
 
   defs = graph_get_defs (cfg);
   if (defs == NULL)