diff --git a/src/dp_rrdtool.c b/src/dp_rrdtool.c
index bbfe59e07fba9d655af79416d0d1fb662658bded..624d3ad161e658f2ab9dd9599d91927d62b02b95 100644 (file)
--- a/src/dp_rrdtool.c
+++ b/src/dp_rrdtool.c
* Florian octo Forster <ff at octo.it>
**/
* 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 "common.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <rrd.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
{
char *data_dir;
struct dp_rrdtool_s
{
char *data_dir;
typedef struct dp_get_idents_data_s dp_get_idents_data_t;
static int scan_type_cb (__attribute__((unused)) const char *base_dir,
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;
{ /* {{{ */
dp_get_idents_data_t *data = ud;
- size_t sub_dir_len;
+ size_t file_len;
char type_copy[1024];
char type_copy[1024];
+ size_t type_copy_len;
char *type_inst;
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". */
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);
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)
type_inst = strchr (type_copy, '-');
if (type_inst != NULL)
return (fs_foreach_dir (abs_dir, scan_plugin_cb, data));
} /* }}} int scan_host_cb */
return (fs_foreach_dir (abs_dir, scan_plugin_cb, data));
} /* }}} int scan_host_cb */
-static int ident_to_rrdfile (const graph_ident_t *ident,
+static int ident_to_rrdfile (const graph_ident_t *ident, /* {{{ */
dp_rrdtool_t *config,
char *buffer, size_t buffer_size)
{
dp_rrdtool_t *config,
char *buffer, size_t buffer_size)
{
info = rrd_info (rrd_argc, rrd_argv);
if (info == NULL)
{
info = rrd_info (rrd_argc, rrd_argv);
if (info == NULL)
{
- printf ("%s: rrd_info (%s) failed.\n", __func__, file);
+ fprintf (stderr, "%s: rrd_info (%s) failed.\n", __func__, file);
+ fflush (stderr);
return (-1);
}
return (-1);
}
continue;
keylen = strlen (ptr->key);
continue;
keylen = strlen (ptr->key);
- if (keylen < strlen ("ds[?].index"))
+ if (keylen < strlen ("ds[?].type"))
continue;
continue;
- dslen = keylen - strlen ("ds[].index");
+ dslen = keylen - strlen ("ds[].type");
assert (dslen >= 1);
assert (dslen >= 1);
- if (strcmp ("].index", ptr->key + (strlen ("ds[") + dslen)) != 0)
+ if (strcmp ("].type", ptr->key + (strlen ("ds[") + dslen)) != 0)
continue;
ds = malloc (dslen + 1);
continue;
ds = malloc (dslen + 1);
{ /* {{{ */
dp_rrdtool_t *config = 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,
} /* }}} int get_ident_data */
static int print_graph (void *priv,
return (-1);
} /* }}} int print_graph */
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;
{ /* {{{ */
dp_rrdtool_t *conf;
+ int i;
data_provider_t dp =
{
data_provider_t dp =
{
/* private_data = */ NULL
};
/* 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;
dp.private_data = conf;
- gl_register_data_provider ("rrdtool", &dp);
+ data_provider_register ("rrdtool", &dp);
return (0);
} /* }}} int dp_rrdtool_config */
return (0);
} /* }}} int dp_rrdtool_config */