X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fdp_rrdtool.c;h=624d3ad161e658f2ab9dd9599d91927d62b02b95;hp=79c8e4187a7937fe5cc3c0083e82c89df434fceb;hb=daff10f47909eaaf1fe5bc1d4fbcf7fecf46551b;hpb=d586e8f07c42e4ee8dc6144fe2a0be8d69dc8000

diff --git a/src/dp_rrdtool.c b/src/dp_rrdtool.c
index 79c8e41..624d3ad 100644
--- a/src/dp_rrdtool.c
+++ b/src/dp_rrdtool.c
@@ -21,18 +21,27 @@
  *   Florian octo Forster <ff at octo.it>
  **/
 
-#include "graph_types.h"
-#include "graph_ident.h"
-#include "graph_list.h"
-#include "data_provider.h"
-#include "filesystem.h"
-#include "oconfig.h"
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
 #include <errno.h>
+#include <assert.h>
+
+#include <rrd.h>
+
+#include "graph_types.h"
+#include "graph_config.h"
+#include "graph_ident.h"
+#include "data_provider.h"
+#include "filesystem.h"
+#include "oconfig.h"
+#include "common.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
 
 struct dp_rrdtool_s
 {
@@ -49,23 +58,27 @@ struct dp_get_idents_data_s
 typedef struct dp_get_idents_data_s dp_get_idents_data_t;
 
 static int scan_type_cb (__attribute__((unused)) const char *base_dir,
-    const char *sub_dir, void *ud)
+    const char *file, void *ud)
 { /* {{{ */
   dp_get_idents_data_t *data = ud;
-  size_t sub_dir_len;
+  size_t file_len;
   char type_copy[1024];
+  size_t type_copy_len;
   char *type_inst;
 
-  sub_dir_len = strlen (sub_dir);
-  if (sub_dir_len < 5)
+  file_len = strlen (file);
+  if (file_len < 5)
     return (0);
 
   /* Ignore files that don't end in ".rrd". */
-  if (strcasecmp (".rrd", sub_dir + (sub_dir_len - 4)) != 0)
+  if (strcasecmp (".rrd", file + (file_len - 4)) != 0)
     return (0);
 
-  strncpy (type_copy, sub_dir, sizeof (type_copy));
-  type_copy[sub_dir_len - 4] = 0;
+  strncpy (type_copy, file, sizeof (type_copy));
+  type_copy_len = file_len - 4;
+  if (type_copy_len > (sizeof (type_copy) - 1))
+    type_copy_len = sizeof (type_copy) - 1;
+  type_copy[type_copy_len] = 0;
 
   type_inst = strchr (type_copy, '-');
   if (type_inst != NULL)
@@ -130,6 +143,50 @@ static int scan_host_cb (const char *base_dir,
   return (fs_foreach_dir (abs_dir, scan_plugin_cb, data));
 } /* }}} int scan_host_cb */
 
+static int ident_to_rrdfile (const graph_ident_t *ident, /* {{{ */
+    dp_rrdtool_t *config,
+    char *buffer, size_t buffer_size)
+{
+  const char *plugin_instance;
+  const char *type_instance;
+
+  plugin_instance = ident_get_plugin_instance (ident);
+  if ((plugin_instance != NULL) && (plugin_instance[0] == 0))
+    plugin_instance = NULL;
+
+  type_instance = ident_get_type_instance (ident);
+  if ((type_instance != NULL) && (type_instance[0] == 0))
+    type_instance = NULL;
+
+  buffer[0] = 0;
+
+  strlcat (buffer, config->data_dir, buffer_size);
+  strlcat (buffer, "/", buffer_size);
+
+  strlcat (buffer, ident_get_host (ident), buffer_size);
+  strlcat (buffer, "/", buffer_size);
+  strlcat (buffer, ident_get_plugin (ident), buffer_size);
+  if (plugin_instance != NULL)
+  {
+    strlcat (buffer, "-", buffer_size);
+    strlcat (buffer, plugin_instance, buffer_size);
+  }
+  strlcat (buffer, "/", buffer_size);
+  strlcat (buffer, ident_get_type (ident), buffer_size);
+  if (type_instance != NULL)
+  {
+    strlcat (buffer, "-", buffer_size);
+    strlcat (buffer, type_instance, buffer_size);
+  }
+
+  strlcat (buffer, ".rrd", buffer_size);
+
+  return (0);
+} /* }}} int ident_to_rrdfile */
+
+/*
+ * Callback functions
+ */
 static int get_idents (void *priv,
     dp_get_idents_callback cb, void *ud)
 { /* {{{ */
@@ -152,11 +209,69 @@ static int get_idents (void *priv,
 static int get_ident_ds_names (void *priv, graph_ident_t *ident,
     dp_list_get_ident_ds_names_callback cb, void *ud)
 { /* {{{ */
-  priv = NULL;
-  ident = NULL;
-  cb = NULL;
-  ud = NULL;
-  return (0);
+  dp_rrdtool_t *config = priv;
+  char file[PATH_MAX + 1];
+  int status;
+
+  char *rrd_argv[] = { "info", file, NULL };
+  int rrd_argc = (sizeof (rrd_argv) / sizeof (rrd_argv[0])) - 1;
+
+  rrd_info_t *info;
+  rrd_info_t *ptr;
+
+  memset (file, 0, sizeof (file));
+  status = ident_to_rrdfile (ident, config, file, sizeof (file));
+  if (status != 0)
+    return (status);
+
+  info = rrd_info (rrd_argc, rrd_argv);
+  if (info == NULL)
+  {
+    fprintf (stderr, "%s: rrd_info (%s) failed.\n", __func__, file);
+    fflush (stderr);
+    return (-1);
+  }
+
+  for (ptr = info; ptr != NULL; ptr = ptr->next)
+  {
+    size_t keylen;
+    size_t dslen;
+    char *ds;
+
+    if (ptr->key[0] != 'd')
+      continue;
+
+    if (strncmp ("ds[", ptr->key, strlen ("ds[")) != 0)
+      continue;
+
+    keylen = strlen (ptr->key);
+    if (keylen < strlen ("ds[?].type"))
+      continue;
+
+    dslen = keylen - strlen ("ds[].type");
+    assert (dslen >= 1);
+
+    if (strcmp ("].type", ptr->key + (strlen ("ds[") + dslen)) != 0)
+      continue;
+
+    ds = malloc (dslen + 1);
+    if (ds == NULL)
+      continue;
+
+    memcpy (ds, ptr->key + strlen ("ds["), dslen);
+    ds[dslen] = 0;
+
+    status = (*cb) (ident, ds, ud);
+
+    free (ds);
+
+    if (status != 0)
+      break;
+  }
+
+  rrd_info_free (info);
+
+  return (status);
 } /* }}} int get_ident_ds_names */
 
 static int get_ident_data (void *priv,
@@ -166,16 +281,81 @@ static int get_ident_data (void *priv,
 { /* {{{ */
   dp_rrdtool_t *config = priv;
 
-  ident = NULL;
-  ds_name = NULL;
-  begin.tv_sec = 0;
-  end.tv_sec = 0;
-  cb = NULL;
-  ud = NULL;
+  char filename[PATH_MAX + 1];
+  const char *cf = "AVERAGE"; /* FIXME */
+  time_t rrd_start;
+  time_t rrd_end;
+  unsigned long step;
+  unsigned long ds_count;
+  char **ds_namv;
+  rrd_value_t *data;
+  int status;
+
+  dp_time_t first_value_time;
+  dp_time_t interval;
+  size_t data_points_num;
+  double *data_points = NULL;
+
+  unsigned long ds_index;
+  size_t i;
+
+  status = ident_to_rrdfile (ident, config, filename, sizeof (filename));
+  if (status != 0)
+    return (status);
+
+  rrd_start = (time_t) begin.tv_sec;
+  rrd_end = (time_t) end.tv_sec;
+  step = 0;
+  ds_count = 0;
+  ds_namv = NULL;
+  data = NULL;
+
+  status = rrd_fetch_r (filename, cf,
+      &rrd_start, &rrd_end,
+      &step, &ds_count, &ds_namv,
+      &data);
+  if (status != 0)
+    return (status);
+
+#define BAIL_OUT(ret_status) do { \
+  unsigned long i;                \
+  for (i = 0; i < ds_count; i++)  \
+    free (ds_namv[i]);            \
+  free (ds_namv);                 \
+  free (data);                    \
+  free (data_points);             \
+  return (ret_status);            \
+} while (0)
+
+  for (ds_index = 0; ds_index < ds_count; ds_index++)
+    if (strcmp (ds_name, ds_namv[ds_index]) == 0)
+      break;
+
+  if (ds_index >= ds_count)
+    BAIL_OUT (ENOENT);
+
+  memset (&first_value_time, 0, sizeof (first_value_time));
+  first_value_time.tv_sec = rrd_start;
+  memset (&interval, 0, sizeof (interval));
+  interval.tv_sec = (time_t) step;
+  data_points_num = (size_t) ((rrd_end - rrd_start) / step);
+  data_points = calloc (data_points_num, sizeof (*data_points));
+  if (data_points == NULL)
+    BAIL_OUT (ENOMEM);
+
+  for (i = 0; i < data_points_num; i++)
+  {
+    unsigned long index = (ds_count * ((unsigned long) i)) + ds_index;
+    data_points[i] = (double) data[index];
+  }
 
-  config = NULL;
+  status = (*cb) (ident, ds_name, first_value_time, interval,
+      data_points_num, data_points, ud);
+  if (status != 0)
+    BAIL_OUT (status);
 
-  return (EINVAL);
+  BAIL_OUT (0);
+#undef BAIL_OUT
 } /* }}} int get_ident_data */
 
 static int print_graph (void *priv,
@@ -188,9 +368,10 @@ static int print_graph (void *priv,
   return (-1);
 } /* }}} int print_graph */
 
-int dp_rrdtool_config (oconfig_item_t *ci)
+int dp_rrdtool_config (const oconfig_item_t *ci)
 { /* {{{ */
   dp_rrdtool_t *conf;
+  int i;
 
   data_provider_t dp =
   {
@@ -201,14 +382,37 @@ int dp_rrdtool_config (oconfig_item_t *ci)
     /* private_data = */ NULL
   };
 
-  /* FIXME: Actuelly do config parsing here. */
-  ci = NULL; /* FIXME */
-  conf = malloc (sizeof (dp_rrdtool_t));
-  conf->data_dir = strdup ("/var/lib/collectd/rrd");
+  conf = malloc (sizeof (*conf));
+  if (conf == NULL)
+    return (ENOMEM);
+  memset (conf, 0, sizeof (*conf));
+  conf->data_dir = NULL;
+
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child = ci->children + i;
+
+    if (strcasecmp ("DataDir", child->key) == 0)
+      graph_config_get_string (child, &conf->data_dir);
+    else
+    {
+      fprintf (stderr, "dp_rrdtool_config: Ignoring unknown config option "
+          "\"%s\"\n", child->key);
+      fflush (stderr);
+    }
+  }
+
+  if (conf->data_dir == NULL)
+    conf->data_dir = strdup ("/var/lib/collectd/rrd");
+  if (conf->data_dir == NULL)
+  {
+    free (conf);
+    return (ENOMEM);
+  }
 
   dp.private_data = conf;
 
-  gl_register_data_provider ("rrdtool", &dp);
+  data_provider_register ("rrdtool", &dp);
 
   return (0);
 } /* }}} int dp_rrdtool_config */