From: Florian Forster Date: Thu, 27 Aug 2009 07:06:16 +0000 (+0200) Subject: curl_json plugin: Renamed the “couchdb” plugin to “curl_json”. X-Git-Tag: collectd-4.8.0~28 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a30d7659c8ea291877708b5b1bb36756223e8c05;p=collectd.git curl_json plugin: Renamed the “couchdb” plugin to “curl_json”. On Thu, Aug 20, 2009 at 10:31:22AM -0700, Doug MacEachern wrote: > Wanted to bring this up before 4.8.. > When I first started on the couchdb plugin, there were metrics > specific to couchdb, but ended up making it generic and the metrics > are all specified in the config. Since then, I've looked at Dynomite > which has its own set of metrics exposed the same way: > http://gist.github.com/137771 > Also noticed Hadoop 0.21 daemons now support: "/metrics?format=json to > retrieve the data in a structured form.", but haven't had a chance to > try yet. I'm sure there's more too. So I'm wondering if 'couchdb' > should be renamed to something more generic, 'json' or 'yajl' maybe? > And/or pushing the curl/yajl code out to util functions, then add the > couchdb specific metrics to the couchdb plugin. Then also use the > util functions for dynomite, hadoop, etc., specific plugins. Thoughts? --- diff --git a/AUTHORS b/AUTHORS index be3a8382..b8969145 100644 --- a/AUTHORS +++ b/AUTHORS @@ -51,6 +51,7 @@ Doug MacEachern - OpenVPN plugin. - jcollectd (two-way JMX integration). - A few other patches to various plugins. + - curl_json plugin. Edward “Koko” Konetzko - fscache plugin. diff --git a/README b/README index 1cfa6434..d5b796c8 100644 --- a/README +++ b/README @@ -43,8 +43,9 @@ Features - conntrack Number of nf_conntrack entries. - - couchdb - Parse statistics from CouchDB JSON documents. + - curl_json + Retrieves JSON data via cURL and parses it according to user + configuration. - cpu CPU utilization: Time spent in the system, user, nice, idle, and related @@ -549,7 +550,7 @@ Prerequisites * libyajl (optional) - Parse JSON data. This is needed for the `couchdb' plugin. + Parse JSON data. This is needed for the `curl_json' plugin. Configuring / Compiling / Installing diff --git a/configure.in b/configure.in index 949b6edd..fbbe4884 100644 --- a/configure.in +++ b/configure.in @@ -3436,9 +3436,9 @@ plugin_ascent="no" plugin_battery="no" plugin_bind="no" plugin_conntrack="no" -plugin_couchdb="no" plugin_cpu="no" plugin_cpufreq="no" +plugin_curl_json="no" plugin_df="no" plugin_disk="no" plugin_entropy="no" @@ -3556,7 +3556,7 @@ fi if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes" then - plugin_couchdb="yes" + plugin_curl_json="yes" fi if test "x$have_processor_info" = "xyes" @@ -3706,11 +3706,11 @@ AC_PLUGIN([ascent], [$plugin_ascent], [AscentEmu player statistics]) AC_PLUGIN([battery], [$plugin_battery], [Battery statistics]) AC_PLUGIN([bind], [$plugin_bind], [ISC Bind nameserver statistics]) AC_PLUGIN([conntrack], [$plugin_conntrack], [nf_conntrack statistics]) -AC_PLUGIN([couchdb], [$plugin_couchdb], [CouchDB statistics]) AC_PLUGIN([cpufreq], [$plugin_cpufreq], [CPU frequency statistics]) AC_PLUGIN([cpu], [$plugin_cpu], [CPU usage statistics]) AC_PLUGIN([csv], [yes], [CSV output plugin]) AC_PLUGIN([curl], [$with_libcurl], [CURL generic web statistics]) +AC_PLUGIN([curl_json], [$plugin_curl_json], [CouchDB statistics]) AC_PLUGIN([dbi], [$with_libdbi], [General database statistics]) AC_PLUGIN([df], [$plugin_df], [Filesystem usage statistics]) AC_PLUGIN([disk], [$plugin_disk], [Disk usage statistics]) @@ -4004,11 +4004,11 @@ Configuration: battery . . . . . . . $enable_battery bind . . . . . . . . $enable_bind conntrack . . . . . . $enable_conntrack - couchdb . . . . . . . $enable_couchdb cpu . . . . . . . . . $enable_cpu cpufreq . . . . . . . $enable_cpufreq csv . . . . . . . . . $enable_csv curl . . . . . . . . $enable_curl + curl_json . . . . . . $enable_curl_json dbi . . . . . . . . . $enable_dbi df . . . . . . . . . $enable_df disk . . . . . . . . $enable_disk diff --git a/src/Makefile.am b/src/Makefile.am index 0ca68095..beef39a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -173,21 +173,6 @@ collectd_LDADD += "-dlopen" conntrack.la collectd_DEPENDENCIES += conntrack.la endif -if BUILD_PLUGIN_COUCHDB -pkglib_LTLIBRARIES += couchdb.la -couchdb_la_SOURCES = couchdb.c -couchdb_la_CFLAGS = $(AM_CFLAGS) -couchdb_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) -couchdb_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) -couchdb_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) -if BUILD_WITH_LIBCURL -couchdb_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) -couchdb_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) -endif -collectd_LDADD += "-dlopen" couchdb.la -collectd_DEPENDENCIES += couchdb.la -endif - if BUILD_PLUGIN_CPU pkglib_LTLIBRARIES += cpu.la cpu_la_SOURCES = cpu.c @@ -238,6 +223,21 @@ endif collectd_DEPENDENCIES += curl.la endif +if BUILD_PLUGIN_CURL_JSON +pkglib_LTLIBRARIES += curl_json.la +curl_json_la_SOURCES = curl_json.c +curl_json_la_CFLAGS = $(AM_CFLAGS) +curl_json_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS) +curl_json_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) +curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) +if BUILD_WITH_LIBCURL +curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS) +curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS) +endif +collectd_LDADD += "-dlopen" curl_json.la +collectd_DEPENDENCIES += curl_json.la +endif + if BUILD_PLUGIN_DBI pkglib_LTLIBRARIES += dbi.la dbi_la_SOURCES = dbi.c \ diff --git a/src/couchdb.c b/src/couchdb.c deleted file mode 100644 index 30f56da7..00000000 --- a/src/couchdb.c +++ /dev/null @@ -1,820 +0,0 @@ -/** - * collectd - src/couchdb.c - * Copyright (C) 2009 Doug MacEachern - * Copyright (C) 2006-2009 Florian octo Forster - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: - * Doug MacEachern - * Florian octo Forster - **/ - -#include "collectd.h" -#include "common.h" -#include "plugin.h" -#include "configfile.h" -#include "utils_avltree.h" - -#include -#include - -#define COUCHDB_DEFAULT_HOST "localhost" -#define COUCHDB_KEY_MAGIC 0x43484b59UL /* CHKY */ -#define COUCHDB_IS_KEY(key) (key)->magic == COUCHDB_KEY_MAGIC -#define COUCHDB_ANY "*" -#define COUCH_MIN(x,y) ((x) < (y) ? (x) : (y)) - -struct couchdb_key_s; -typedef struct couchdb_key_s couchdb_key_t; -struct couchdb_key_s /* {{{ */ -{ - char *path; - char *type; - char *instance; - unsigned long magic; -}; -/* }}} */ - -struct couchdb_s /* {{{ */ -{ - char *instance; - char *host; - - char *url; - char *user; - char *pass; - char *credentials; - int verify_peer; - int verify_host; - char *cacert; - - CURL *curl; - char curl_errbuf[CURL_ERROR_SIZE]; - - yajl_handle yajl; - c_avl_tree_t *tree; - couchdb_key_t *key; - int depth; - struct { - union { - c_avl_tree_t *tree; - couchdb_key_t *key; - }; - char name[DATA_MAX_NAME_LEN]; - } state[YAJL_MAX_DEPTH]; -}; -typedef struct couchdb_s couchdb_t; /* }}} */ - -static int couchdb_read (user_data_t *ud); -static int couchdb_curl_perform (couchdb_t *db, CURL *curl); -static void couchdb_submit (couchdb_t *db, couchdb_key_t *key, value_t *value); - -static size_t couchdb_curl_callback (void *buf, /* {{{ */ - size_t size, size_t nmemb, void *user_data) -{ - couchdb_t *db; - size_t len; - yajl_status status; - - len = size * nmemb; - - if (len <= 0) - return (len); - - db = user_data; - if (db == NULL) - return (0); - - status = yajl_parse(db->yajl, (unsigned char *)buf, len); - if (status == yajl_status_ok) - { - status = yajl_parse_complete(db->yajl); - return (len); - } - else if (status == yajl_status_insufficient_data) - return (len); - - if (status != yajl_status_ok) - { - unsigned char *msg = - yajl_get_error(db->yajl, 1, (unsigned char *)buf, len); - ERROR ("couchdb plugin: yajl_parse failed: %s", msg); - yajl_free_error(db->yajl, msg); - return (0); /* abort write callback */ - } - - return (len); -} /* }}} size_t couchdb_curl_callback */ - -static int couchdb_get_type (couchdb_key_t *key) -{ - const data_set_t *ds; - - ds = plugin_get_ds (key->type); - if (ds == NULL) - return -1; /* let plugin_write do the complaining */ - else - return ds->ds[0].type; /* XXX support ds->ds_len > 1 */ -} - -/* yajl callbacks */ -static int couchcb_integer (void *ctx, long val) -{ - couchdb_t *db = (couchdb_t *)ctx; - couchdb_key_t *key = db->state[db->depth].key; - - if (key != NULL) - { - value_t vt; - int type; - - type = couchdb_get_type (key); - if (type == DS_TYPE_COUNTER) - vt.counter = (counter_t) val; - else if (type == DS_TYPE_GAUGE) - vt.gauge = (gauge_t) val; - else if (type == DS_TYPE_DERIVE) - vt.derive = (derive_t) val; - else if (type == DS_TYPE_ABSOLUTE) - vt.absolute = (absolute_t) val; - else - return 0; - - couchdb_submit (db, key, &vt); - } - return 1; -} - -static int couchcb_double (void *ctx, double val) -{ - couchdb_t *db = (couchdb_t *)ctx; - couchdb_key_t *key = db->state[db->depth].key; - - if (key != NULL) - { - value_t vt; - int type; - - type = couchdb_get_type (key); - if (type == DS_TYPE_COUNTER) - vt.counter = (counter_t) val; - else if (type == DS_TYPE_GAUGE) - vt.gauge = (gauge_t) val; - else if (type == DS_TYPE_DERIVE) - vt.derive = (derive_t) val; - else if (type == DS_TYPE_ABSOLUTE) - vt.absolute = (absolute_t) val; - else - return 0; - - couchdb_submit (db, key, &vt); - } - return 1; -} - -static int couchcb_map_key (void *ctx, const unsigned char *val, - unsigned int len) -{ - couchdb_t *db = (couchdb_t *)ctx; - c_avl_tree_t *tree; - - tree = db->state[db->depth-1].tree; - - if (tree != NULL) - { - couchdb_key_t *value; - char *name; - - name = db->state[db->depth].name; - len = COUCH_MIN(len, sizeof (db->state[db->depth].name)-1); - sstrncpy (name, (char *)val, len+1); - - if (c_avl_get (tree, name, (void *) &value) == 0) - db->state[db->depth].key = value; - else if (c_avl_get (tree, COUCHDB_ANY, (void *) &value) == 0) - db->state[db->depth].key = value; - else - db->state[db->depth].key = NULL; - } - - return 1; -} - -static int couchcb_string (void *ctx, const unsigned char *val, - unsigned int len) -{ - couchdb_t *db = (couchdb_t *)ctx; - c_avl_tree_t *tree; - char *ptr; - - if (db->depth != 1) /* e.g. _all_dbs */ - return 1; - - couchcb_map_key (ctx, val, len); /* same logic */ - - tree = db->state[db->depth].tree; - - if ((tree != NULL) && (ptr = rindex (db->url, '/'))) - { - char url[PATH_MAX]; - CURL *curl; - - /* url =~ s,[^/]+$,$name, */ - len = (ptr - db->url) + 1; - ptr = url; - sstrncpy (ptr, db->url, sizeof (url)); - sstrncpy (ptr + len, db->state[db->depth].name, sizeof (url) - len); - - curl = curl_easy_duphandle (db->curl); - curl_easy_setopt (curl, CURLOPT_URL, url); - couchdb_curl_perform (db, curl); - curl_easy_cleanup (curl); - } - return 1; -} - -static int couchcb_start (void *ctx) -{ - couchdb_t *db = (couchdb_t *)ctx; - if (++db->depth >= YAJL_MAX_DEPTH) - { - ERROR ("couchdb plugin: %s depth exceeds max, aborting.", db->url); - return 0; - } - return 1; -} - -static int couchcb_end (void *ctx) -{ - couchdb_t *db = (couchdb_t *)ctx; - db->state[db->depth].tree = NULL; - --db->depth; - return 1; -} - -static int couchcb_start_map (void *ctx) -{ - return couchcb_start (ctx); -} - -static int couchcb_end_map (void *ctx) -{ - return couchcb_end (ctx); -} - -static int couchcb_start_array (void * ctx) -{ - return couchcb_start (ctx); -} - -static int couchcb_end_array (void * ctx) -{ - return couchcb_start (ctx); -} - -static yajl_callbacks ycallbacks = { - NULL, /* null */ - NULL, /* boolean */ - couchcb_integer, - couchcb_double, - NULL, /* number */ - couchcb_string, - couchcb_start_map, - couchcb_map_key, - couchcb_end_map, - couchcb_start_array, - couchcb_end_array -}; - -/* end yajl callbacks */ - -static void couchdb_key_free (couchdb_key_t *key) /* {{{ */ -{ - if (key == NULL) - return; - - sfree (key->path); - sfree (key->type); - sfree (key->instance); - - sfree (key); -} /* }}} void couchdb_key_free */ - -static void couchdb_tree_free (c_avl_tree_t *tree) /* {{{ */ -{ - char *name; - void *value; - - while (c_avl_pick (tree, (void *) &name, (void *) &value) == 0) - { - couchdb_key_t *key = (couchdb_key_t *)value; - - if (COUCHDB_IS_KEY(key)) - couchdb_key_free (key); - else - couchdb_tree_free ((c_avl_tree_t *)value); - - sfree (name); - } - - c_avl_destroy (tree); -} /* }}} void couchdb_tree_free */ - -static void couchdb_free (void *arg) /* {{{ */ -{ - couchdb_t *db; - - DEBUG ("couchdb plugin: couchdb_free (arg = %p);", arg); - - db = (couchdb_t *) arg; - - if (db == NULL) - return; - - if (db->curl != NULL) - curl_easy_cleanup (db->curl); - db->curl = NULL; - - if (db->tree != NULL) - couchdb_tree_free (db->tree); - db->tree = NULL; - - sfree (db->instance); - sfree (db->host); - - sfree (db->url); - sfree (db->user); - sfree (db->pass); - sfree (db->credentials); - sfree (db->cacert); - - sfree (db); -} /* }}} void couchdb_free */ - -/* Configuration handling functions {{{ */ - -static int couchdb_config_add_string (const char *name, char **dest, /* {{{ */ - oconfig_item_t *ci) -{ - if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) - { - WARNING ("couchdb plugin: `%s' needs exactly one string argument.", name); - return (-1); - } - - sfree (*dest); - *dest = strdup (ci->values[0].value.string); - if (*dest == NULL) - return (-1); - - return (0); -} /* }}} int couchdb_config_add_string */ - -static int couchdb_config_set_boolean (const char *name, int *dest, /* {{{ */ - oconfig_item_t *ci) -{ - if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)) - { - WARNING ("couchdb plugin: `%s' needs exactly one boolean argument.", name); - return (-1); - } - - *dest = ci->values[0].value.boolean ? 1 : 0; - - return (0); -} /* }}} int couchdb_config_set_boolean */ - -static c_avl_tree_t *couchdb_avl_create(void) -{ - return c_avl_create ((int (*) (const void *, const void *)) strcmp); -} - -static int couchdb_config_add_key (couchdb_t *db, /* {{{ */ - oconfig_item_t *ci) -{ - couchdb_key_t *key; - int status; - int i; - - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) - { - WARNING ("couchdb plugin: The `Key' block " - "needs exactly one string argument."); - return (-1); - } - - key = (couchdb_key_t *) malloc (sizeof (*key)); - if (key == NULL) - { - ERROR ("couchdb plugin: malloc failed."); - return (-1); - } - memset (key, 0, sizeof (*key)); - key->magic = COUCHDB_KEY_MAGIC; - - if (strcasecmp ("Key", ci->key) == 0) - { - status = couchdb_config_add_string ("Key", &key->path, ci); - if (status != 0) - { - sfree (key); - return (status); - } - } - else - { - ERROR ("couchdb plugin: couchdb_config: " - "Invalid key: %s", ci->key); - return (-1); - } - - status = 0; - for (i = 0; i < ci->children_num; i++) - { - oconfig_item_t *child = ci->children + i; - - if (strcasecmp ("Type", child->key) == 0) - status = couchdb_config_add_string ("Type", &key->type, child); - else if (strcasecmp ("Instance", child->key) == 0) - status = couchdb_config_add_string ("Instance", &key->instance, child); - else - { - WARNING ("couchdb plugin: Option `%s' not allowed here.", child->key); - status = -1; - } - - if (status != 0) - break; - } /* for (i = 0; i < ci->children_num; i++) */ - - while (status == 0) - { - if (key->type == NULL) - { - WARNING ("couchdb plugin: `Type' missing in `Key' block."); - status = -1; - } - - break; - } /* while (status == 0) */ - - /* store path in a tree that will match the json map structure, example: - * "httpd/requests/count", - * "httpd/requests/current" -> - * { "httpd": { "requests": { "count": $key, "current": $key } } } - */ - if (status == 0) - { - char *ptr; - char *name; - char ent[PATH_MAX]; - c_avl_tree_t *tree; - - if (db->tree == NULL) - db->tree = couchdb_avl_create(); - - tree = db->tree; - name = key->path; - ptr = key->path; - if (*ptr == '/') - ++ptr; - - name = ptr; - while (*ptr) - { - if (*ptr == '/') - { - c_avl_tree_t *value; - int len; - - len = ptr-name; - if (len == 0) - break; - sstrncpy (ent, name, len+1); - - if (c_avl_get (tree, ent, (void *) &value) != 0) - { - value = couchdb_avl_create (); - c_avl_insert (tree, strdup (ent), value); - } - - tree = value; - name = ptr+1; - } - ++ptr; - } - if (*name) - c_avl_insert (tree, strdup(name), key); - else - { - ERROR ("couchdb plugin: invalid key: %s", key->path); - status = -1; - } - } - - return (status); -} /* }}} int couchdb_config_add_key */ - -static int couchdb_init_curl (couchdb_t *db) /* {{{ */ -{ - db->curl = curl_easy_init (); - if (db->curl == NULL) - { - ERROR ("couchdb plugin: curl_easy_init failed."); - return (-1); - } - - curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, couchdb_curl_callback); - curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db); - curl_easy_setopt (db->curl, CURLOPT_USERAGENT, - PACKAGE_NAME"/"PACKAGE_VERSION); - curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf); - curl_easy_setopt (db->curl, CURLOPT_URL, db->url); - - if (db->user != NULL) - { - size_t credentials_size; - - credentials_size = strlen (db->user) + 2; - if (db->pass != NULL) - credentials_size += strlen (db->pass); - - db->credentials = (char *) malloc (credentials_size); - if (db->credentials == NULL) - { - ERROR ("couchdb plugin: malloc failed."); - return (-1); - } - - ssnprintf (db->credentials, credentials_size, "%s:%s", - db->user, (db->pass == NULL) ? "" : db->pass); - curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials); - } - - curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer); - curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYHOST, - db->verify_host ? 2 : 0); - if (db->cacert != NULL) - curl_easy_setopt (db->curl, CURLOPT_CAINFO, db->cacert); - - return (0); -} /* }}} int couchdb_init_curl */ - -static int couchdb_config_add_url (oconfig_item_t *ci) /* {{{ */ -{ - couchdb_t *db; - int status = 0; - int i; - - if ((ci->values_num != 1) - || (ci->values[0].type != OCONFIG_TYPE_STRING)) - { - WARNING ("couchdb plugin: The `URL' block " - "needs exactly one string argument."); - return (-1); - } - - db = (couchdb_t *) malloc (sizeof (*db)); - if (db == NULL) - { - ERROR ("couchdb plugin: malloc failed."); - return (-1); - } - memset (db, 0, sizeof (*db)); - - if (strcasecmp ("URL", ci->key) == 0) - { - status = couchdb_config_add_string ("URL", &db->url, ci); - if (status != 0) - { - sfree (db); - return (status); - } - } - else - { - ERROR ("couchdb plugin: couchdb_config: " - "Invalid key: %s", ci->key); - return (-1); - } - - /* Fill the `couchdb_t' structure.. */ - for (i = 0; i < ci->children_num; i++) - { - oconfig_item_t *child = ci->children + i; - - if (strcasecmp ("Instance", child->key) == 0) - status = couchdb_config_add_string ("Instance", &db->instance, child); - else if (strcasecmp ("Host", child->key) == 0) - status = couchdb_config_add_string ("Host", &db->host, child); - else if (strcasecmp ("User", child->key) == 0) - status = couchdb_config_add_string ("User", &db->user, child); - else if (strcasecmp ("Password", child->key) == 0) - status = couchdb_config_add_string ("Password", &db->pass, child); - else if (strcasecmp ("VerifyPeer", child->key) == 0) - status = couchdb_config_set_boolean ("VerifyPeer", &db->verify_peer, child); - else if (strcasecmp ("VerifyHost", child->key) == 0) - status = couchdb_config_set_boolean ("VerifyHost", &db->verify_host, child); - else if (strcasecmp ("CACert", child->key) == 0) - status = couchdb_config_add_string ("CACert", &db->cacert, child); - else if (strcasecmp ("Key", child->key) == 0) - status = couchdb_config_add_key (db, child); - else - { - WARNING ("couchdb plugin: Option `%s' not allowed here.", child->key); - status = -1; - } - - if (status != 0) - break; - } - - if (status == 0) - { - if (db->tree == NULL) - { - WARNING ("couchdb plugin: No (valid) `Key' block " - "within `URL' block `%s'.", db->url); - status = -1; - } - if (status == 0) - status = couchdb_init_curl (db); - } - - /* If all went well, register this database for reading */ - if (status == 0) - { - user_data_t ud; - char cb_name[DATA_MAX_NAME_LEN]; - - if (db->instance == NULL) - db->instance = strdup("default"); - - DEBUG ("couchdb plugin: Registering new read callback: %s", - db->instance); - - memset (&ud, 0, sizeof (ud)); - ud.data = (void *) db; - ud.free_func = couchdb_free; - - ssnprintf (cb_name, sizeof (cb_name), "couchdb-%s-%s", - db->instance, db->url); - - plugin_register_complex_read (cb_name, couchdb_read, - /* interval = */ NULL, &ud); - } - else - { - couchdb_free (db); - return (-1); - } - - return (0); -} - /* }}} int couchdb_config_add_database */ - -static int couchdb_config (oconfig_item_t *ci) /* {{{ */ -{ - int success; - int errors; - int status; - int i; - - success = 0; - errors = 0; - - for (i = 0; i < ci->children_num; i++) - { - oconfig_item_t *child = ci->children + i; - - if (strcasecmp ("URL", child->key) == 0) - { - status = couchdb_config_add_url (child); - if (status == 0) - success++; - else - errors++; - } - else - { - WARNING ("couchdb plugin: Option `%s' not allowed here.", child->key); - errors++; - } - } - - if ((success == 0) && (errors > 0)) - { - ERROR ("couchdb plugin: All statements failed."); - return (-1); - } - - return (0); -} /* }}} int couchdb_config */ - -/* }}} End of configuration handling functions */ - -static void couchdb_submit (couchdb_t *db, couchdb_key_t *key, value_t *value) /* {{{ */ -{ - value_list_t vl = VALUE_LIST_INIT; - char *host; - - vl.values = value; - vl.values_len = 1; - - if ((db->host == NULL) - || (strcmp ("", db->host) == 0) - || (strcmp (COUCHDB_DEFAULT_HOST, db->host) == 0)) - host = hostname_g; - else - host = db->host; - - if (key->instance == NULL) - ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s", - db->state[db->depth-1].name, db->state[db->depth].name); - else - sstrncpy (vl.type_instance, key->instance, sizeof (vl.type_instance)); - - sstrncpy (vl.host, host, sizeof (vl.host)); - sstrncpy (vl.plugin, "couchdb", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, db->instance, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, key->type, sizeof (vl.type)); - - plugin_dispatch_values (&vl); -} /* }}} int couchdb_submit */ - -static int couchdb_curl_perform (couchdb_t *db, CURL *curl) /* {{{ */ -{ - int status; - long rc; - char *url; - yajl_handle yprev = db->yajl; - - db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); - if (db->yajl == NULL) - { - ERROR ("couchdb plugin: yajl_alloc failed."); - return (-1); - } - - status = curl_easy_perform (curl); - - yajl_free (db->yajl); - db->yajl = yprev; - - curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rc); - - if (rc != 200) - { - ERROR ("couchdb plugin: curl_easy_perform failed with response code %ld (%s)", - rc, url); - return (-1); - } - - if (status != 0) - { - ERROR ("couchdb plugin: curl_easy_perform failed with status %i: %s (%s)", - status, db->curl_errbuf, url); - return (-1); - } - - return (0); -} /* }}} int couchdb_curl_perform */ - -static int couchdb_read (user_data_t *ud) /* {{{ */ -{ - couchdb_t *db; - - if ((ud == NULL) || (ud->data == NULL)) - { - ERROR ("couchdb plugin: couchdb_read: Invalid user data."); - return (-1); - } - - db = (couchdb_t *) ud->data; - - db->depth = 0; - memset (&db->state, 0, sizeof(db->state)); - db->state[db->depth].tree = db->tree; - db->key = NULL; - - return couchdb_curl_perform (db, db->curl); -} /* }}} int couchdb_read */ - -void module_register (void) -{ - plugin_register_complex_config ("couchdb", couchdb_config); -} /* void module_register */ diff --git a/src/curl_json.c b/src/curl_json.c new file mode 100644 index 00000000..53e8abda --- /dev/null +++ b/src/curl_json.c @@ -0,0 +1,822 @@ +/** + * collectd - src/curl_json.c + * Copyright (C) 2009 Doug MacEachern + * Copyright (C) 2006-2009 Florian octo Forster + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; only version 2 of the License is applicable. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: + * Doug MacEachern + * Florian octo Forster + **/ + +#include "collectd.h" +#include "common.h" +#include "plugin.h" +#include "configfile.h" +#include "utils_avltree.h" + +#include +#include + +#define CJ_DEFAULT_HOST "localhost" +#define CJ_KEY_MAGIC 0x43484b59UL /* CHKY */ +#define CJ_IS_KEY(key) (key)->magic == CJ_KEY_MAGIC +#define CJ_ANY "*" +#define COUCH_MIN(x,y) ((x) < (y) ? (x) : (y)) + +struct cj_key_s; +typedef struct cj_key_s cj_key_t; +struct cj_key_s /* {{{ */ +{ + char *path; + char *type; + char *instance; + unsigned long magic; +}; +/* }}} */ + +struct cj_s /* {{{ */ +{ + char *instance; + char *host; + + char *url; + char *user; + char *pass; + char *credentials; + int verify_peer; + int verify_host; + char *cacert; + + CURL *curl; + char curl_errbuf[CURL_ERROR_SIZE]; + + yajl_handle yajl; + c_avl_tree_t *tree; + cj_key_t *key; + int depth; + struct { + union { + c_avl_tree_t *tree; + cj_key_t *key; + }; + char name[DATA_MAX_NAME_LEN]; + } state[YAJL_MAX_DEPTH]; +}; +typedef struct cj_s cj_t; /* }}} */ + +static int cj_read (user_data_t *ud); +static int cj_curl_perform (cj_t *db, CURL *curl); +static void cj_submit (cj_t *db, cj_key_t *key, value_t *value); + +static size_t cj_curl_callback (void *buf, /* {{{ */ + size_t size, size_t nmemb, void *user_data) +{ + cj_t *db; + size_t len; + yajl_status status; + + len = size * nmemb; + + if (len <= 0) + return (len); + + db = user_data; + if (db == NULL) + return (0); + + status = yajl_parse(db->yajl, (unsigned char *)buf, len); + if (status == yajl_status_ok) + { + status = yajl_parse_complete(db->yajl); + return (len); + } + else if (status == yajl_status_insufficient_data) + return (len); + + if (status != yajl_status_ok) + { + unsigned char *msg = + yajl_get_error(db->yajl, 1, (unsigned char *)buf, len); + ERROR ("curl_json plugin: yajl_parse failed: %s", msg); + yajl_free_error(db->yajl, msg); + return (0); /* abort write callback */ + } + + return (len); +} /* }}} size_t cj_curl_callback */ + +static int cj_get_type (cj_key_t *key) +{ + const data_set_t *ds; + + ds = plugin_get_ds (key->type); + if (ds == NULL) + return -1; /* let plugin_write do the complaining */ + else + return ds->ds[0].type; /* XXX support ds->ds_len > 1 */ +} + +/* yajl callbacks */ +static int cj_cb_integer (void *ctx, long val) +{ + cj_t *db = (cj_t *)ctx; + cj_key_t *key = db->state[db->depth].key; + + if (key != NULL) + { + value_t vt; + int type; + + type = cj_get_type (key); + if (type == DS_TYPE_COUNTER) + vt.counter = (counter_t) val; + else if (type == DS_TYPE_GAUGE) + vt.gauge = (gauge_t) val; + else if (type == DS_TYPE_DERIVE) + vt.derive = (derive_t) val; + else if (type == DS_TYPE_ABSOLUTE) + vt.absolute = (absolute_t) val; + else + return 0; + + cj_submit (db, key, &vt); + } + return 1; +} + +static int cj_cb_double (void *ctx, double val) +{ + cj_t *db = (cj_t *)ctx; + cj_key_t *key = db->state[db->depth].key; + + if (key != NULL) + { + value_t vt; + int type; + + type = cj_get_type (key); + if (type == DS_TYPE_COUNTER) + vt.counter = (counter_t) val; + else if (type == DS_TYPE_GAUGE) + vt.gauge = (gauge_t) val; + else if (type == DS_TYPE_DERIVE) + vt.derive = (derive_t) val; + else if (type == DS_TYPE_ABSOLUTE) + vt.absolute = (absolute_t) val; + else + return 0; + + cj_submit (db, key, &vt); + } + return 1; +} + +static int cj_cb_map_key (void *ctx, const unsigned char *val, + unsigned int len) +{ + cj_t *db = (cj_t *)ctx; + c_avl_tree_t *tree; + + tree = db->state[db->depth-1].tree; + + if (tree != NULL) + { + cj_key_t *value; + char *name; + + name = db->state[db->depth].name; + len = COUCH_MIN(len, sizeof (db->state[db->depth].name)-1); + sstrncpy (name, (char *)val, len+1); + + if (c_avl_get (tree, name, (void *) &value) == 0) + db->state[db->depth].key = value; + else if (c_avl_get (tree, CJ_ANY, (void *) &value) == 0) + db->state[db->depth].key = value; + else + db->state[db->depth].key = NULL; + } + + return 1; +} + +static int cj_cb_string (void *ctx, const unsigned char *val, + unsigned int len) +{ + cj_t *db = (cj_t *)ctx; + c_avl_tree_t *tree; + char *ptr; + + if (db->depth != 1) /* e.g. _all_dbs */ + return 1; + + cj_cb_map_key (ctx, val, len); /* same logic */ + + tree = db->state[db->depth].tree; + + if ((tree != NULL) && (ptr = rindex (db->url, '/'))) + { + char url[PATH_MAX]; + CURL *curl; + + /* url =~ s,[^/]+$,$name, */ + len = (ptr - db->url) + 1; + ptr = url; + sstrncpy (ptr, db->url, sizeof (url)); + sstrncpy (ptr + len, db->state[db->depth].name, sizeof (url) - len); + + curl = curl_easy_duphandle (db->curl); + curl_easy_setopt (curl, CURLOPT_URL, url); + cj_curl_perform (db, curl); + curl_easy_cleanup (curl); + } + return 1; +} + +static int cj_cb_start (void *ctx) +{ + cj_t *db = (cj_t *)ctx; + if (++db->depth >= YAJL_MAX_DEPTH) + { + ERROR ("curl_json plugin: %s depth exceeds max, aborting.", db->url); + return 0; + } + return 1; +} + +static int cj_cb_end (void *ctx) +{ + cj_t *db = (cj_t *)ctx; + db->state[db->depth].tree = NULL; + --db->depth; + return 1; +} + +static int cj_cb_start_map (void *ctx) +{ + return cj_cb_start (ctx); +} + +static int cj_cb_end_map (void *ctx) +{ + return cj_cb_end (ctx); +} + +static int cj_cb_start_array (void * ctx) +{ + return cj_cb_start (ctx); +} + +static int cj_cb_end_array (void * ctx) +{ + return cj_cb_start (ctx); +} + +static yajl_callbacks ycallbacks = { + NULL, /* null */ + NULL, /* boolean */ + cj_cb_integer, + cj_cb_double, + NULL, /* number */ + cj_cb_string, + cj_cb_start_map, + cj_cb_map_key, + cj_cb_end_map, + cj_cb_start_array, + cj_cb_end_array +}; + +/* end yajl callbacks */ + +static void cj_key_free (cj_key_t *key) /* {{{ */ +{ + if (key == NULL) + return; + + sfree (key->path); + sfree (key->type); + sfree (key->instance); + + sfree (key); +} /* }}} void cj_key_free */ + +static void cj_tree_free (c_avl_tree_t *tree) /* {{{ */ +{ + char *name; + void *value; + + while (c_avl_pick (tree, (void *) &name, (void *) &value) == 0) + { + cj_key_t *key = (cj_key_t *)value; + + if (CJ_IS_KEY(key)) + cj_key_free (key); + else + cj_tree_free ((c_avl_tree_t *)value); + + sfree (name); + } + + c_avl_destroy (tree); +} /* }}} void cj_tree_free */ + +static void cj_free (void *arg) /* {{{ */ +{ + cj_t *db; + + DEBUG ("curl_json plugin: cj_free (arg = %p);", arg); + + db = (cj_t *) arg; + + if (db == NULL) + return; + + if (db->curl != NULL) + curl_easy_cleanup (db->curl); + db->curl = NULL; + + if (db->tree != NULL) + cj_tree_free (db->tree); + db->tree = NULL; + + sfree (db->instance); + sfree (db->host); + + sfree (db->url); + sfree (db->user); + sfree (db->pass); + sfree (db->credentials); + sfree (db->cacert); + + sfree (db); +} /* }}} void cj_free */ + +/* Configuration handling functions {{{ */ + +static int cj_config_add_string (const char *name, char **dest, /* {{{ */ + oconfig_item_t *ci) +{ + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("curl_json plugin: `%s' needs exactly one string argument.", name); + return (-1); + } + + sfree (*dest); + *dest = strdup (ci->values[0].value.string); + if (*dest == NULL) + return (-1); + + return (0); +} /* }}} int cj_config_add_string */ + +static int cj_config_set_boolean (const char *name, int *dest, /* {{{ */ + oconfig_item_t *ci) +{ + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)) + { + WARNING ("curl_json plugin: `%s' needs exactly one boolean argument.", name); + return (-1); + } + + *dest = ci->values[0].value.boolean ? 1 : 0; + + return (0); +} /* }}} int cj_config_set_boolean */ + +static c_avl_tree_t *cj_avl_create(void) +{ + return c_avl_create ((int (*) (const void *, const void *)) strcmp); +} + +static int cj_config_add_key (cj_t *db, /* {{{ */ + oconfig_item_t *ci) +{ + cj_key_t *key; + int status; + int i; + + if ((ci->values_num != 1) + || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("curl_json plugin: The `Key' block " + "needs exactly one string argument."); + return (-1); + } + + key = (cj_key_t *) malloc (sizeof (*key)); + if (key == NULL) + { + ERROR ("curl_json plugin: malloc failed."); + return (-1); + } + memset (key, 0, sizeof (*key)); + key->magic = CJ_KEY_MAGIC; + + if (strcasecmp ("Key", ci->key) == 0) + { + status = cj_config_add_string ("Key", &key->path, ci); + if (status != 0) + { + sfree (key); + return (status); + } + } + else + { + ERROR ("curl_json plugin: cj_config: " + "Invalid key: %s", ci->key); + return (-1); + } + + status = 0; + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + + if (strcasecmp ("Type", child->key) == 0) + status = cj_config_add_string ("Type", &key->type, child); + else if (strcasecmp ("Instance", child->key) == 0) + status = cj_config_add_string ("Instance", &key->instance, child); + else + { + WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key); + status = -1; + } + + if (status != 0) + break; + } /* for (i = 0; i < ci->children_num; i++) */ + + while (status == 0) + { + if (key->type == NULL) + { + WARNING ("curl_json plugin: `Type' missing in `Key' block."); + status = -1; + } + + break; + } /* while (status == 0) */ + + /* store path in a tree that will match the json map structure, example: + * "httpd/requests/count", + * "httpd/requests/current" -> + * { "httpd": { "requests": { "count": $key, "current": $key } } } + */ + if (status == 0) + { + char *ptr; + char *name; + char ent[PATH_MAX]; + c_avl_tree_t *tree; + + if (db->tree == NULL) + db->tree = cj_avl_create(); + + tree = db->tree; + name = key->path; + ptr = key->path; + if (*ptr == '/') + ++ptr; + + name = ptr; + while (*ptr) + { + if (*ptr == '/') + { + c_avl_tree_t *value; + int len; + + len = ptr-name; + if (len == 0) + break; + sstrncpy (ent, name, len+1); + + if (c_avl_get (tree, ent, (void *) &value) != 0) + { + value = cj_avl_create (); + c_avl_insert (tree, strdup (ent), value); + } + + tree = value; + name = ptr+1; + } + ++ptr; + } + if (*name) + c_avl_insert (tree, strdup(name), key); + else + { + ERROR ("curl_json plugin: invalid key: %s", key->path); + status = -1; + } + } + + return (status); +} /* }}} int cj_config_add_key */ + +static int cj_init_curl (cj_t *db) /* {{{ */ +{ + db->curl = curl_easy_init (); + if (db->curl == NULL) + { + ERROR ("curl_json plugin: curl_easy_init failed."); + return (-1); + } + + curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback); + curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db); + curl_easy_setopt (db->curl, CURLOPT_USERAGENT, + PACKAGE_NAME"/"PACKAGE_VERSION); + curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf); + curl_easy_setopt (db->curl, CURLOPT_URL, db->url); + + if (db->user != NULL) + { + size_t credentials_size; + + credentials_size = strlen (db->user) + 2; + if (db->pass != NULL) + credentials_size += strlen (db->pass); + + db->credentials = (char *) malloc (credentials_size); + if (db->credentials == NULL) + { + ERROR ("curl_json plugin: malloc failed."); + return (-1); + } + + ssnprintf (db->credentials, credentials_size, "%s:%s", + db->user, (db->pass == NULL) ? "" : db->pass); + curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials); + } + + curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer); + curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYHOST, + db->verify_host ? 2 : 0); + if (db->cacert != NULL) + curl_easy_setopt (db->curl, CURLOPT_CAINFO, db->cacert); + + return (0); +} /* }}} int cj_init_curl */ + +static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ +{ + cj_t *db; + int status = 0; + int i; + + if ((ci->values_num != 1) + || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("curl_json plugin: The `URL' block " + "needs exactly one string argument."); + return (-1); + } + + db = (cj_t *) malloc (sizeof (*db)); + if (db == NULL) + { + ERROR ("curl_json plugin: malloc failed."); + return (-1); + } + memset (db, 0, sizeof (*db)); + + if (strcasecmp ("URL", ci->key) == 0) + { + status = cj_config_add_string ("URL", &db->url, ci); + if (status != 0) + { + sfree (db); + return (status); + } + } + else + { + ERROR ("curl_json plugin: cj_config: " + "Invalid key: %s", ci->key); + return (-1); + } + + /* Fill the `cj_t' structure.. */ + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + + if (strcasecmp ("Instance", child->key) == 0) + status = cj_config_add_string ("Instance", &db->instance, child); + else if (strcasecmp ("Host", child->key) == 0) + status = cj_config_add_string ("Host", &db->host, child); + else if (strcasecmp ("User", child->key) == 0) + status = cj_config_add_string ("User", &db->user, child); + else if (strcasecmp ("Password", child->key) == 0) + status = cj_config_add_string ("Password", &db->pass, child); + else if (strcasecmp ("VerifyPeer", child->key) == 0) + status = cj_config_set_boolean ("VerifyPeer", &db->verify_peer, child); + else if (strcasecmp ("VerifyHost", child->key) == 0) + status = cj_config_set_boolean ("VerifyHost", &db->verify_host, child); + else if (strcasecmp ("CACert", child->key) == 0) + status = cj_config_add_string ("CACert", &db->cacert, child); + else if (strcasecmp ("Key", child->key) == 0) + status = cj_config_add_key (db, child); + else + { + WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key); + status = -1; + } + + if (status != 0) + break; + } + + if (status == 0) + { + if (db->tree == NULL) + { + WARNING ("curl_json plugin: No (valid) `Key' block " + "within `URL' block `%s'.", db->url); + status = -1; + } + if (status == 0) + status = cj_init_curl (db); + } + + /* If all went well, register this database for reading */ + if (status == 0) + { + user_data_t ud; + char cb_name[DATA_MAX_NAME_LEN]; + + if (db->instance == NULL) + db->instance = strdup("default"); + + DEBUG ("curl_json plugin: Registering new read callback: %s", + db->instance); + + memset (&ud, 0, sizeof (ud)); + ud.data = (void *) db; + ud.free_func = cj_free; + + ssnprintf (cb_name, sizeof (cb_name), "curl_json-%s-%s", + db->instance, db->url); + + plugin_register_complex_read (cb_name, cj_read, + /* interval = */ NULL, &ud); + } + else + { + cj_free (db); + return (-1); + } + + return (0); +} + /* }}} int cj_config_add_database */ + +static int cj_config (oconfig_item_t *ci) /* {{{ */ +{ + int success; + int errors; + int status; + int i; + + success = 0; + errors = 0; + + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + + if (strcasecmp ("URL", child->key) == 0) + { + status = cj_config_add_url (child); + if (status == 0) + success++; + else + errors++; + } + else + { + WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key); + errors++; + } + } + + if ((success == 0) && (errors > 0)) + { + ERROR ("curl_json plugin: All statements failed."); + return (-1); + } + + return (0); +} /* }}} int cj_config */ + +/* }}} End of configuration handling functions */ + +static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */ +{ + value_list_t vl = VALUE_LIST_INIT; + char *host; + + vl.values = value; + vl.values_len = 1; + + if ((db->host == NULL) + || (strcmp ("", db->host) == 0) + || (strcmp (CJ_DEFAULT_HOST, db->host) == 0)) + host = hostname_g; + else + host = db->host; + + if (key->instance == NULL) + ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s", + db->state[db->depth-1].name, db->state[db->depth].name); + else + sstrncpy (vl.type_instance, key->instance, sizeof (vl.type_instance)); + + sstrncpy (vl.host, host, sizeof (vl.host)); + sstrncpy (vl.plugin, "curl_json", sizeof (vl.plugin)); + sstrncpy (vl.plugin_instance, db->instance, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, key->type, sizeof (vl.type)); + + plugin_dispatch_values (&vl); +} /* }}} int cj_submit */ + +static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */ +{ + int status; + long rc; + char *url; + yajl_handle yprev = db->yajl; + + db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); + if (db->yajl == NULL) + { + ERROR ("curl_json plugin: yajl_alloc failed."); + return (-1); + } + + status = curl_easy_perform (curl); + + yajl_free (db->yajl); + db->yajl = yprev; + + curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rc); + + if (rc != 200) + { + ERROR ("curl_json plugin: curl_easy_perform failed with response code %ld (%s)", + rc, url); + return (-1); + } + + if (status != 0) + { + ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)", + status, db->curl_errbuf, url); + return (-1); + } + + return (0); +} /* }}} int cj_curl_perform */ + +static int cj_read (user_data_t *ud) /* {{{ */ +{ + cj_t *db; + + if ((ud == NULL) || (ud->data == NULL)) + { + ERROR ("curl_json plugin: cj_read: Invalid user data."); + return (-1); + } + + db = (cj_t *) ud->data; + + db->depth = 0; + memset (&db->state, 0, sizeof(db->state)); + db->state[db->depth].tree = db->tree; + db->key = NULL; + + return cj_curl_perform (db, db->curl); +} /* }}} int cj_read */ + +void module_register (void) +{ + plugin_register_complex_config ("curl_json", cj_config); +} /* void module_register */ + +/* vim: set sw=2 sts=2 et fdm=marker : */