projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #2736 from rpv-tomsk/collectd-collectd-5.8
[collectd.git]
/
src
/
utils_tail_match.c
diff --git
a/src/utils_tail_match.c
b/src/utils_tail_match.c
index
f046f6b
..
5134a6e
100644
(file)
--- a/
src/utils_tail_match.c
+++ b/
src/utils_tail_match.c
@@
-108,7
+108,6
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
if (match_value == NULL)
return -1;
if (match_value == NULL)
return -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.plugin, data->plugin, sizeof(vl.plugin));
sstrncpy(vl.plugin_instance, data->plugin_instance,
sizeof(vl.plugin_instance));
@@
-119,11
+118,11
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
sstrncpy(vl.type, data->type, sizeof(vl.type));
for (size_t i = 0; i < data->latency_config.percentile_num; i++) {
if (strlen(data->type_instance) != 0)
sstrncpy(vl.type, data->type, sizeof(vl.type));
for (size_t i = 0; i < data->latency_config.percentile_num; i++) {
if (strlen(data->type_instance) != 0)
- s
snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%.0f
",
-
data->type_instance, data->latency_config.percentile[i]);
+ s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%.50s-%.5g
",
+ data->type_instance, data->latency_config.percentile[i]);
else
else
- s
snprintf(vl.type_instance, sizeof(vl.type_instance), "%.0f
",
-
data->latency_config.percentile[i]);
+ s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%.5g
",
+ data->latency_config.percentile[i]);
vl.values = &(value_t){
.gauge =
vl.values = &(value_t){
.gauge =
@@
-138,7
+137,11
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
}
/* Submit buckets */
}
/* Submit buckets */
- sstrncpy(vl.type, "bucket", sizeof(vl.type));
+ if (data->latency_config.bucket_type != NULL)
+ sstrncpy(vl.type, data->latency_config.bucket_type, sizeof(vl.type));
+ else
+ sstrncpy(vl.type, "bucket", sizeof(vl.type));
+
for (size_t i = 0; i < data->latency_config.buckets_num; i++) {
latency_bucket_t bucket = data->latency_config.buckets[i];
for (size_t i = 0; i < data->latency_config.buckets_num; i++) {
latency_bucket_t bucket = data->latency_config.buckets[i];
@@
-147,11
+150,11
@@
static int latency_submit_match(cu_match_t *match, void *user_data) {
bucket.upper_bound ? CDTIME_T_TO_DOUBLE(bucket.upper_bound) : INFINITY;
if (strlen(data->type_instance) != 0)
bucket.upper_bound ? CDTIME_T_TO_DOUBLE(bucket.upper_bound) : INFINITY;
if (strlen(data->type_instance) != 0)
- s
snprintf(vl.type_instance, sizeof(vl.type_instance), "%s-%
s-%g_%g",
-
data->type, data->type_instance, lower_bound, upper_bound);
+ s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%.50s-%.50
s-%g_%g",
+ data->type, data->type_instance, lower_bound, upper_bound);
else
else
- s
snprintf(vl.type_instance, sizeof(vl.type_instance), "%
s-%g_%g",
-
data->type, lower_bound, upper_bound);
+ s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%.50
s-%g_%g",
+ data->type, lower_bound, upper_bound);
vl.values = &(value_t){
.gauge =
vl.values = &(value_t){
.gauge =