![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 8a3854f6321f34d3148fefd1d515c95b19cc9e95..b70aa8c9edab94c1f19121195ba8f843d71ae557 100644 (file)
rrd_clear_error();
if (! rrdc_is_connected(addr)) {
if (rrdc_connect(addr)) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to "
- "connectd to RRDCacheD at %s: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to connectd to RRDCacheD at %s: %s",
addr, rrd_get_error());
return 0;
}
}
#else
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Callback called with "
- "RRDCacheD address but your build of SysDB does not support "
- "that");
+ sdb_log(SDB_LOG_ERR, "Callback called with RRDCacheD address "
+ "but your build of SysDB does not support that");
return 0;
#endif
return 1;
#ifdef HAVE_RRD_CLIENT_H
/* TODO: detect and use rrdc_info if possible */
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: DESCRIBE not yet "
- "supported via RRDCacheD");
+ sdb_log(SDB_LOG_ERR, "DESCRIBE not yet supported via RRDCacheD");
return NULL;
#endif
}
info = rrd_info_r(filename);
}
if (! info) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to extract "
- "header information from '%s': %s", filename,
- rrd_get_error());
+ sdb_log(SDB_LOG_ERR, "Failed to extract header information from '%s': %s",
+ filename, rrd_get_error());
return NULL;
}
ts_info = calloc(1, sizeof(*ts_info));
if (! ts_info) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
rrd_info_free(info);
return NULL;
}
tmp = realloc(ts_info->data_names,
(ts_info->data_names_len + 1) * sizeof(*ts_info->data_names));
if (! tmp) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
sdb_timeseries_info_destroy(ts_info);
rrd_info_free(info);
return NULL;
ts_info->data_names = tmp;
ts_info->data_names[ts_info->data_names_len] = strdup(ds_name);
if (! ts_info->data_names[ts_info->data_names_len]) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to allocate memory");
+ sdb_log(SDB_LOG_ERR, "Failed to allocate memory");
sdb_timeseries_info_destroy(ts_info);
rrd_info_free(info);
return NULL;
return ts_info;
} /* sdb_rrd_describe */
+static int
+copy_data(sdb_timeseries_t *ts, rrd_value_t *data, time_t step,
+ size_t ds_cnt, char **ds_names)
+{
+ time_t start = SDB_TIME_TO_SECS(ts->start);
+ time_t end = SDB_TIME_TO_SECS(ts->end);
+ time_t t;
+
+ ssize_t ds_target[ds_cnt];
+ size_t i, j;
+
+ /* determine the target index of each data-source,
+ * or -1 if the data-source isn't wanted */
+ for (i = 0; i < ds_cnt; i++) {
+ ds_target[i] = -1;
+ for (j = 0; j < ts->data_names_len; j++) {
+ if (!strcmp(ds_names[i], ts->data_names[j])) {
+ ds_target[i] = j;
+ break;
+ }
+ }
+ }
+
+ /* check if any wanted data-sources is missing */
+ for (i = 0; i < ts->data_names_len; i++) {
+ bool found = false;
+
+ for (j = 0; j < ds_cnt; j++) {
+ if (!strcmp(ts->data_names[i], ds_names[j])) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ sdb_log(SDB_LOG_ERR, "Requested data-source '%s' not found",
+ ts->data_names[i]);
+ return -1;
+ }
+ }
+
+ for (t = start; t <= end; t += step) {
+ i = (size_t)(t - start) / (size_t)step;
+
+ for (j = 0; j < ds_cnt; ++j) {
+ if (ds_target[j] >= 0) {
+ size_t x = (size_t)ds_target[j];
+ ts->data[x][i].timestamp = SECS_TO_SDB_TIME(t);
+ ts->data[x][i].value = *data;
+ }
+ ++data;
+ }
+ }
+ return 0;
+}
+
static sdb_timeseries_t *
sdb_rrd_fetch(const char *id, sdb_timeseries_opts_t *opts,
sdb_object_t *user_data)
time_t start = (time_t)SDB_TIME_TO_SECS(opts->start);
time_t end = (time_t)SDB_TIME_TO_SECS(opts->end);
- time_t t;
unsigned long step = 0;
unsigned long ds_cnt = 0;
unsigned long val_cnt = 0;
char **ds_namv = NULL;
- rrd_value_t *data = NULL, *data_ptr;
+ rrd_value_t *data = NULL;
if (user_data) {
/* -> use RRDCacheD */
#ifdef HAVE_RRD_CLIENT_H
if (rrdc_flush(id)) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: Failed to flush "
- "'%s' through RRDCacheD: %s", id, rrd_get_error());
+ sdb_log(SDB_LOG_ERR, "Failed to flush '%s' through RRDCacheD: %s",
+ id, rrd_get_error());
return NULL;
}
#endif
&ds_cnt, &ds_namv, &data)) {
char errbuf[1024];
sdb_strerror(errno, errbuf, sizeof(errbuf));
- sdb_log(SDB_LOG_ERR, "rrdtool plugin: Failed to fetch data "
- "from %s: %s", id, errbuf);
+ sdb_log(SDB_LOG_ERR, "Failed to fetch data from %s: %s", id, errbuf);
return NULL;
}
val_cnt = (unsigned long)(end - start) / step;
- ts = sdb_timeseries_create(ds_cnt, (const char * const *)ds_namv, val_cnt);
+ /* RRDtool does not support fetching specific data-sources, so we'll have
+ * to filter the requested ones after fetching them all */
+ if (opts->data_names && opts->data_names_len)
+ ts = sdb_timeseries_create(opts->data_names_len,
+ (const char * const *)opts->data_names, val_cnt);
+ else
+ ts = sdb_timeseries_create(ds_cnt, (const char * const *)ds_namv, val_cnt);
if (! ts) {
char errbuf[1024];
sdb_strerror(errno, errbuf, sizeof(errbuf));
- sdb_log(SDB_LOG_ERR, "rrdtool plugin: Failed to allocate "
- "time-series object: %s", errbuf);
+ sdb_log(SDB_LOG_ERR, "Failed to allocate time-series object: %s", errbuf);
FREE_RRD_DATA();
return NULL;
}
ts->start = SECS_TO_SDB_TIME(start + (time_t)step);
ts->end = SECS_TO_SDB_TIME(end);
- data_ptr = data;
- for (t = start + (time_t)step; t <= end; t += (time_t)step) {
- unsigned long i, j;
-
- i = (unsigned long)(t - start) / step - 1;
-
- for (j = 0; j < ds_cnt; ++j) {
- ts->data[j][i].timestamp = SECS_TO_SDB_TIME(t);
- ts->data[j][i].value = *data_ptr;
- ++data_ptr;
- }
+ if (copy_data(ts, data, (time_t)step, (size_t)ds_cnt, ds_namv) < 0) {
+ FREE_RRD_DATA();
+ sdb_timeseries_destroy(ts);
+ return NULL;
}
FREE_RRD_DATA();
char *addr = NULL;
if (rrdcached_in_use) {
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: RRDCacheD does "
- "not support multiple connections");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD does not support multiple connections");
return -1;
}
#ifndef HAVE_RRD_CLIENT_H
- sdb_log(SDB_LOG_ERR, "timeseries::rrdtool: RRDCacheD client "
- "support not available in your SysDB build");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD client support not available in your SysDB build");
return -1;
#else
if (oconfig_get_string(ci, &addr)) {
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: RRDCacheD requires "
- "a single string argument\n\tUsage <RRDCacheD ADDR>");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD requires a single string argument\n"
+ "\tUsage <RRDCacheD ADDR>");
return -1;
}
if ((*addr != '/') && strncmp(addr, "unix:", strlen("unix:"))) {
/* XXX: add (optional) support for rrdc_fetch if available */
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: RRDCacheD only "
- "supports local (UNIX socket) addresses");
+ sdb_log(SDB_LOG_ERR, "RRDCacheD only supports local (UNIX socket) addresses");
return -1;
}
addr = strdup(addr);
if (! addr) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: Failed to duplicate "
- "string: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "Failed to duplicate string: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
if (ci->children_num)
- sdb_log(SDB_LOG_WARNING, "timeseries::unixsock: RRDCacheD does "
- "not support any child config options");
+ sdb_log(SDB_LOG_WARNING, "RRDCacheD does not support any child config options");
ud = sdb_object_create_wrapper("rrdcached-addr", addr, free);
if (! ud) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "timeseries::unixsock: Failed to create "
- "user-data object: %s",
+ sdb_log(SDB_LOG_ERR, "Failed to create user-data object: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
free(addr);
return -1;
if (! strcasecmp(child->key, "RRDCacheD"))
sdb_rrd_config_rrdcached(child);
else
- sdb_log(SDB_LOG_WARNING, "timeseries::rrdtool: Ignoring "
- "unknown config option '%s'.", child->key);
+ sdb_log(SDB_LOG_WARNING, "Ignoring unknown config option '%s'.", child->key);
}
return 0;
} /* sdb_rrd_config */