**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include <sys/types.h>
-#include <pthread.h>
#include <yajl/yajl_common.h>
#include <yajl/yajl_gen.h>
#if HAVE_YAJL_YAJL_VERSION_H
if (0 == strcasecmp (key, "LogLevel")) {
log_level = parse_log_severity(value);
- if (log_level < 0) {
- log_level = LOG_INFO;
- ERROR("log_logstash: invalid loglevel [%s] defaulting to 'info'",
- value);
- return 1;
- }
+ if (log_level < 0) {
+ log_level = LOG_INFO;
+ ERROR("log_logstash: invalid loglevel [%s] defaulting to 'info'",
+ value);
+ return 1;
+ }
}
else if (0 == strcasecmp (key, "File")) {
sfree (log_file);
unsigned int len;
#endif
- if (yajl_gen_string(g, (u_char *)"@level", strlen("@level")) !=
+ if (yajl_gen_string(g, (u_char *)"level", strlen("level")) !=
yajl_gen_status_ok)
goto err;
* format time as a UTC ISO 8601 compliant string
*/
strftime (timestamp_str, sizeof (timestamp_str),
- "%Y-%m-%d %H:%M:%SZ", ×tamp_tm);
+ "%Y-%m-%dT%H:%M:%SZ", ×tamp_tm);
timestamp_str[sizeof (timestamp_str) - 1] = '\0';
if (yajl_gen_string(g, (u_char *)timestamp_str,
{
yajl_gen g;
#if !defined(HAVE_YAJL_V2)
- yajl_gen_config conf;
+ yajl_gen_config conf = {};
conf.beautify = 0;
#endif
if (yajl_gen_map_open(g) != yajl_gen_status_ok)
goto err;
- if (yajl_gen_string(g, (u_char *)"@message", strlen("@message")) !=
+ if (yajl_gen_string(g, (u_char *)"message", strlen("message")) !=
yajl_gen_status_ok)
goto err;
if (yajl_gen_string(g, (u_char *)msg, strlen(msg)) !=
#if HAVE_YAJL_V2
g = yajl_gen_alloc(NULL);
#else
- yajl_gen_config conf;
+ yajl_gen_config conf = {};
conf.beautify = 0;
g = yajl_gen_alloc(&conf, NULL);
if (yajl_gen_map_open(g) != yajl_gen_status_ok)
goto err;
- if (yajl_gen_string(g, (u_char *)"@message", strlen("@message")) !=
+ if (yajl_gen_string(g, (u_char *)"message", strlen("message")) !=
yajl_gen_status_ok)
goto err;
if (strlen(n->message) > 0) {
goto err;
}
-
- if (yajl_gen_string(g, (u_char *)"@fields", strlen("@fields")) !=
- yajl_gen_status_ok)
- goto err;
- if (yajl_gen_map_open(g) !=
- yajl_gen_status_ok)
- goto err;
-
if (strlen(n->host) > 0) {
if (yajl_gen_string(g, (u_char *)"host", strlen("host")) !=
yajl_gen_status_ok)
goto err;
break;
}
- if (yajl_gen_map_close(g) != yajl_gen_status_ok)
- goto err;
log_logstash_print (g, LOG_INFO, (n->time != 0) ? n->time : cdtime ());
return (0);