[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Mon Jul 28 15:04:35 CEST 2014
AUTHORS | 4 +
ChangeLog | 4 +-
README | 7 +
configure.ac | 134 ++++++-
contrib/collection3/lib/Collectd/Config.pm | 2 +-
contrib/collection3/lib/Collectd/Graph/Config.pm | 2 +-
.../collection3/lib/Collectd/Graph/TypeLoader.pm | 2 +-
contrib/php-collection/graph.php | 2 +-
contrib/postgresql/collectd_insert.sql | 4 +-
contrib/redhat/collectd.spec | 4 +-
src/Makefile.am | 46 ++-
src/amqp.c | 4 +-
src/battery.c | 2 +-
src/cgroups.c | 2 +-
src/collectd-snmp.pod | 2 +-
src/collectd.conf.in | 8 +
src/collectd.conf.pod | 180 ++++++++-
src/cpu.c | 5 +-
src/cpython.h | 4 +-
src/disk.c | 85 +++-
src/java.c | 6 +-
src/log_logstash.c | 389 ++++++++++++++++++
src/logfile.c | 6 +-
src/syslog.c | 2 +-
src/teamspeak2.c | 4 +-
src/threshold.c | 121 +-----
src/unixsock.c | 5 +
src/uptime.c | 2 +-
src/utils_cmd_flush.c | 2 +-
src/utils_cmd_getthreshold.c | 1 +
src/utils_cmd_putnotif.c | 15 +-
src/utils_crc32.c | 110 ++++++
src/utils_crc32.h | 27 ++
src/utils_fbhash.c | 2 +-
src/utils_mount.h | 2 +-
src/utils_threshold.c | 138 +++++++
src/utils_threshold.h | 62 +++
src/write_http.c | 64 ++-
src/write_kafka.c | 418 ++++++++++++++++++++
src/write_riemann.c | 53 ++-
src/write_riemann_threshold.c | 242 ++++++++++++
41 files changed, 1987 insertions(+), 187 deletions(-)
New commits:
commit 68ac98ed21d932fc80dd2d296543564b7a06dac2
Merge: 1d361ac 8438e24
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 19:03:06 2014 +0200
Merge pull request #613 from rubenk/master
Fix a few typos
commit 1d361acaa2db15b51a752420d34f3416a8dc8603
Merge: 1ecef4c 8f74120
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:40:39 2014 +0200
Merge pull request #649 from manuelluis/mlsr/flush-fix_time
FLUSH cmd: convert timeout (double) to cdtime_t as the previous call to plugin_flush
commit 1ecef4ca6f6ba7005109df6520949e578a483ca3
Merge: 2fbb0af ada80db
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:36:56 2014 +0200
Merge pull request #644 from manuelluis/mlsr/putnotif-fix_time
Fix the conversion of time option in PUTNOTIF from timestamp to cdtime_t
commit 2fbb0afbb4b6a1bb186da71e982187dc4c667351
Merge: ffbc741 23880c7
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:36:15 2014 +0200
Merge pull request #645 from manuelluis/mlsr/java-fix_cdtime
Plugin java: fix notification time conversion to cdtime_t.
commit ffbc7413174cb2c07b1b22a1fb11f3de9d487f3c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:30:46 2014 +0200
vanity
commit 172dcccf29a7429a787d7e8b3457db1bee501585
Merge: 7974aeb f28e85c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:22:07 2014 +0200
Merge pull request #647 from manuelluis/mlsr/threshold-missing_time
Plugin threshold: time is not set in missing notifications.
commit 7974aebbc32a8dc613ba0c6e0e75c905d96e0c0e
Merge: f26c9db 4b05cdf
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:19:14 2014 +0200
Merge pull request #659 from mfournier/amqp-fixups
Amqp fixups
commit f26c9db10bf0a1efdb33c5c682824254059758e6
Merge: 08ed870 a5608f2
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:05:40 2014 +0200
Merge branch 'master' of github.com:collectd/collectd
commit a5608f2e49d35a9c7f055c6b8c22048a08c2d4e9
Merge: 0cb9bbb 422a90c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:04:05 2014 +0200
Merge pull request #674 from manuelluis/mlsr/unixsock_getthreshold
Plugin unixsock: reenable getthreshold cmd.
commit 08ed870bf8e9bdda64ca192150870b1e7ffb5e10
Merge: 0cb9bbb 422a90c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:00:23 2014 +0200
Merge branch 'mlsr/unixsock_getthreshold' of https://github.com/manuelluis/collectd
commit 422a90c1ef680568e3885c376fa5c2a97cb8edd7
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Sat Jul 26 00:01:41 2014 +0200
Renable getthreshold cmd in unixsock Plugin.
commit b3a2880887f7accbdf9c661d5d8fea28a050ea73
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Fri Jul 25 22:53:40 2014 +0200
Move threshold_search and threshold_get to utils_threshold.c
commit 0cb9bbb8dc8cc4bf7cabcbd768fb36f7ffaa84e4
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Jul 25 22:51:10 2014 +0200
make configure summary consistent
commit 082be7a56f25e0561be6ce87e5662e01b1e91975
Merge: 70160d8 a332a3c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:32:11 2014 +0200
Merge pull request #360 from pyr/feature-log-logstash
add log_logstash plugin to emit logstash json_event messages.
commit a332a3c1093ebc5cdaa46a58dadc1f6392bd142b
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:33:13 2014 +0200
document log_logstash
commit 0c81505b9146319ff1503ed22c214c4198377513
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:28:51 2014 +0200
small typos
commit ad459d91bd8d24dc02737f398943b325cd446d48
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:08:13 2014 +0200
forgotten printf
commit 70160d8f57c9a767ae2ca14e31c8687ecbb10db3
Merge: 5ff0ee5 88e3273
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:07:04 2014 +0200
Merge pull request #660 from mfournier/logfile-log_level
Logfile log level
commit a87a517e71a67d6972e082f42226d5b2bed82f19
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:04:08 2014 +0200
avoid possibility of muting log output
commit b4ff173bac428ca4b9a2b16c22cfa231d1617b35
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 16:00:22 2014 +0200
bring in AM_CPPFLAGS
commit 1bde61431735c90214549e3fcdfa22c6cda9eda1
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 15:59:51 2014 +0200
support emitting to stdout or stderr
commit 5ff0ee586df3ae4668f105057a5b8e6fc183f1a0
Merge: 10acbeb 865eb2c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 15:34:16 2014 +0200
Merge pull request #670 from pyr/feature-write-kafka
Add a write_kafka output with similar properties to the amqp one.
commit 10acbebad32481ef261daed297f61b5e4c153879
Merge: 9ba7194 ab63959
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jul 25 15:33:44 2014 +0200
Merge pull request #518 from pyr/feature-riemann-threshold
Feature riemann threshold
commit 9ba71940d0f2fb3aa6c18aa55bb83e09588e2f7f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jul 24 16:15:42 2014 +0200
add 2 missing options to example config
commit 575e601fb46732bc0538ef92ea6ac3b00ef3aafd
Merge: fff2e10 8a9e2bf
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jul 24 14:51:23 2014 +0200
Merge branch 'udev-disk'
commit 8a9e2bf87d6eccd39e9ec780062f44d3299be36a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jul 24 14:48:14 2014 +0200
disk: document missing option + add example
commit 865eb2ca8f13d48fd31b35f23b6df6713144707d
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jul 24 11:54:05 2014 +0200
add documentation
commit fff2e1007e92f9db9e8bfb74bb86e641f37588bd
Merge: 41f95c3 911b17c
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jul 24 10:08:40 2014 +0200
Merge pull request #639 from dothebart/fix_cpu_crash
CPU Percentage: after realloc the pointer becomes invalid;
commit 41f95c32f9e2c7dd36af832a729f52dfafb9c18f
Merge: bcce4d5 6d2bcca
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jul 24 10:06:17 2014 +0200
Merge pull request #666 from KiNgMaR/write_http-ssloptions
write_http: expose more TLS options
commit 8f9558f46fc372a015e719ed83f4ea1103ca7d44
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jul 24 09:46:39 2014 +0200
make kafka logs go through collectd's logging
commit 268ab90141517707f9bf5efc790501ef03e0140e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jul 24 09:25:13 2014 +0200
remove unneeded include
commit 630e3bba83de49555006037eafb291a1ce0b3c12
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 09:39:03 2014 +0200
Add a write_kafka output with similar properties to the amqp one.
commit ab6395900e11e38cf1df7bbc680a9cf94702e582
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 15:23:43 2014 +0200
document new options
commit cf65f7ec5e19a99dd972a78e6c798fd478710663
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 15:23:27 2014 +0200
make threshold checking optional
commit 639f00e946bb3182688661a99119aa5f5d6c81b6
Merge: 4b49024 bcce4d5
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 13:55:49 2014 +0200
Merge branch 'master' into feature-riemann-threshold
commit 4b49024edd5c38af0d920b005d7e709953c2d342
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 13:53:23 2014 +0200
reuse main avl tree
commit 59278c8774567122dbc0ea1a217d007782fa868e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Tue Jul 22 13:45:23 2014 +0200
Store the avl tree within collectd core.
We need this if we want modules to share access to the threshold
avl tree.
commit 6d2bcca22dcc73bbc8461770ad8457c57d580a0c
Author: Ingmar Runge <ingmar at irsoft.de>
Date: Sun Jul 20 14:15:22 2014 +0200
write_http: expose more TLS options
* adds support for client certificate authentication
* allows setting CAPath
* allows forcing a specific SSL/TLS version
commit 88e327344e8cee8272776a28a030ffa84d201f8e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jun 24 17:48:26 2014 +0200
correct typo in error message
commit cb4ea7112145fa91500b4d4518b83289acb80c2f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jun 24 17:47:08 2014 +0200
logfile: avoid total silence in case of a misconfiguration
Basically the same patch that was applied to syslog.c in 84c38056
commit 4b05cdfde13983ecde65d1e7c055e489fbb45e95
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jun 24 16:43:18 2014 +0200
document 2 new options added to amqp plugin
commit 0d0886aa52d982cec71aedd688b2a941b3d2dc47
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jun 24 16:38:28 2014 +0200
amqp: new Queue{Durable,AutoDelete} options are subscribe-only options
commit 8f741209bba9563c910395da8fe93775614e8dbe
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 19:51:28 2014 +0200
FLUSH cmd: convert timeout (double) to cdtime_t
as the previous call to plugin_flush
commit ada80db25b508f681fd021cd4cd45d8fd29d8f59
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 19:14:53 2014 +0200
cmd PUTNOTIF time option: handle double values.
commit f28e85ce5eda0261b6b2ee2f81709892361a99f4
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 16:50:48 2014 +0200
Plugin threshold: time is not set in missing notifications.
commit 23880c7274a6fc021d4f7d20c524663aac87e88c
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 15:14:02 2014 +0200
Plugin java: fix notification time conversion to cdtime_t.
commit 5e7fbbcce89a63aeac198063fa1c8922b0b1f64c
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 00:35:02 2014 +0200
Fix the conversion of time option in PUTNOTIF
from timestamp to cdtime_t
commit 911b17c0df15eb9448ba41e773fa645f6aaa603e
Author: Wilfried Goesgens <dothebart at citadel.org>
Date: Sat Jun 7 16:57:50 2014 +0200
CPU Percentage: after realloc the pointer becomes invalid; need to work on new pointer.
fixes https://gist.github.com/toni-moreno/a2f80021535f87202de7
commit 8438e249445f2a1785f9de40a0c8da9889f0b8d1
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date: Sun May 11 13:17:53 2014 +0200
Fix a few typos
commit c8e864195fea2abc7cd35c03dd7796003cdf9b2f
Author: Patrick Mooney <patrick.f.mooney at gmail.com>
Date: Mon Feb 10 10:00:15 2014 -0600
disk: Add udev-based device renaming on Linux
On systems with large collections of allocated disk resources, the
kernel provided names can be difficult to use to logically group or
compare collected values. To grant users the ability to assign custom
instance names for disk devices, collectd can query for a specified udev
attribute. If the attribute is present, its value is subsituted for the
kernel name when submitting the data points.
commit 72ec1d0ed6cde4aa78f17d031e7a48e37cbf7a57
Merge: ca8b50e ab4488b
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jan 17 13:17:12 2014 +0100
Merge branch 'feature-log-logstash' of github.com:pyr/collectd into feature-log-logstash
Conflicts:
configure.ac
commit a3dd2679c84398244a10a39e54613043f4feb940
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jan 17 11:05:49 2014 +0100
Add threshold checks for riemann output.
commit 01f0c5cdad33f63e079b468481d79a05d7323be0
Merge: ca8b50e 4e9b4ea
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jan 17 09:25:46 2014 +0100
Merge branch 'feature-riemann-threshold' of github.com:pyr/collectd into feature-riemann-threshold
commit 4e9b4ea68ce0d163e2c001a52f22b2ad631d3b16
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jan 16 23:28:11 2014 +0100
import thresholds from thresholds.c
commit ab4488bbc2f371fd7bfb1c3659471160dfdbc2cb
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Thu Jun 27 15:52:30 2013 +0200
add log_logstash plugin to emit logstash json_event messages.
More information about the collectd-changes
mailing list