X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_def.c;h=a5511f6fbb742bc38f9a725785fd8a859b61b13a;hb=8b5b9238a2efbc722b7c147707dc453aefe69f04;hp=926fde2946f1573fd06a3d1d78e947a78402d399;hpb=7ece08c71d12dfcebfc0395f7727d717033f0641;p=collection4.git

diff --git a/graph_def.c b/graph_def.c
index 926fde2..a5511f6 100644
--- a/graph_def.c
+++ b/graph_def.c
@@ -3,7 +3,13 @@
 #include <errno.h>
 
 #include "graph_def.h"
+#include "graph.h"
+#include "graph_config.h"
 #include "common.h"
+#include "oconfig.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
 
 /*
  * Data structures
@@ -13,7 +19,10 @@ struct graph_def_s
   graph_ident_t *select;
 
   char *ds_name;
+  char *legend;
   uint32_t color;
+  _Bool stack;
+  _Bool area;
 
   graph_def_t *next;
 };
@@ -21,6 +30,98 @@ struct graph_def_s
 /*
  * Private functions
  */
+#define DEF_CONFIG_FIELD(field) \
+static int def_config_##field (const oconfig_item_t *ci, graph_ident_t *ident) \
+{                                                                              \
+  char *tmp = NULL;                                                            \
+  int status = graph_config_get_string (ci, &tmp);                             \
+  if (status != 0)                                                             \
+    return (status);                                                           \
+  ident_set_##field (ident, tmp);                                              \
+  free (tmp);                                                                  \
+  return (0);                                                                  \
+} /* }}} int def_config_field */
+
+DEF_CONFIG_FIELD (host);
+DEF_CONFIG_FIELD (plugin);
+DEF_CONFIG_FIELD (plugin_instance);
+DEF_CONFIG_FIELD (type);
+DEF_CONFIG_FIELD (type_instance);
+
+#undef DEF_CONFIG_FIELD
+
+static int def_config_color (const oconfig_item_t *ci, uint32_t *ret_color) /* {{{ */
+{
+  char *tmp;
+  char *endptr;
+  uint32_t color;
+
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
+    return (EINVAL);
+
+  tmp = ci->values[0].value.string;
+
+  endptr = NULL;
+  errno = 0;
+  color = (uint32_t) strtoul (tmp, &endptr, /* base = */ 16);
+  if ((errno != 0) || (endptr == tmp) || (color > 0x00ffffff))
+    return (EINVAL);
+
+  *ret_color = color;
+
+  return (0);
+} /* }}} int def_config_color */
+
+static graph_def_t *def_config_get_obj (graph_config_t *cfg, /* {{{ */
+    const oconfig_item_t *ci)
+{
+  graph_ident_t *ident;
+  char *ds_name = NULL;
+  graph_def_t *def;
+  int i;
+
+  ident = graph_get_selector (cfg);
+  if (ident == NULL)
+  {
+    fprintf (stderr, "def_config_get_obj: graph_get_selector failed");
+    return (NULL);
+  }
+
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child;
+
+#define HANDLE_FIELD(name,field) \
+    else if (strcasecmp (name, child->key) == 0) \
+      def_config_##field (child, ident)
+
+    child = ci->children + i;
+    if (strcasecmp ("DSName", child->key) == 0)
+      graph_config_get_string (child, &ds_name);
+
+    HANDLE_FIELD ("Host", host);
+    HANDLE_FIELD ("Plugin", plugin);
+    HANDLE_FIELD ("PluginInstance", plugin_instance);
+    HANDLE_FIELD ("Type", type);
+    HANDLE_FIELD ("TypeInstance", type_instance);
+
+#undef HANDLE_FIELD
+  }
+
+  def = def_create (cfg, ident, ds_name);
+  if (def == NULL)
+  {
+    fprintf (stderr, "def_config_get_obj: def_create failed\n");
+    ident_destroy (ident);
+    free (ds_name);
+    return (NULL);
+  }
+
+  ident_destroy (ident);
+  free (ds_name);
+
+  return (def);
+} /* }}} graph_def_t *def_config_get_obj */
 
 /*
  * Public functions
@@ -34,7 +135,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
   if ((cfg == NULL) || (ident == NULL) || (ds_name == NULL))
     return (NULL);
 
-  selector = gl_graph_get_selector (cfg);
+  selector = graph_get_selector (cfg);
   if (selector == NULL)
     return (NULL);
 
@@ -45,6 +146,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
     return (NULL);
   }
   memset (ret, 0, sizeof (*ret));
+  ret->legend = NULL;
 
   ret->ds_name = strdup (ds_name);
   if (ret->ds_name == NULL)
@@ -69,7 +171,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
 
   ident_destroy (selector);
   return (ret);
-}; /* }}} graph_def_t *def_create */
+} /* }}} graph_def_t *def_create */
 
 void def_destroy (graph_def_t *def) /* {{{ */
 {
@@ -89,6 +191,36 @@ void def_destroy (graph_def_t *def) /* {{{ */
   def_destroy (next);
 } /* }}} void def_destroy */
 
+int def_config (graph_config_t *cfg, const oconfig_item_t *ci) /* {{{ */
+{
+  graph_def_t *def;
+  int i;
+
+  def = def_config_get_obj (cfg, ci);
+  if (def == NULL)
+    return (EINVAL);
+
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child;
+
+    child = ci->children + i;
+    if (strcasecmp ("Legend", child->key) == 0)
+      graph_config_get_string (child, &def->legend);
+    else if (strcasecmp ("Color", child->key) == 0)
+      def_config_color (child, &def->color);
+    else if (strcasecmp ("Stack", child->key) == 0)
+      graph_config_get_bool (child, &def->stack);
+    else if (strcasecmp ("Area", child->key) == 0)
+      graph_config_get_bool (child, &def->area);
+    else
+      fprintf (stderr, "def_config: Ignoring unknown config option \"%s\"",
+          child->key);
+  }
+
+  return (graph_add_def (cfg, def));
+} /* }}} int def_config */
+
 int def_append (graph_def_t *head, graph_def_t *def) /* {{{ */
 {
   graph_def_t *ptr;
@@ -188,8 +320,11 @@ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
       index, index);
 
   /* Graph part */
-  array_append_format (args, "LINE1:def_%04i_avg#%06"PRIx32":%s",
-      index, def->color, def->ds_name);
+  array_append_format (args, "%s:def_%04i_avg#%06"PRIx32":%s%s",
+      def->area ? "AREA" : "LINE1",
+      index, def->color,
+      (def->legend != NULL) ? def->legend : def->ds_name,
+      def->stack ? ":STACK" : "");
   array_append_format (args, "GPRINT:vdef_%04i_min:%%lg min,", index);
   array_append_format (args, "GPRINT:vdef_%04i_avg:%%lg avg,", index);
   array_append_format (args, "GPRINT:vdef_%04i_max:%%lg max,", index);