log_logstash: adapt JSON format to logstash 1.2+

Fixes #974

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 15b3580cd4c5c70de22643319f8e266ca949bcdd..61e7f4848e3a4b6dd24f87cf5ac3fb630416e7fd 100644 (file)
--- 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);