X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbind.c;h=dd49cb2220709ed8dc5b760928d21d013cdcb871;hb=0532336600cf2abe1d25af8fbf5ad3cf3b6b31e0;hp=03dfcc77cd7bf322b7576fe288f0bbb3c6e14191;hpb=b61a03b05c1f4040a6599334b65141aa3bd134f5;p=collectd.git
diff --git a/src/bind.c b/src/bind.c
index 03dfcc77..dd49cb22 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -109,6 +109,7 @@ static int global_server_stats = 1;
static int global_zone_maint_stats = 1;
static int global_resolver_stats = 0;
static int global_memory_stats = 1;
+static int timeout = -1;
static cb_view_t *views = NULL;
static size_t views_num = 0;
@@ -369,9 +370,11 @@ static int bind_xml_read_derive (xmlDoc *doc, xmlNode *node, /* {{{ */
{
ERROR ("bind plugin: Parsing string \"%s\" to derive value failed.",
str_ptr);
+ xmlFree(str_ptr);
return (-1);
}
+ xmlFree(str_ptr);
*ret_value = value.derive;
return (0);
} /* }}} int bind_xml_read_derive */
@@ -627,6 +630,84 @@ static int bind_parse_generic_value_list (const char *xpath_expression, /* {{{ *
return (0);
} /* }}} int bind_parse_generic_value_list */
+/*
+ * bind_parse_generic_name_attr_value_list
+ *
+ * Reads statistics in the form:
+ *
+ * 123
+ * 234
+ * 345
+ * :
+ *
+ */
+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 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)
@@ -636,25 +717,40 @@ static int bind_xml_stats_handle_zone (int version, xmlDoc *doc, /* {{{ */
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);
+ char *n = (char *) xmlGetProp (node, BAD_CAST "name");
+ char *c = (char *) xmlGetProp (node, BAD_CAST "rdataclass");
+ if (n && c)
+ {
+ zone_name = (char *) xmlMalloc(strlen(n) + strlen(c) + 2);
+ snprintf(zone_name, strlen(n) + strlen(c) + 2, "%s/%s", n, c);
+ }
+ xmlFree(n);
+ xmlFree(c);
}
-
- for (i = 0; path_obj->nodesetval && (i < path_obj->nodesetval->nodeNr); i++)
+ else
{
- zone_name = (char *) xmlNodeListGetString (doc,
- path_obj->nodesetval->nodeTab[i]->xmlChildrenNode, 1);
- if (zone_name != NULL)
- break;
+ 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++)
+ {
+ zone_name = (char *) xmlNodeListGetString (doc,
+ path_obj->nodesetval->nodeTab[i]->xmlChildrenNode, 1);
+ if (zone_name != NULL)
+ break;
+ }
+ xmlXPathFreeObject (path_obj);
}
if (zone_name == NULL)
{
ERROR ("bind plugin: Could not determine zone name.");
- xmlXPathFreeObject (path_obj);
return (-1);
}
@@ -667,11 +763,8 @@ static int bind_xml_stats_handle_zone (int version, xmlDoc *doc, /* {{{ */
xmlFree (zone_name);
zone_name = NULL;
- if (j >= views_num)
- {
- xmlXPathFreeObject (path_obj);
+ if (j >= view->zones_num)
return (0);
- }
zone_name = view->zones[j];
@@ -690,14 +783,31 @@ static int bind_xml_stats_handle_zone (int version, xmlDoc *doc, /* {{{ */
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-zone-%s",
view->name, zone_name);
- bind_parse_generic_value_list (/* xpath = */ "counters",
+ if (version == 3)
+ {
+ list_info_ptr_t list_info =
+ {
+ plugin_instance,
+ /* type = */ "dns_qtype"
+ };
+ bind_parse_generic_name_attr_value_list (/* xpath = */ "counters[@type='rcode']",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ bind_parse_generic_name_attr_value_list (/* xpath = */ "counters[@type='qtype']",
+ /* callback = */ bind_xml_list_callback,
+ /* user_data = */ &list_info,
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
+ else
+ {
+ bind_parse_generic_value_list (/* xpath = */ "counters",
+ /* callback = */ bind_xml_table_callback,
+ /* user_data = */ &table_ptr,
+ doc, path_ctx, current_time, DS_TYPE_COUNTER);
+ }
} /* }}} */
- xmlXPathFreeObject (path_obj);
-
return (0);
} /* }}} int bind_xml_stats_handle_zone */
@@ -745,45 +855,68 @@ static int bind_xml_stats_search_zones (int version, xmlDoc *doc, /* {{{ */
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);
+ }
+
+ for (j = 0; j < views_num; j++)
+ {
+ if (strcasecmp (view_name, views[j].name) == 0)
+ break;
+ }
- if (view_name == NULL)
+ 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);
@@ -804,11 +937,20 @@ static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
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, 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) /* {{{ */
@@ -823,11 +965,20 @@ static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
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, DS_TYPE_COUNTER);
+ 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 */
@@ -896,28 +1047,145 @@ static int bind_xml_stats_search_views (int version, xmlDoc *doc, /* {{{ */
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:
+ *
+ * 1
+ * :
+ *
+ */
+ 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:
+ *
+ * 1
+ * :
+ *
+ */
+ 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:
+ * 1
+ * 0
+ * :
+ *
+ */
+ 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:
+ * 0
+ * 0
+ * :
+ *
+ */
+ 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:
+ * 0
+ * 0
+ * :
+ *
+ */
+ 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:
*
* A
* 1
@@ -938,11 +1206,11 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
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:
*
* A
* 1
@@ -962,8 +1230,8 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
/* user_data = */ &list_info,
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,
@@ -992,7 +1260,7 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
if (global_server_stats)
{
translation_table_ptr_t table_ptr =
- {
+ {
nsstats_translation_table,
nsstats_translation_table_length,
/* plugin_instance = */ "global-server_stats"
@@ -1014,7 +1282,7 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
}
}
- /* 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
@@ -1038,7 +1306,7 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
if (global_zone_maint_stats)
{
translation_table_ptr_t table_ptr =
- {
+ {
zonestats_translation_table,
zonestats_translation_table_length,
/* plugin_instance = */ "global-zone_maint_stats"
@@ -1060,7 +1328,7 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
}
}
- /* 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,
@@ -1085,7 +1353,7 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
if (global_resolver_stats != 0)
{
translation_table_ptr_t table_ptr =
- {
+ {
resstats_translation_table,
resstats_translation_table_length,
/* plugin_instance = */ "global-resolver_stats"
@@ -1106,10 +1374,39 @@ static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
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:
*
* 6587096
* 1345424
@@ -1163,6 +1460,64 @@ static int bind_xml (const char *data) /* {{{ */
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 tag doesn't have a "
+ "`version' attribute.");
+ continue;
+ }
+ DEBUG ("bind plugin: Found: ", attr_version);
+
+ if (strncmp ("3.", attr_version, strlen ("3.")) != 0)
+ {
+ /* TODO: Use the complaint mechanism here. */
+ NOTICE ("bind plugin: Found 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 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)
{
@@ -1311,7 +1666,7 @@ static int bind_config_add_view (oconfig_item_t *ci) /* {{{ */
if (tmp->name == NULL)
{
ERROR ("bind plugin: strdup failed.");
- free (tmp);
+ sfree (views);
return (-1);
}
@@ -1354,6 +1709,7 @@ static int bind_config (oconfig_item_t *ci) /* {{{ */
return (-1);
}
+ sfree (url);
url = strdup (child->values[0].value.string);
} else if (strcasecmp ("OpCodes", child->key) == 0)
bind_config_set_bool ("OpCodes", &global_opcodes, child);
@@ -1371,6 +1727,8 @@ static int bind_config (oconfig_item_t *ci) /* {{{ */
bind_config_add_view (child);
else if (strcasecmp ("ParseTime", child->key) == 0)
cf_util_get_boolean (child, &config_parse_time);
+ else if (strcasecmp ("Timeout", child->key) == 0)
+ cf_util_get_int (child, &timeout);
else
{
WARNING ("bind plugin: Unknown configuration option "
@@ -1395,11 +1753,16 @@ static int bind_init (void) /* {{{ */
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);
+#ifdef HAVE_CURLOPT_TIMEOUT_MS
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT_MS, (timeout >= 0) ?
+ (long) timeout : (long) CDTIME_T_TO_MS(plugin_get_interval()));
+#endif
+
return (0);
} /* }}} int bind_init */