![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 8776ad11f3731f6596f5f7ee078c78c97cec53d6..5dfd10ac056a792705a305895cfceb7a0c9d785e 100644 (file)
*/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "utils_match.h"
#include "utils_tail.h"
#include "utils_tail_match.h"
+#include "utils_latency_config.h"
struct cu_tail_match_simple_s
{
char type[DATA_MAX_NAME_LEN];
char type_instance[DATA_MAX_NAME_LEN];
cdtime_t interval;
+ latency_config_t latency_config;
};
typedef struct cu_tail_match_simple_s cu_tail_match_simple_t;
vl.values = values;
vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, data->plugin, sizeof (vl.plugin));
sstrncpy (vl.plugin_instance, data->plugin_instance,
sizeof (vl.plugin_instance));
vl.interval = data->interval;
plugin_dispatch_values (&vl);
- if (match_value->ds_type & UTILS_MATCH_DS_TYPE_GAUGE)
+ match_value_reset (match_value);
+ return (0);
+} /* int simple_submit_match */
+
+static int simple_submit_latency (cu_match_t *match, void *user_data)
+{
+ cu_tail_match_simple_t *data = (cu_tail_match_simple_t *) user_data;
+ cu_match_value_t *match_value;
+ value_list_t vl = VALUE_LIST_INIT;
+
+ match_value = (cu_match_value_t *) match_get_user_data (match);
+ if (match_value == NULL)
+ return (-1);
+
+ vl.values = &(value_t) { .gauge = NAN };
+ vl.values_len = 1;
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, data->plugin, sizeof (vl.plugin));
+ sstrncpy (vl.plugin_instance, data->plugin_instance,
+ sizeof (vl.plugin_instance));
+ sstrncpy (vl.type, data->type, sizeof (vl.type));
+ vl.interval = data->interval;
+ vl.time = cdtime ();
+
+ if (data->latency_config.lower) {
+ ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "lower");
+ vl.values[0].gauge = (match_value->values_num != 0)
+ ? CDTIME_T_TO_DOUBLE (latency_counter_get_min (match_value->latency))
+ : NAN;
+ plugin_dispatch_values (&vl);
+ }
+
+ if (data->latency_config.avg) {
+ ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "average");
+ vl.values[0].gauge = (match_value->values_num != 0)
+ ? CDTIME_T_TO_DOUBLE (latency_counter_get_average (match_value->latency))
+ : NAN;
+ plugin_dispatch_values (&vl);
+ }
+
+ if (data->latency_config.upper) {
+ ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "upper");
+ vl.values[0].gauge = (match_value->values_num != 0)
+ ? CDTIME_T_TO_DOUBLE (latency_counter_get_max (match_value->latency))
+ : NAN;
+ plugin_dispatch_values (&vl);
+ }
+
+ /* Submit percentiles */
+ if (data->latency_config.percentile_type != NULL)
+ sstrncpy (vl.type, data->latency_config.percentile_type, sizeof (vl.type));
+ for (size_t i = 0; i < data->latency_config.percentile_num; i++)
+ {
+ ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "percentile-%.0f", data->latency_config.percentile[i]);
+ vl.values[0].gauge = (match_value->values_num != 0)
+ ? CDTIME_T_TO_DOUBLE (latency_counter_get_percentile (match_value->latency,
+ data->latency_config.percentile[i]))
+ : NAN;
+ plugin_dispatch_values (&vl);
+ }
+
+ /* Submit rates */
+ sstrncpy (vl.type, data->type, sizeof (vl.type));
+ if (data->latency_config.rates_type != NULL)
+ sstrncpy (vl.type, data->latency_config.rates_type, sizeof (vl.type));
+ for (size_t i = 0; i < data->latency_config.rates_num; i++)
{
- match_value->value.gauge = NAN;
- match_value->values_num = 0;
+ ssnprintf (vl.type_instance, sizeof (vl.type_instance),
+ "rate-%.3f-%.3f",
+ CDTIME_T_TO_DOUBLE(data->latency_config.rates[i * 2]),
+ CDTIME_T_TO_DOUBLE(data->latency_config.rates[i * 2 + 1]));
+ vl.values[0].gauge = (match_value->values_num != 0)
+ ? latency_counter_get_rate (match_value->latency,
+ data->latency_config.rates[i * 2],
+ data->latency_config.rates[i * 2 + 1],
+ vl.time)
+ : NAN;
+ plugin_dispatch_values (&vl);
}
+ latency_counter_reset (match_value->latency);
+
+ match_value->value.gauge = NAN;
+ match_value->values_num = 0;
return (0);
-} /* int simple_submit_match */
+} /* int simple_submit_latency */
static int tail_callback (void *data, char *buf,
int __attribute__((unused)) buflen)
{
cu_tail_match_t *obj = (cu_tail_match_t *) data;
- size_t i;
- for (i = 0; i < obj->matches_num; i++)
+ for (size_t i = 0; i < obj->matches_num; i++)
match_apply (obj->matches[i].match, buf);
return (0);
} /* int tail_callback */
+static void tail_match_simple_free (void *data)
+{
+ cu_tail_match_simple_t *user_data = (cu_tail_match_simple_t *) data;
+ latency_config_free(user_data->latency_config);
+ sfree (user_data);
+} /* void tail_match_simple_free */
+
/*
* Public functions
*/
{
cu_tail_match_t *obj;
- obj = (cu_tail_match_t *) malloc (sizeof (cu_tail_match_t));
+ obj = calloc (1, sizeof (*obj));
if (obj == NULL)
return (NULL);
- memset (obj, '\0', sizeof (cu_tail_match_t));
obj->tail = cu_tail_create (filename);
if (obj->tail == NULL)
void tail_match_destroy (cu_tail_match_t *obj)
{
- size_t i;
-
if (obj == NULL)
return;
obj->tail = NULL;
}
- for (i = 0; i < obj->matches_num; i++)
+ for (size_t i = 0; i < obj->matches_num; i++)
{
cu_tail_match_match_t *match = obj->matches + i;
if (match->match != NULL)
{
cu_tail_match_match_t *temp;
- temp = (cu_tail_match_match_t *) realloc (obj->matches,
+ temp = realloc (obj->matches,
sizeof (cu_tail_match_match_t) * (obj->matches_num + 1));
if (temp == NULL)
return (-1);
int tail_match_add_match_simple (cu_tail_match_t *obj,
const char *regex, const char *excluderegex, int ds_type,
const char *plugin, const char *plugin_instance,
- const char *type, const char *type_instance, const cdtime_t interval)
+ const char *type, const char *type_instance,
+ const latency_config_t latency_cfg,
+ const cdtime_t interval)
{
cu_match_t *match;
cu_tail_match_simple_t *user_data;
if (match == NULL)
return (-1);
- user_data = (cu_tail_match_simple_t *) malloc (sizeof (cu_tail_match_simple_t));
+ user_data = calloc (1, sizeof (*user_data));
if (user_data == NULL)
{
match_destroy (match);
return (-1);
}
- memset (user_data, '\0', sizeof (cu_tail_match_simple_t));
sstrncpy (user_data->plugin, plugin, sizeof (user_data->plugin));
if (plugin_instance != NULL)
user_data->interval = interval;
- status = tail_match_add_match (obj, match, simple_submit_match,
+ if ((ds_type & UTILS_MATCH_DS_TYPE_GAUGE)
+ && (ds_type & UTILS_MATCH_CF_GAUGE_LATENCY))
+ {
+ status = latency_config_copy(&user_data->latency_config, latency_cfg);
+ if (status != 0)
+ {
+ ERROR ("tail_match_add_match_simple: latency_config_copy() failed.");
+ status = -1;
+ goto out;
+ }
+
+ status = tail_match_add_match (obj, match, simple_submit_latency,
+ user_data, tail_match_simple_free);
+ } else {
+ status = tail_match_add_match (obj, match, simple_submit_match,
user_data, free);
+ }
+out:
if (status != 0)
{
+ tail_match_simple_free(user_data);
match_destroy (match);
- sfree (user_data);
}
return (status);
{
char buffer[4096];
int status;
- size_t i;
status = cu_tail_read (obj->tail, buffer, sizeof (buffer), tail_callback,
(void *) obj);
return (status);
}
- for (i = 0; i < obj->matches_num; i++)
+ for (size_t i = 0; i < obj->matches_num; i++)
{
cu_tail_match_match_t *lt_match = obj->matches + i;