Merge branch 'collectd-5.8'

[collectd.git] / src / utils_format_kairosdb.c

diff --git a/src/utils_format_kairosdb.c b/src/utils_format_kairosdb.c
index 63803af..4003243 100644 (file)
--- a/src/utils_format_kairosdb.c
+++ b/src/utils_format_kairosdb.c
@@ -154,7 +154,7 @@ static int values_to_kairosdb(char *buffer, size_t buffer_size, /* {{{ */
     BUFFER_ADD("[[");
     BUFFER_ADD("%" PRIu64, CDTIME_T_TO_MS(vl->time));
     BUFFER_ADD(",");
-    BUFFER_ADD("%llu", vl->values[ds_idx].counter);
+    BUFFER_ADD("%" PRIu64, (uint64_t)vl->values[ds_idx].counter);
   } else if (ds->ds[ds_idx].type == DS_TYPE_DERIVE) {
     BUFFER_ADD("[[");
     BUFFER_ADD("%" PRIu64, CDTIME_T_TO_MS(vl->time));
@@ -184,7 +184,7 @@ static int value_list_to_kairosdb(char *buffer, size_t buffer_size, /* {{{ */
                                   int store_rates,
                                   char const *const *http_attrs,
                                   size_t http_attrs_num, int data_ttl,
-                                  char *metrics_prefix) {
+                                  char const *metrics_prefix) {
   char temp[512];
   size_t offset = 0;
   int status;
@@ -213,11 +213,13 @@ static int value_list_to_kairosdb(char *buffer, size_t buffer_size, /* {{{ */
   for (size_t i = 0; i < ds->ds_num; i++) {
     /* All value lists have a leading comma. The first one will be replaced with
      * a square bracket in `format_kairosdb_finalize'. */
-    BUFFER_ADD(",{");
+    BUFFER_ADD(",{\"name\":\"");
 
-    BUFFER_ADD("\"name\":\"%s", metrics_prefix);
+    if (metrics_prefix != NULL) {
+      BUFFER_ADD("%s.", metrics_prefix);
+    }
 
-    BUFFER_ADD(".%s", vl->plugin);
+    BUFFER_ADD("%s", vl->plugin);
 
     status = values_to_kairosdb(temp, sizeof(temp), ds, vl, store_rates, i);
     if (status != 0)
@@ -265,7 +267,7 @@ static int format_kairosdb_value_list_nocheck(
     size_t *ret_buffer_fill, size_t *ret_buffer_free, const data_set_t *ds,
     const value_list_t *vl, int store_rates, size_t temp_size,
     char const *const *http_attrs, size_t http_attrs_num, int data_ttl,
-    char *metrics_prefix) {
+    char const *metrics_prefix) {
   char temp[temp_size];
   int status;
 
@@ -341,7 +343,7 @@ int format_kairosdb_value_list(char *buffer, /* {{{ */
                                const data_set_t *ds, const value_list_t *vl,
                                int store_rates, char const *const *http_attrs,
                                size_t http_attrs_num, int data_ttl,
-                               char *metrics_prefix) {
+                               char const *metrics_prefix) {
   if ((buffer == NULL) || (ret_buffer_fill == NULL) ||
       (ret_buffer_free == NULL) || (ds == NULL) || (vl == NULL))
     return -EINVAL;