X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftail.c;h=ffdba8ae3e6ee62eeacf59200a1c4de00b2d1500;hb=e7aa9832d25a98f78bb5af45a90ec404359537df;hp=72d97a385245b1918c89c2a42d0e0f2a5287a44c;hpb=e3571ad6e1ada10fb7220193df57b7ef3b540ab1;p=collectd.git diff --git a/src/tail.c b/src/tail.c index 72d97a38..022ecfd1 100644 --- a/src/tail.c +++ b/src/tail.c @@ -1,33 +1,41 @@ /** * collectd - src/tail.c - * Copyright (C) 2008 Florian octo Forster + * Copyright (C) 2008 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. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "utils_tail_match.h" +#include "utils_latency_config.h" /* * * * Instance "exim" + * Interval 60 * * Regex "S=([1-9][0-9]*)" * ExcludeRegex "U=root.*S=" @@ -46,11 +54,14 @@ struct ctail_config_match_s int flags; char *type; char *type_instance; + cdtime_t interval; + latency_config_t latency; }; typedef struct ctail_config_match_s ctail_config_match_t; -cu_tail_match_t **tail_match_list = NULL; -size_t tail_match_list_num = 0; +static cu_tail_match_t **tail_match_list = NULL; +static size_t tail_match_list_num = 0; +static cdtime_t tail_match_list_intervals[255]; static int ctail_config_add_match_dstype (ctail_config_match_t *cm, oconfig_item_t *ci) @@ -72,9 +83,19 @@ static int ctail_config_add_match_dstype (ctail_config_match_t *cm, cm->flags |= UTILS_MATCH_CF_GAUGE_MAX; else if (strcasecmp ("GaugeLast", ci->values[0].value.string) == 0) cm->flags |= UTILS_MATCH_CF_GAUGE_LAST; + else if (strcasecmp ("GaugeInc", ci->values[0].value.string) == 0) + cm->flags |= UTILS_MATCH_CF_GAUGE_INC; + else if (strcasecmp ("GaugeAdd", ci->values[0].value.string) == 0) + cm->flags |= UTILS_MATCH_CF_GAUGE_ADD; + else if (strcasecmp ("GaugePersist", ci->values[0].value.string) == 0) + cm->flags |= UTILS_MATCH_CF_GAUGE_PERSIST; else cm->flags = 0; } + else if (strcasecmp ("Latency", ci->values[0].value.string) == 0) + { + cm->flags = UTILS_MATCH_DS_TYPE_GAUGE | UTILS_MATCH_CF_GAUGE_LATENCY; + } else if (strncasecmp ("Counter", ci->values[0].value.string, strlen ("Counter")) == 0) { cm->flags = UTILS_MATCH_DS_TYPE_COUNTER; @@ -123,13 +144,10 @@ static int ctail_config_add_match_dstype (ctail_config_match_t *cm, } /* int ctail_config_add_match_dstype */ static int ctail_config_add_match (cu_tail_match_t *tm, - const char *plugin_instance, oconfig_item_t *ci) + const char *plugin_instance, oconfig_item_t *ci, cdtime_t interval) { - ctail_config_match_t cm; + ctail_config_match_t cm = { 0 }; int status; - int i; - - memset (&cm, '\0', sizeof (cm)); if (ci->values_num != 0) { @@ -137,7 +155,7 @@ static int ctail_config_add_match (cu_tail_match_t *tm, } status = 0; - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; @@ -151,6 +169,28 @@ static int ctail_config_add_match (cu_tail_match_t *tm, status = cf_util_get_string (option, &cm.type); else if (strcasecmp ("Instance", option->key) == 0) status = cf_util_get_string (option, &cm.type_instance); + else if (strncasecmp ("Latency", option->key, strlen ("Latency")) == 0) + { + if (strcasecmp ("LatencyPercentile", option->key) == 0) + status = latency_config_add_percentile ("tail", &cm.latency, option); + else if (strcasecmp ("LatencyPercentileType", option->key) == 0) + status = cf_util_get_string (option, &cm.latency.percentile_type); + else if (strcasecmp ("LatencyRate", option->key) == 0) + status = latency_config_add_rate ("tail", &cm.latency, option); + else if (strcasecmp ("LatencyRateType", option->key) == 0) + status = cf_util_get_string (option, &cm.latency.rates_type); + else if (strcasecmp ("LatencyLower", option->key) == 0) + status = cf_util_get_boolean (option, &cm.latency.lower); + else if (strcasecmp ("LatencyUpper", option->key) == 0) + status = cf_util_get_boolean (option, &cm.latency.upper); + else if (strcasecmp ("LatencyAvg", option->key) == 0) + status = cf_util_get_boolean (option, &cm.latency.avg); + else + { + WARNING ("tail plugin: Option `%s' not allowed here.", option->key); + status = -1; + } + } else { WARNING ("tail plugin: Option `%s' not allowed here.", option->key); @@ -184,13 +224,35 @@ static int ctail_config_add_match (cu_tail_match_t *tm, break; } + if ((cm.flags & UTILS_MATCH_DS_TYPE_GAUGE) + && (cm.flags & UTILS_MATCH_CF_GAUGE_LATENCY)) + { + + if (cm.type_instance != NULL) + { + WARNING ("tail plugin: `DSType Latency' and `Instance %s' in `Match' " + "block could not be used together.", cm.type_instance); + status = -1; + break; + } + + if (cm.latency.percentile_num == 0 && cm.latency.rates_num == 0) + { + WARNING ("tail plugin: `Match' with `DSType Latency' has no " + "`LatencyPercentile' or `LatencyRate' options."); + status = -1; + break; + } + } + break; } /* while (status == 0) */ if (status == 0) { status = tail_match_add_match_simple (tm, cm.regex, cm.excluderegex, - cm.flags, "tail", plugin_instance, cm.type, cm.type_instance); + cm.flags, "tail", plugin_instance, cm.type, cm.type_instance, + cm.latency, interval); if (status != 0) { @@ -202,6 +264,7 @@ static int ctail_config_add_match (cu_tail_match_t *tm, sfree (cm.excluderegex); sfree (cm.type); sfree (cm.type_instance); + latency_config_free(cm.latency); return (status); } /* int ctail_config_add_match */ @@ -209,9 +272,9 @@ static int ctail_config_add_match (cu_tail_match_t *tm, static int ctail_config_add_file (oconfig_item_t *ci) { cu_tail_match_t *tm; + cdtime_t interval = 0; char *plugin_instance = NULL; int num_matches = 0; - int i; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { @@ -227,24 +290,25 @@ static int ctail_config_add_file (oconfig_item_t *ci) return (-1); } - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; - int status; + int status = 0; - if (strcasecmp ("Match", option->key) == 0) + if (strcasecmp ("Instance", option->key) == 0) + status = cf_util_get_string (option, &plugin_instance); + else if (strcasecmp ("Interval", option->key) == 0) + cf_util_get_cdtime (option, &interval); + else if (strcasecmp ("Match", option->key) == 0) { - status = ctail_config_add_match (tm, plugin_instance, option); + status = ctail_config_add_match (tm, plugin_instance, option, interval); if (status == 0) num_matches++; /* Be mild with failed matches.. */ status = 0; } - else if (strcasecmp ("Instance", option->key) == 0) - status = cf_util_get_string (option, &plugin_instance); else { - WARNING ("tail plugin: Option `%s' not allowed here.", option->key); status = -1; } @@ -265,7 +329,7 @@ static int ctail_config_add_file (oconfig_item_t *ci) { cu_tail_match_t **temp; - temp = (cu_tail_match_t **) realloc (tail_match_list, + temp = realloc (tail_match_list, sizeof (cu_tail_match_t *) * (tail_match_list_num + 1)); if (temp == NULL) { @@ -276,6 +340,7 @@ static int ctail_config_add_file (oconfig_item_t *ci) tail_match_list = temp; tail_match_list[tail_match_list_num] = tm; + tail_match_list_intervals[tail_match_list_num] = interval; tail_match_list_num++; } @@ -284,9 +349,7 @@ static int ctail_config_add_file (oconfig_item_t *ci) static int ctail_config (oconfig_item_t *ci) { - int i; - - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; @@ -301,47 +364,46 @@ static int ctail_config (oconfig_item_t *ci) return (0); } /* int ctail_config */ -static int ctail_init (void) +static int ctail_read (user_data_t *ud) { - if (tail_match_list_num == 0) + int status; + + status = tail_match_read ((cu_tail_match_t *)ud->data); + if (status != 0) { - WARNING ("tail plugin: File list is empty. Returning an error."); + ERROR ("tail plugin: tail_match_read failed."); return (-1); } return (0); -} /* int ctail_init */ +} /* int ctail_read */ -static int ctail_read (void) +static int ctail_init (void) { - int success = 0; - size_t i; + char str[255]; - for (i = 0; i < tail_match_list_num; i++) + if (tail_match_list_num == 0) { - int status; + WARNING ("tail plugin: File list is empty. Returning an error."); + return (-1); + } - status = tail_match_read (tail_match_list[i]); - if (status != 0) - { - ERROR ("tail plugin: tail_match_read[%zu] failed.", i); - } - else - { - success++; - } + for (size_t i = 0; i < tail_match_list_num; i++) + { + ssnprintf(str, sizeof(str), "tail-%zu", i); + + plugin_register_complex_read (NULL, str, ctail_read, tail_match_list_intervals[i], + &(user_data_t) { + .data = tail_match_list[i], + }); } - if (success == 0) - return (-1); return (0); -} /* int ctail_read */ +} /* int ctail_init */ static int ctail_shutdown (void) { - size_t i; - - for (i = 0; i < tail_match_list_num; i++) + for (size_t i = 0; i < tail_match_list_num; i++) { tail_match_destroy (tail_match_list[i]); tail_match_list[i] = NULL; @@ -356,7 +418,6 @@ void module_register (void) { plugin_register_complex_config ("tail", ctail_config); plugin_register_init ("tail", ctail_init); - plugin_register_read ("tail", ctail_read); plugin_register_shutdown ("tail", ctail_shutdown); } /* void module_register */