/**
* 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>
# define HAVE_YAJL_V2 1
#endif
-#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.json.log"
+#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/"PACKAGE_NAME".json.log"
#if COLLECT_DEBUG
static int log_level = LOG_DEBUG;
if (0 == strcasecmp (key, "LogLevel")) {
log_level = parse_log_severity(value);
- printf("parsed log level: %d\n", log_level);
- if (log_level == -1) return 1; /* to keep previous behaviour */
+ 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);
size_t len;
#else
unsigned int len;
-#endif
+#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;
tt = CDTIME_T_TO_TIME_T (timestamp_time);
gmtime_r (&tt, ×tamp_tm);
- /*
+ /*
* format time as a UTC ISO 8601 compliant string
*/
strftime (timestamp_str, sizeof (timestamp_str),
"%Y-%m-%d %H:%M:%SZ", ×tamp_tm);
timestamp_str[sizeof (timestamp_str) - 1] = '\0';
-
+
if (yajl_gen_string(g, (u_char *)timestamp_str,
strlen(timestamp_str)) !=
yajl_gen_status_ok)
{
fh = fopen (DEFAULT_LOGFILE, "a");
do_close = 1;
- }
- else
- {
+ } else if (strcasecmp(log_file, "stdout") == 0) {
+ fh = stdout;
+ do_close = 0;
+ } else if (strcasecmp(log_file, "stderr") == 0) {
+ fh = stderr;
+ do_close = 0;
+ } else {
fh = fopen (log_file, "a");
do_close = 1;
}
yajl_gen_config conf;
conf.beautify = 0;
-#endif
+#endif
if (severity > log_level)
return;
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)) !=
yajl_gen_free(g);
fprintf(stderr, "Could not generate JSON message preamble\n");
return;
-
+
} /* void log_logstash_log (int, const char *) */
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) {
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)
yajl_gen_status_ok)
goto err;
if (yajl_gen_string(g, (u_char *)n->type_instance,
- strlen(n->type_instance)) !=
+ strlen(n->type_instance)) !=
yajl_gen_status_ok)
goto err;
}
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);
} /* void module_register (void) */
/* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-
projects / collectd.git / blobdiff