projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70160d8 a332a3c)
Merge pull request #360 from pyr/feature-log-logstash
authorPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 25 Jul 2014 14:32:11 +0000 (16:32 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Fri, 25 Jul 2014 14:32:11 +0000 (16:32 +0200)
add log_logstash plugin to emit logstash json_event messages.

1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/Makefile.am patch | diff1 | diff2 | blob | history
src/collectd.conf.in patch | diff1 | diff2 | blob | history
src/collectd.conf.pod patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
collectd, the system statistics collection daemon