projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turbostat: adapt src/Makefile.am as per 4de560d2c
[collectd.git]
/
src
/
write_tsdb.c
diff --git
a/src/write_tsdb.c
b/src/write_tsdb.c
index
9dff290
..
b7f46f1
100644
(file)
--- a/
src/write_tsdb.c
+++ b/
src/write_tsdb.c
@@
-47,7
+47,6
@@
#include "configfile.h"
#include "utils_cache.h"
#include "configfile.h"
#include "utils_cache.h"
-#include "utils_parse_option.h"
#include <pthread.h>
#include <sys/socket.h>
#include <pthread.h>
#include <sys/socket.h>
@@
-368,7
+367,7
@@
static int wt_format_name(char *ret, int ret_len,
if (vl->plugin_instance[0] == '\0') {
ssnprintf(ret, ret_len, "%s%s.%s",
prefix, vl->plugin, ds_name);
if (vl->plugin_instance[0] == '\0') {
ssnprintf(ret, ret_len, "%s%s.%s",
prefix, vl->plugin, ds_name);
- } else if (vl->type_instance == '\0') {
+ } else if (vl->type_instance
[0]
== '\0') {
ssnprintf(ret, ret_len, "%s%s.%s.%s.%s",
prefix, vl->plugin, vl->plugin_instance,
vl->type_instance, ds_name);
ssnprintf(ret, ret_len, "%s%s.%s.%s.%s",
prefix, vl->plugin, vl->plugin_instance,
vl->type_instance, ds_name);
@@
-388,8
+387,8
@@
static int wt_format_name(char *ret, int ret_len,
ssnprintf(ret, ret_len, "%s%s.%s.%s",
prefix, vl->plugin, vl->plugin_instance, vl->type);
} else {
ssnprintf(ret, ret_len, "%s%s.%s.%s",
prefix, vl->plugin, vl->plugin_instance, vl->type);
} else {
- ssnprintf(ret, ret_len, "%s%s.%s.%s",
- prefix, vl->plugin, vl->plugin_instance, vl->type_instance);
+ ssnprintf(ret, ret_len, "%s%s.%s.%s
.%s
",
+ prefix, vl->plugin, vl->plugin_instance, vl->type
, vl->type
_instance);
}
sfree(temp);
}
sfree(temp);
@@
-406,7
+405,6
@@
static int wt_send_message (const char* key, const char* value,
char *tags = "";
char message[1024];
char *host_tags = cb->host_tags ? cb->host_tags : "";
char *tags = "";
char message[1024];
char *host_tags = cb->host_tags ? cb->host_tags : "";
- const char *message_fmt;
const char *meta_tsdb = "tsdb_tags";
/* skip if value is NaN */
const char *meta_tsdb = "tsdb_tags";
/* skip if value is NaN */
@@
-427,16
+425,15
@@
static int wt_send_message (const char* key, const char* value,
}
}
}
}
- message_fmt = "put %s %u %s fqdn=%s %s %s\r\n";
- message_len = ssnprintf (message, sizeof(message),
- message_fmt,
- key,
- (unsigned int)CDTIME_T_TO_TIME_T(
- time),
- value,
- host,
- tags,
- host_tags);
+ message_len = ssnprintf (message,
+ sizeof(message),
+ "put %s %.0f %s fqdn=%s %s %s\r\n",
+ key,
+ CDTIME_T_TO_DOUBLE(time),
+ value,
+ host,
+ tags,
+ host_tags);
sfree(temp);
sfree(temp);