X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flog_logstash.c;h=08868409d2b575edfd080f0cf81ffb8d1ada5740;hb=4d1136a79358170b5881417409f2750964b2ba91;hp=15b3580cd4c5c70de22643319f8e266ca949bcdd;hpb=2761756b5ad2c9a973b30540633218202860a4d7;p=collectd.git

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 15b3580c..08868409 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -27,11 +27,11 @@
  **/
 
 #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
@@ -65,12 +65,12 @@ static int log_logstash_config (const char *key, const char *value)
 
 	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);
@@ -97,7 +97,7 @@ static void log_logstash_print (yajl_gen g, int severity,
 	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;
 
@@ -147,7 +147,7 @@ static void log_logstash_print (yajl_gen g, int severity,
 	 * format time as a UTC ISO 8601 compliant string
 	 */
 	strftime (timestamp_str, sizeof (timestamp_str),
-		  "%Y-%m-%d %H:%M:%SZ", &timestamp_tm);
+		  "%Y-%m-%dT%H:%M:%SZ", &timestamp_tm);
 	timestamp_str[sizeof (timestamp_str) - 1] = '\0';
 
 	if (yajl_gen_string(g, (u_char *)timestamp_str,
@@ -208,7 +208,7 @@ static void log_logstash_log (int severity, const char *msg,
 {
 	yajl_gen g;
 #if !defined(HAVE_YAJL_V2)
-	yajl_gen_config conf;
+	yajl_gen_config conf = {};
 
 	conf.beautify = 0;
 #endif
@@ -229,7 +229,7 @@ static void log_logstash_log (int severity, const char *msg,
 
 	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)) !=
@@ -252,7 +252,7 @@ static int log_logstash_notification (const notification_t *n,
 #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);
@@ -265,7 +265,7 @@ static int log_logstash_notification (const notification_t *n,
 
 	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) {
@@ -280,14 +280,6 @@ static int log_logstash_notification (const notification_t *n,
 			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)
@@ -365,8 +357,6 @@ static int log_logstash_notification (const notification_t *n,
 			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);