X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flog_logstash.c;h=2d5f6203802852b0bf7174eaf0ab8c22bdf237a9;hb=791e99923dbbf045b11fbd7b0ea8df647e29593e;hp=6cb5b0a11232b6f9fe479f40cb2c9e2d666e6996;hpb=4e09461f3fee004b8777fa02584434786289b5fb;p=collectd.git

diff --git a/src/log_logstash.c b/src/log_logstash.c
index 6cb5b0a1..2d5f6203 100644
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
@@ -1,19 +1,24 @@
 /**
  * collectd - src/log_logstash.c
- * Copyright (C) 2013 Pierre-Yves Ritschard
+ * Copyright (C) 2013       Pierre-Yves Ritschard
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Pierre-Yves Ritschard <pyr at spootnik.org>
@@ -92,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;
 
@@ -142,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,
@@ -203,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
@@ -224,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)) !=
@@ -247,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);
@@ -260,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) {
@@ -275,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)
@@ -360,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);