/**
* collectd - src/bind.c
- * Copyright (C) 2009 Bruno Prémont
- * Copyright (C) 2009 Florian Forster
+ * Copyright (C) 2009 Bruno Prémont
+ * Copyright (C) 2009,2010 Florian 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
*
* Authors:
* Bruno Prémont <bonbons at linux-vserver.org>
- * Florian Forster <octo at verplant.org>
+ * Florian Forster <octo at collectd.org>
**/
-/* Set to C99 and POSIX code */
-#ifndef _ISOC99_SOURCE
-# define _ISOC99_SOURCE
-#endif
-#ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE
-#endif
-#ifndef _POSIX_C_SOURCE
-# define _POSIX_C_SOURCE 200112L
-#endif
-#ifndef _REENTRANT
-# define _REENTRANT
-#endif
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 600
-#endif
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
+#include "config.h"
+
+#if STRPTIME_NEEDS_STANDARDS
+# ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE 1
+# endif
+# ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+# endif
+# ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 500
+# endif
+#endif /* STRPTIME_NEEDS_STANDARDS */
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
+/* Some versions of libcurl don't include this themselves and then don't have
+ * fd_set available. */
+#if HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
#include <curl/curl.h>
#include <libxml/parser.h>
#include <libxml/xpath.h>
* `list_info_ptr_t' are passed to the callbacks in the `void *user_data'
* pointer.
*/
-typedef int (*list_callback_t) (const char *name, counter_t value,
+typedef int (*list_callback_t) (const char *name, value_t value,
time_t current_time, void *user_data);
struct cb_view_s
};
typedef struct list_info_ptr_s list_info_ptr_t;
+/* FIXME: Enabled by default for backwards compatibility. */
+/* TODO: Remove time parsing code. */
+static _Bool config_parse_time = 1;
+
static char *url = NULL;
static int global_opcodes = 1;
static int global_qtypes = 1;
/* Rejects */
{ "AuthQryRej", "dns_reject", "authorative" },
{ "RecQryRej", "dns_reject", "recursive" },
- { "XfrRej", "dns_reject", "transer" },
+ { "XfrRej", "dns_reject", "transfer" },
{ "UpdateRej", "dns_reject", "update" },
/* Responses */
{ "Response", "dns_response", "normal" },
{ "NotifyRej", "dns_notify", "rejected" },
/* SOA/AXFS/IXFS requests */
{ "SOAOutv4", "dns_opcode", "SOA-IPv4" },
- { "SOAOutv6", "dns_opcode", "SOA-IPv4" },
+ { "SOAOutv6", "dns_opcode", "SOA-IPv6" },
{ "AXFRReqv4", "dns_opcode", "AXFR-IPv4" },
{ "AXFRReqv6", "dns_opcode", "AXFR-IPv6" },
{ "IXFRReqv4", "dns_opcode", "IXFR-IPv4" },
STATIC_ARRAY_SIZE (memsummary_translation_table);
/* }}} */
-static void submit_counter(time_t ts, const char *plugin_instance, /* {{{ */
- const char *type, const char *type_instance, counter_t value)
+static void submit (time_t ts, const char *plugin_instance, /* {{{ */
+ const char *type, const char *type_instance, value_t value)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- values[0].counter = value;
+ values[0] = value;
vl.values = values;
vl.values_len = 1;
- vl.time = ts;
+ if (config_parse_time)
+ vl.time = TIME_T_TO_CDTIME_T (ts);
sstrncpy(vl.host, hostname_g, sizeof(vl.host));
sstrncpy(vl.plugin, "bind", sizeof(vl.plugin));
if (plugin_instance) {
replace_special (vl.plugin_instance, sizeof (vl.plugin_instance));
}
plugin_dispatch_values(&vl);
-} /* }}} void submit_counter */
+} /* }}} void submit */
static size_t bind_curl_callback (void *buf, size_t size, /* {{{ */
size_t nmemb, void __attribute__((unused)) *stream)
* Callback, that's called with a translation table.
* (Plugin instance is fixed, type and type instance come from lookup table.)
*/
-static int bind_xml_table_callback (const char *name, counter_t value, /* {{{ */
+static int bind_xml_table_callback (const char *name, value_t value, /* {{{ */
time_t current_time, void *user_data)
{
translation_table_ptr_t *table = (translation_table_ptr_t *) user_data;
if (strcmp (table->table[i].xml_name, name) != 0)
continue;
- submit_counter (current_time,
+ submit (current_time,
table->plugin_instance,
table->table[i].type,
table->table[i].type_instance,
* (Plugin instance and type are fixed, xml name is used as type instance.)
*/
static int bind_xml_list_callback (const char *name, /* {{{ */
- counter_t value, time_t current_time, void *user_data)
+ value_t value, time_t current_time, void *user_data)
{
list_info_ptr_t *list_info = (list_info_ptr_t *) user_data;
if (list_info == NULL)
return (-1);
- submit_counter (current_time,
+ submit (current_time,
list_info->plugin_instance,
list_info->type,
/* type instance = */ name,
return (0);
} /* }}} int bind_xml_list_callback */
-static int bind_xml_read_counter (xmlDoc *doc, xmlNode *node, /* {{{ */
- counter_t *ret_value)
+static int bind_xml_read_derive (xmlDoc *doc, xmlNode *node, /* {{{ */
+ derive_t *ret_value)
+{
+ char *str_ptr;
+ value_t value;
+ int status;
+
+ str_ptr = (char *) xmlNodeListGetString (doc, node->xmlChildrenNode, 1);
+ if (str_ptr == NULL)
+ {
+ ERROR ("bind plugin: bind_xml_read_derive: xmlNodeListGetString failed.");
+ return (-1);
+ }
+
+ status = parse_value (str_ptr, &value, DS_TYPE_DERIVE);
+ if (status != 0)
+ {
+ ERROR ("bind plugin: Parsing string \"%s\" to derive value failed.",
+ str_ptr);
+ return (-1);
+ }
+
+ *ret_value = value.derive;
+ return (0);
+} /* }}} int bind_xml_read_derive */
+
+static int bind_xml_read_gauge (xmlDoc *doc, xmlNode *node, /* {{{ */
+ gauge_t *ret_value)
{
char *str_ptr, *end_ptr;
- long long int value;
+ double value;
str_ptr = (char *) xmlNodeListGetString (doc, node->xmlChildrenNode, 1);
if (str_ptr == NULL)
{
- ERROR ("bind plugin: bind_xml_read_counter: xmlNodeListGetString failed.");
+ ERROR ("bind plugin: bind_xml_read_gauge: xmlNodeListGetString failed.");
return (-1);
}
errno = 0;
- value = strtoll (str_ptr, &end_ptr, 10);
+ value = strtod (str_ptr, &end_ptr);
xmlFree(str_ptr);
if (str_ptr == end_ptr || errno)
{
if (errno && (value < 0))
- ERROR ("bind plugin: bind_xml_read_counter: strtoll failed with underflow.");
+ ERROR ("bind plugin: bind_xml_read_gauge: strtod failed with underflow.");
else if (errno && (value > 0))
- ERROR ("bind plugin: bind_xml_read_counter: strtoll failed with overflow.");
+ ERROR ("bind plugin: bind_xml_read_gauge: strtod failed with overflow.");
else
- ERROR ("bind plugin: bind_xml_read_counter: strtoll failed.");
+ ERROR ("bind plugin: bind_xml_read_gauge: strtod failed.");
return (-1);
}
- *ret_value = value;
+ *ret_value = (gauge_t) value;
return (0);
-} /* }}} int bind_xml_read_counter */
+} /* }}} int bind_xml_read_gauge */
static int bind_xml_read_timestamp (const char *xpath_expression, /* {{{ */
xmlDoc *doc, xmlXPathContext *xpathCtx, time_t *ret_value)
return (-1);
}
- *ret_value = timegm(&tm);
+ *ret_value = mktime(&tm);
xmlXPathFreeObject (xpathObj);
return (0);
* Reads statistics in the form:
* <foo>
* <name>QUERY</name>
- * <value>123</name>
+ * <counter>123</counter>
* </foo>
*/
static int bind_parse_generic_name_value (const char *xpath_expression, /* {{{ */
list_callback_t list_callback,
void *user_data,
xmlDoc *doc, xmlXPathContext *xpathCtx,
- time_t current_time)
+ time_t current_time, int ds_type)
{
xmlXPathObject *xpathObj = NULL;
int num_entries;
{
xmlNode *name_node = NULL;
xmlNode *counter = NULL;
+ xmlNode *parent;
xmlNode *child;
+ parent = xpathObj->nodesetval->nodeTab[i];
+ DEBUG ("bind plugin: bind_parse_generic_name_value: parent->name = %s;",
+ (char *) parent->name);
+
/* Iterate over all child nodes. */
- for (child = xpathObj->nodesetval->nodeTab[i]->xmlChildrenNode;
+ for (child = parent->xmlChildrenNode;
child != NULL;
child = child->next)
{
{
char *name = (char *) xmlNodeListGetString (doc,
name_node->xmlChildrenNode, 1);
- counter_t value;
+ value_t value;
int status;
- status = bind_xml_read_counter (doc, counter, &value);
+ if (ds_type == DS_TYPE_GAUGE)
+ status = bind_xml_read_gauge (doc, counter, &value.gauge);
+ else
+ status = bind_xml_read_derive (doc, counter, &value.derive);
if (status != 0)
continue;
list_callback_t list_callback,
void *user_data,
xmlDoc *doc, xmlXPathContext *xpathCtx,
- time_t current_time)
+ time_t current_time, int ds_type)
{
xmlXPathObject *xpathObj = NULL;
int num_entries;
child = child->next)
{
char *node_name;
- counter_t value;
+ value_t value;
int status;
if (child->type != XML_ELEMENT_NODE)
continue;
node_name = (char *) child->name;
- status = bind_xml_read_counter (doc, child, &value);
+
+ if (ds_type == DS_TYPE_GAUGE)
+ status = bind_xml_read_gauge (doc, child, &value.gauge);
+ else
+ status = bind_xml_read_derive (doc, child, &value.derive);
if (status != 0)
continue;
return (0);
} /* }}} int bind_parse_generic_value_list */
+/*
+ * bind_parse_generic_name_attr_value_list
+ *
+ * Reads statistics in the form:
+ * <foo>
+ * <counter name="name0">123</counter>
+ * <counter name="name1">234</counter>
+ * <counter name="name2">345</counter>
+ * :
+ * </foo>
+ */
+static int bind_parse_generic_name_attr_value_list (const char *xpath_expression, /* {{{ */
+ list_callback_t list_callback,
+ void *user_data,
+ xmlDoc *doc, xmlXPathContext *xpathCtx,
+ time_t current_time, int ds_type)
+{
+ xmlXPathObject *xpathObj = NULL;
+ int num_entries;
+ int i;
+
+ xpathObj = xmlXPathEvalExpression(BAD_CAST xpath_expression, xpathCtx);
+ if (xpathObj == NULL)
+ {
+ ERROR("bind plugin: Unable to evaluate XPath expression `%s'.",
+ xpath_expression);
+ return (-1);
+ }
+
+ num_entries = 0;
+ /* Iterate over all matching nodes. */
+ for (i = 0; xpathObj->nodesetval && (i < xpathObj->nodesetval->nodeNr); i++)
+ {
+ xmlNode *child;
+
+ /* Iterate over all child nodes. */
+ for (child = xpathObj->nodesetval->nodeTab[i]->xmlChildrenNode;
+ child != NULL;
+ child = child->next)
+ {
+ if (child->type != XML_ELEMENT_NODE)
+ continue;
+
+ if (strncmp ("counter", (char *) child->name, strlen ("counter")) != 0)
+ continue;
+
+ char *attr_name;
+ value_t value;
+ int status;
+
+ attr_name = (char *) xmlGetProp (child, BAD_CAST "name");
+ if (attr_name == NULL)
+ {
+ DEBUG ("bind plugin: found <counter> without name.");
+ continue;
+ }
+ if (ds_type == DS_TYPE_GAUGE)
+ status = bind_xml_read_gauge (doc, child, &value.gauge);
+ else
+ status = bind_xml_read_derive (doc, child, &value.derive);
+ if (status != 0)
+ continue;
+
+ status = (*list_callback) (attr_name, value, current_time, user_data);
+ if (status == 0)
+ num_entries++;
+ }
+ }
+
+ DEBUG ("bind plugin: Found %d %s for XPath expression `%s'",
+ num_entries, (num_entries == 1) ? "entry" : "entries",
+ xpath_expression);
+
+ xmlXPathFreeObject(xpathObj);
+
+ return (0);
+} /* }}} int bind_parse_generic_name_attr_value_list */
+
static int bind_xml_stats_handle_zone (int version, xmlDoc *doc, /* {{{ */
xmlXPathContext *path_ctx, xmlNode *node, cb_view_t *view,
time_t current_time)
xmlFree (zone_name);
zone_name = NULL;
- if (j >= views_num)
+ if (j >= views->zones_num)
{
xmlXPathFreeObject (path_obj);
return (0);
bind_parse_generic_value_list (/* xpath = */ "counters",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, path_ctx, current_time);
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
} /* }}} */
xmlXPathFreeObject (path_obj);
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
xmlXPathContext *path_ctx, xmlNode *node, time_t current_time)
{
- xmlXPathObject *path_obj;
char *view_name = NULL;
cb_view_t *view;
int i;
size_t j;
- path_obj = xmlXPathEvalExpression (BAD_CAST "name", path_ctx);
- if (path_obj == NULL)
+ if (version == 3)
{
- ERROR ("bind plugin: xmlXPathEvalExpression failed.");
- return (-1);
- }
+ view_name = (char*) xmlGetProp(node, BAD_CAST "name");
- for (i = 0; path_obj->nodesetval && (i < path_obj->nodesetval->nodeNr); i++)
- {
- view_name = (char *) xmlNodeListGetString (doc,
- path_obj->nodesetval->nodeTab[i]->xmlChildrenNode, 1);
- if (view_name != NULL)
- break;
- }
+ if (view_name == NULL)
+ {
+ ERROR ("bind plugin: Could not determine view name.");
+ return (-1);
+ }
- if (view_name == NULL)
+ for (j = 0; j < views_num; j++)
+ {
+ if (strcasecmp (view_name, views[j].name) == 0)
+ break;
+ }
+
+ xmlFree (view_name);
+ view_name = NULL;
+ }
+ else
{
- ERROR ("bind plugin: Could not determine view name.");
+ xmlXPathObject *path_obj;
+ path_obj = xmlXPathEvalExpression (BAD_CAST "name", path_ctx);
+ if (path_obj == NULL)
+ {
+ ERROR ("bind plugin: xmlXPathEvalExpression failed.");
+ return (-1);
+ }
+
+ for (i = 0; path_obj->nodesetval && (i < path_obj->nodesetval->nodeNr); i++)
+ {
+ view_name = (char *) xmlNodeListGetString (doc,
+ path_obj->nodesetval->nodeTab[i]->xmlChildrenNode, 1);
+ if (view_name != NULL)
+ break;
+ }
+
+ if (view_name == NULL)
+ {
+ ERROR ("bind plugin: Could not determine view name.");
+ xmlXPathFreeObject (path_obj);
+ return (-1);
+ }
+
+ for (j = 0; j < views_num; j++)
+ {
+ if (strcasecmp (view_name, views[j].name) == 0)
+ break;
+ }
+
+ xmlFree (view_name);
xmlXPathFreeObject (path_obj);
- return (-1);
- }
- for (j = 0; j < views_num; j++)
- {
- if (strcasecmp (view_name, views[j].name) == 0)
- break;
+ view_name = NULL;
+ path_obj = NULL;
}
- xmlFree (view_name);
- xmlXPathFreeObject (path_obj);
-
- view_name = NULL;
- path_obj = NULL;
if (j >= views_num)
return (0);
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-qtypes",
view->name);
-
- bind_parse_generic_name_value (/* xpath = */ "rdtype",
+ if (version == 3)
+ {
+ bind_parse_generic_name_attr_value_list (/* xpath = */ "counters[@type='resqtype']",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
- doc, path_ctx, current_time);
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
+ else
+ {
+ bind_parse_generic_name_value (/* xpath = */ "rdtype",
+ /* callback = */ bind_xml_list_callback,
+ /* user_data = */ &list_info,
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
} /* }}} */
if (view->resolver_stats != 0) /* {{{ */
ssnprintf (plugin_instance, sizeof (plugin_instance),
"%s-resolver_stats", view->name);
-
- bind_parse_generic_name_value ("resstat",
- /* callback = */ bind_xml_table_callback,
- /* user_data = */ &table_ptr,
- doc, path_ctx, current_time);
+ if (version == 3)
+ {
+ bind_parse_generic_name_attr_value_list ("counters[@type='resstats']",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
+ else
+ {
+ bind_parse_generic_name_value ("resstat",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
} /* }}} */
+ /* Record types in the cache */
if (view->cacherrsets != 0) /* {{{ */
{
char plugin_instance[DATA_MAX_NAME_LEN];
list_info_ptr_t list_info =
{
plugin_instance,
- /* type = */ "dns_qtype"
+ /* type = */ "dns_qtype_cached"
};
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-cache_rr_sets",
bind_parse_generic_name_value (/* xpath = */ "cache/rrset",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
- doc, path_ctx, current_time);
+ doc, path_ctx, current_time, DS_TYPE_GAUGE);
} /* }}} */
- if (view->zones_num > 0)
+ // v3 does not provide per-zone stats any more
+ if (version < 3 && view->zones_num > 0)
bind_xml_stats_search_zones (version, doc, path_ctx, node, view,
current_time);
return (0);
} /* }}} int bind_xml_stats_search_views */
-static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
- xmlXPathContext *xpathCtx, xmlNode *statsnode)
+static void bind_xml_stats_v3 (xmlDoc *doc, /* {{{ */
+ xmlXPathContext *xpathCtx, xmlNode *statsnode, time_t current_time)
{
- time_t current_time = 0;
- int status;
+ /* XPath: server/counters[@type='opcode']
+ * Variables: QUERY, IQUERY, NOTIFY, UPDATE, ...
+ * Layout v3:
+ * <counters type="opcode">
+ * <counter name="A">1</counter>
+ * :
+ * </counters>
+ */
+ if (global_opcodes != 0)
+ {
+ list_info_ptr_t list_info =
+ {
+ /* plugin instance = */ "global-opcodes",
+ /* type = */ "dns_opcode"
+ };
+ bind_parse_generic_name_attr_value_list (/* xpath = */ "server/counters[@type='opcode']",
+ /* callback = */ bind_xml_list_callback,
+ /* user_data = */ &list_info,
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
+ }
- xpathCtx->node = statsnode;
+ /* XPath: server/counters[@type='qtype']
+ * Variables: RESERVED0, A, NS, CNAME, SOA, MR, PTR, HINFO, MX, TXT, RP,
+ * X25, PX, AAAA, LOC, SRV, NAPTR, A6, DS, RRSIG, NSEC, DNSKEY,
+ * SPF, TKEY, IXFR, AXFR, ANY, ..., Others
+ * Layout v3:
+ * <counters type="opcode">
+ * <counter name="A">1</counter>
+ * :
+ * </counters>
+ */
+ if (global_qtypes != 0)
+ {
+ list_info_ptr_t list_info =
+ {
+ /* plugin instance = */ "global-qtypes",
+ /* type = */ "dns_qtype"
+ };
- /* TODO: Check `server/boot-time' to recognize server restarts. */
+ bind_parse_generic_name_attr_value_list (/* xpath = */ "server/counters[@type='qtype']",
+ /* callback = */ bind_xml_list_callback,
+ /* user_data = */ &list_info,
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
+ }
- status = bind_xml_read_timestamp ("server/current-time",
- doc, xpathCtx, ¤t_time);
- if (status != 0)
+ /* XPath: server/counters[@type='nsstat']
+ * Variables: Requestv4, Requestv6, ReqEdns0, ReqBadEDNSVer, ReqTSIG,
+ * ReqSIG0, ReqBadSIG, ReqTCP, AuthQryRej, RecQryRej, XfrRej,
+ * UpdateRej, Response, TruncatedResp, RespEDNS0, RespTSIG,
+ * RespSIG0, QrySuccess, QryAuthAns, QryNoauthAns, QryReferral,
+ * QryNxrrset, QrySERVFAIL, QryFORMERR, QryNXDOMAIN, QryRecursion,
+ * QryDuplicate, QryDropped, QryFailure, XfrReqDone, UpdateReqFwd,
+ * UpdateRespFwd, UpdateFwdFail, UpdateDone, UpdateFail,
+ * UpdateBadPrereq
+ * Layout v3:
+ * <counters type="nsstat"
+ * <counter name="Requestv4">1</counter>
+ * <counter name="Requestv6">0</counter>
+ * :
+ * </counter>
+ */
+ if (global_server_stats)
{
- ERROR ("bind plugin: Reading `server/current-time' failed.");
- return (-1);
+ translation_table_ptr_t table_ptr =
+ {
+ nsstats_translation_table,
+ nsstats_translation_table_length,
+ /* plugin_instance = */ "global-server_stats"
+ };
+
+ bind_parse_generic_name_attr_value_list ("server/counters[@type='nsstat']",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
- DEBUG ("bind plugin: Current server time is %i.", (int) current_time);
- /* XPath: server/requests/opcode
+ /* XPath: server/zonestats, server/zonestat, server/counters[@type='zonestat']
+ * Variables: NotifyOutv4, NotifyOutv6, NotifyInv4, NotifyInv6, NotifyRej,
+ * SOAOutv4, SOAOutv6, AXFRReqv4, AXFRReqv6, IXFRReqv4, IXFRReqv6,
+ * XfrSuccess, XfrFail
+ * Layout v3:
+ * <counters type="zonestat"
+ * <counter name="NotifyOutv4">0</counter>
+ * <counter name="NotifyOutv6">0</counter>
+ * :
+ * </counter>
+ */
+ if (global_zone_maint_stats)
+ {
+ translation_table_ptr_t table_ptr =
+ {
+ zonestats_translation_table,
+ zonestats_translation_table_length,
+ /* plugin_instance = */ "global-zone_maint_stats"
+ };
+
+ bind_parse_generic_name_attr_value_list ("server/counters[@type='zonestat']",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
+ }
+
+ /* XPath: server/resstats, server/counters[@type='resstat']
+ * Variables: Queryv4, Queryv6, Responsev4, Responsev6, NXDOMAIN, SERVFAIL,
+ * FORMERR, OtherError, EDNS0Fail, Mismatch, Truncated, Lame,
+ * Retry, GlueFetchv4, GlueFetchv6, GlueFetchv4Fail,
+ * GlueFetchv6Fail, ValAttempt, ValOk, ValNegOk, ValFail
+ * Layout v3:
+ * <counters type="resstat"
+ * <counter name="Queryv4">0</counter>
+ * <counter name="Queryv6">0</counter>
+ * :
+ * </counter>
+ */
+ if (global_resolver_stats != 0)
+ {
+ translation_table_ptr_t table_ptr =
+ {
+ resstats_translation_table,
+ resstats_translation_table_length,
+ /* plugin_instance = */ "global-resolver_stats"
+ };
+
+ bind_parse_generic_name_attr_value_list ("server/counters[@type='resstat']",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
+ }
+} /* }}} bind_xml_stats_v3 */
+
+static void bind_xml_stats_v1_v2 (int version, xmlDoc *doc, /* {{{ */
+ xmlXPathContext *xpathCtx, xmlNode *statsnode, time_t current_time)
+{
+ /* XPath: server/requests/opcode, server/counters[@type='opcode']
* Variables: QUERY, IQUERY, NOTIFY, UPDATE, ...
- * Layout:
+ * Layout V1 and V2:
* <opcode>
* <name>A</name>
* <counter>1</counter>
bind_parse_generic_name_value (/* xpath = */ "server/requests/opcode",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
- /* XPath: server/queries-in/rdtype
+ /* XPath: server/queries-in/rdtype, server/counters[@type='qtype']
* Variables: RESERVED0, A, NS, CNAME, SOA, MR, PTR, HINFO, MX, TXT, RP,
* X25, PX, AAAA, LOC, SRV, NAPTR, A6, DS, RRSIG, NSEC, DNSKEY,
* SPF, TKEY, IXFR, AXFR, ANY, ..., Others
- * Layout:
+ * Layout v1 or v2:
* <rdtype>
* <name>A</name>
* <counter>1</counter>
bind_parse_generic_name_value (/* xpath = */ "server/queries-in/rdtype",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
-
- /* XPath: server/nsstats, server/nsstat
+
+ /* XPath: server/nsstats, server/nsstat, server/counters[@type='nsstat']
* Variables: Requestv4, Requestv6, ReqEdns0, ReqBadEDNSVer, ReqTSIG,
* ReqSIG0, ReqBadSIG, ReqTCP, AuthQryRej, RecQryRej, XfrRej,
* UpdateRej, Response, TruncatedResp, RespEDNS0, RespTSIG,
if (global_server_stats)
{
translation_table_ptr_t table_ptr =
- {
+ {
nsstats_translation_table,
nsstats_translation_table_length,
/* plugin_instance = */ "global-server_stats"
bind_parse_generic_value_list ("server/nsstats",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
else
{
bind_parse_generic_name_value ("server/nsstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
}
- /* XPath: server/zonestats, server/zonestat
+ /* XPath: server/zonestats, server/zonestat, server/counters[@type='zonestat']
* Variables: NotifyOutv4, NotifyOutv6, NotifyInv4, NotifyInv6, NotifyRej,
* SOAOutv4, SOAOutv6, AXFRReqv4, AXFRReqv6, IXFRReqv4, IXFRReqv6,
* XfrSuccess, XfrFail
if (global_zone_maint_stats)
{
translation_table_ptr_t table_ptr =
- {
+ {
zonestats_translation_table,
zonestats_translation_table_length,
/* plugin_instance = */ "global-zone_maint_stats"
bind_parse_generic_value_list ("server/zonestats",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
else
{
bind_parse_generic_name_value ("server/zonestat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
}
- /* XPath: server/resstats
+ /* XPath: server/resstats, server/counters[@type='resstat']
* Variables: Queryv4, Queryv6, Responsev4, Responsev6, NXDOMAIN, SERVFAIL,
* FORMERR, OtherError, EDNS0Fail, Mismatch, Truncated, Lame,
* Retry, GlueFetchv4, GlueFetchv6, GlueFetchv4Fail,
if (global_resolver_stats != 0)
{
translation_table_ptr_t table_ptr =
- {
+ {
resstats_translation_table,
resstats_translation_table_length,
/* plugin_instance = */ "global-resolver_stats"
bind_parse_generic_value_list ("server/resstats",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
else
{
bind_parse_generic_name_value ("server/resstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_COUNTER);
}
}
+} /* }}} bind_xml_stats_v1_v2 */
+
+static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
+ xmlXPathContext *xpathCtx, xmlNode *statsnode)
+{
+ time_t current_time = 0;
+ int status;
+
+ xpathCtx->node = statsnode;
+
+ /* TODO: Check `server/boot-time' to recognize server restarts. */
+
+ status = bind_xml_read_timestamp ("server/current-time",
+ doc, xpathCtx, ¤t_time);
+ if (status != 0)
+ {
+ ERROR ("bind plugin: Reading `server/current-time' failed.");
+ return (-1);
+ }
+ DEBUG ("bind plugin: Current server time is %i.", (int) current_time);
+
+ if (version == 3)
+ {
+ bind_xml_stats_v3(doc, xpathCtx, statsnode, current_time);
+ }
+ else
+ {
+ bind_xml_stats_v1_v2(version, doc, xpathCtx, statsnode, current_time);
+ }
/* XPath: memory/summary
* Variables: TotalUse, InUse, BlockSize, ContextSize, Lost
- * Layout: v2:
+ * Layout: v2 and v3:
* <summary>
* <TotalUse>6587096</TotalUse>
* <InUse>1345424</InUse>
bind_parse_generic_value_list ("memory/summary",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, xpathCtx, current_time);
+ doc, xpathCtx, current_time, DS_TYPE_GAUGE);
}
if (views_num > 0)
return (-1);
}
+ //
+ // version 3.* of statistics XML (since BIND9.9)
+ //
+
+ xpathObj = xmlXPathEvalExpression (BAD_CAST "/statistics", xpathCtx);
+ if (xpathObj == NULL || xpathObj->nodesetval == NULL || xpathObj->nodesetval->nodeNr == 0)
+ {
+ DEBUG ("bind plugin: Statistics appears not to be v3");
+ // we will fallback to v1 or v2 detection
+ if (xpathObj != NULL) { xmlXPathFreeObject (xpathObj); }
+ }
+ else
+ {
+ for (i = 0; i < xpathObj->nodesetval->nodeNr; i++)
+ {
+ xmlNode *node;
+ char *attr_version;
+
+ node = xpathObj->nodesetval->nodeTab[i];
+ assert (node != NULL);
+
+ attr_version = (char *) xmlGetProp (node, BAD_CAST "version");
+ if (attr_version == NULL)
+ {
+ NOTICE ("bind plugin: Found <statistics> tag doesn't have a "
+ "`version' attribute.");
+ continue;
+ }
+ DEBUG ("bind plugin: Found: <statistics version=\"%s\">", attr_version);
+
+ if (strncmp ("3.", attr_version, strlen ("3.")) != 0)
+ {
+ /* TODO: Use the complaint mechanism here. */
+ NOTICE ("bind plugin: Found <statistics> tag with version `%s'. "
+ "Unfortunately I have no clue how to parse that. "
+ "Please open a bug report for this.", attr_version);
+ xmlFree (attr_version);
+ continue;
+ }
+ ret = bind_xml_stats (3, doc, xpathCtx, node);
+
+ xmlFree (attr_version);
+ /* One <statistics> node ought to be enough. */
+ break;
+ }
+
+ // we are finished, early-return
+ xmlXPathFreeObject (xpathObj);
+ xmlXPathFreeContext (xpathCtx);
+ xmlFreeDoc (doc);
+
+ return (ret);
+ }
+
+ //
+ // versions 1.* or 2.* of statistics XML
+ //
+
xpathObj = xmlXPathEvalExpression (BAD_CAST "/isc/bind/statistics", xpathCtx);
if (xpathObj == NULL)
{
{
oconfig_item_t *child = ci->children + i;
- if (strcasecmp ("OpCodes", child->key) == 0)
+ if (strcasecmp ("Url", child->key) == 0) {
+ if ((child->values_num != 1) || (child->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ WARNING ("bind plugin: The `Url' option needs "
+ "exactly one string argument.");
+ return (-1);
+ }
+
+ url = strdup (child->values[0].value.string);
+ } else if (strcasecmp ("OpCodes", child->key) == 0)
bind_config_set_bool ("OpCodes", &global_opcodes, child);
else if (strcasecmp ("QTypes", child->key) == 0)
bind_config_set_bool ("QTypes", &global_qtypes, child);
else if (strcasecmp ("ResolverStats", child->key) == 0)
bind_config_set_bool ("ResolverStats", &global_resolver_stats, child);
else if (strcasecmp ("MemoryStats", child->key) == 0)
- bind_config_set_bool ("MemoryStats", &global_resolver_stats, child);
+ bind_config_set_bool ("MemoryStats", &global_memory_stats, child);
else if (strcasecmp ("View", child->key) == 0)
bind_config_add_view (child);
+ else if (strcasecmp ("ParseTime", child->key) == 0)
+ cf_util_get_boolean (child, &config_parse_time);
else
{
WARNING ("bind plugin: Unknown configuration option "
return (-1);
}
+ curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, bind_curl_callback);
- curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION);
+ curl_easy_setopt (curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, bind_curl_error);
curl_easy_setopt (curl, CURLOPT_URL, (url != NULL) ? url : BIND_DEFAULT_URL);
+ curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L);
+ curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L);
return (0);
} /* }}} int bind_init */
}
bind_buffer_fill = 0;
- if (curl_easy_perform (curl) != 0)
+ if (curl_easy_perform (curl) != CURLE_OK)
{
ERROR ("bind plugin: curl_easy_perform failed: %s",
bind_curl_error);