X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fceph.c;h=3accbd3f80d20a8d9b3c5c8e28af961c2d613aa9;hb=1fa33c8280426163249b149843b2dbcdb0471ec3;hp=bfd95e829eed6b1cc4f82ed351de8aeb45c697e7;hpb=ddde85aad33bad5e7f5ed0d21ee082ef1dcda140;p=collectd.git diff --git a/src/ceph.c b/src/ceph.c index bfd95e82..3accbd3f 100644 --- a/src/ceph.c +++ b/src/ceph.c @@ -396,7 +396,7 @@ static void ceph_daemon_free(struct ceph_daemon *d) { } /* compact_ds_name removed the special characters ":", "_", "-" and "+" from the - * intput string. Characters following these special characters are capitalized. + * input string. Characters following these special characters are capitalized. * Trailing "+" and "-" characters are replaces with the strings "Plus" and * "Minus". */ static int compact_ds_name(char *buffer, size_t buffer_size, char const *src) { @@ -518,12 +518,6 @@ static int parse_keys(char *buffer, size_t buffer_size, const char *key_str) { size_t tmp_size = sizeof(tmp); const char *cut_suffixes[] = {".type", ".avgcount", ".sum", ".avgtime"}; - /* The "avgtime" metric reports ("sum" / "avgcount"), i.e. the average time - * per request since the start of the Ceph daemon. Report this only when the - * user has configured "long running average". Otherwise, use the rate of - * "sum" and "avgcount" to calculate the current latency. - */ - if (buffer == NULL || buffer_size == 0 || key_str == NULL || strlen(key_str) == 0) return EINVAL; @@ -933,7 +927,13 @@ static int node_handler_fetch_data(void *arg, const char *val, uv.gauge = result; vtmp->latency_index = (vtmp->latency_index + 1); } else if (has_suffix(key, ".avgtime")) { - // skip this step if no need in long run latency + + /* The "avgtime" metric reports ("sum" / "avgcount"), i.e. the average + * time per request since the start of the Ceph daemon. Report this only + * when the user has configured "long running average". Otherwise, use the + * rate of "sum" and "avgcount" to calculate the current latency. + */ + if (!long_run_latency_avg) { return 0; }