summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad459d9)
raw | patch | inline | side by side (parent: ad459d9)
author | Pierre-Yves Ritschard <pyr@spootnik.org> | |
Fri, 25 Jul 2014 14:28:51 +0000 (16:28 +0200) | ||
committer | Pierre-Yves Ritschard <pyr@spootnik.org> | |
Fri, 25 Jul 2014 14:28:51 +0000 (16:28 +0200) |
src/collectd.conf.in | patch | blob | history | |
src/log_logstash.c | patch | blob | history |
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2a79dc45edfbf638337a7dbb1cf17aafdd91b58c..a91e2ba4dd36d43025242c86008bc6207dc7d60b 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@LOAD_PLUGIN_SYSLOG@LoadPlugin syslog
@LOAD_PLUGIN_LOGFILE@LoadPlugin logfile
-@LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin logfile
+@LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin log_logstash
#<Plugin logfile>
# LogLevel @DEFAULT_LOG_LEVEL@
# PrintSeverity false
#</Plugin>
-#<Plugin logfile>
+#<Plugin log_logstash>
# LogLevel @DEFAULT_LOG_LEVEL@
# File "@localstatedir@/log/@PACKAGE_NAME@.json.log"
#</Plugin>
diff --git a/src/log_logstash.c b/src/log_logstash.c
index 14e157b52fd04754897cde2cf607fa6cbf0d0e06..6cb5b0a11232b6f9fe479f40cb2c9e2d666e6996 100644 (file)
--- a/src/log_logstash.c
+++ b/src/log_logstash.c
# 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;