X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flog_logstash.c;fp=src%2Flog_logstash.c;h=61e7f4848e3a4b6dd24f87cf5ac3fb630416e7fd;hb=f03005bd330f0c060025aef8b6fcac1bc55a3ca5;hp=15b3580cd4c5c70de22643319f8e266ca949bcdd;hpb=9817e7298bd6c364fa17347327af54adf048bd21;p=collectd.git

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 15b3580c..61e7f484 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -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;
 
@@ -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)) !=
@@ -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);