projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.6'
[collectd.git]
/
src
/
bind.c
diff --git
a/src/bind.c
b/src/bind.c
index
4b3662f
..
783d2b0
100644
(file)
--- a/
src/bind.c
+++ b/
src/bind.c
@@
-484,7
+484,7
@@
static int bind_parse_generic_name_value (const char *xpath_expression, /* {{{ *
list_callback_t list_callback,
void *user_data,
xmlDoc *doc, xmlXPathContext *xpathCtx,
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;
{
xmlXPathObject *xpathObj = NULL;
int num_entries;
@@
-532,7
+532,10
@@
static int bind_parse_generic_name_value (const char *xpath_expression, /* {{{ *
value_t value;
int status;
value_t value;
int status;
- status = bind_xml_read_counter (doc, counter, &value.counter);
+ if (ds_type == DS_TYPE_GAUGE)
+ status = bind_xml_read_gauge (doc, counter, &value.gauge);
+ else
+ status = bind_xml_read_counter (doc, counter, &value.counter);
if (status != 0)
continue;
if (status != 0)
continue;
@@
-796,7
+799,7
@@
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
list_info_ptr_t list_info =
{
plugin_instance,
list_info_ptr_t list_info =
{
plugin_instance,
- /* type = */ "dns_qtype"
+ /* type = */ "dns_qtype
_gauge
"
};
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-qtypes",
};
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-qtypes",
@@
-805,7
+808,7
@@
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value (/* xpath = */ "rdtype",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
bind_parse_generic_name_value (/* xpath = */ "rdtype",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
- doc, path_ctx, current_time);
+ doc, path_ctx, current_time
, DS_TYPE_COUNTER
);
} /* }}} */
if (view->resolver_stats != 0) /* {{{ */
} /* }}} */
if (view->resolver_stats != 0) /* {{{ */
@@
-824,7
+827,7
@@
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value ("resstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
bind_parse_generic_name_value ("resstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
- doc, path_ctx, current_time);
+ doc, path_ctx, current_time
, DS_TYPE_COUNTER
);
} /* }}} */
if (view->cacherrsets != 0) /* {{{ */
} /* }}} */
if (view->cacherrsets != 0) /* {{{ */
@@
-833,7
+836,7
@@
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
list_info_ptr_t list_info =
{
plugin_instance,
list_info_ptr_t list_info =
{
plugin_instance,
- /* type = */ "dns_qtype"
+ /* type = */ "dns_qtype
_gauge
"
};
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-cache_rr_sets",
};
ssnprintf (plugin_instance, sizeof (plugin_instance), "%s-cache_rr_sets",
@@
-842,7
+845,7
@@
static int bind_xml_stats_handle_view (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value (/* xpath = */ "cache/rrset",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
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)
} /* }}} */
if (view->zones_num > 0)
@@
-931,7
+934,7
@@
static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value (/* xpath = */ "server/requests/opcode",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
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
@@
-956,7
+959,7
@@
static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value (/* xpath = */ "server/queries-in/rdtype",
/* callback = */ bind_xml_list_callback,
/* user_data = */ &list_info,
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
@@
-1006,7
+1009,7
@@
static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value ("server/nsstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
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
);
}
}
}
}
@@
-1052,7
+1055,7
@@
static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value ("server/zonestat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
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
);
}
}
}
}
@@
-1099,7
+1102,7
@@
static int bind_xml_stats (int version, xmlDoc *doc, /* {{{ */
bind_parse_generic_name_value ("server/resstat",
/* callback = */ bind_xml_table_callback,
/* user_data = */ &table_ptr,
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
);
}
}
}
}