Code

collectd.git
8 years agoredis plugin: make sure buffer is null-terminated
Ruben Kerkhof [Sun, 29 Nov 2015 16:52:26 +0000 (17:52 +0100)]
redis plugin: make sure buffer is null-terminated

CID 37938

8 years agoMerge pull request #1384 from rubenk/irq-close-file-descriptor-on-failure
Ruben Kerkhof [Sun, 29 Nov 2015 12:35:12 +0000 (13:35 +0100)]
Merge pull request #1384 from rubenk/irq-close-file-descriptor-on-failure

irq plugin: close file descriptor on failure

8 years agoMerge pull request #1383 from rubenk/fhcount-close-file-descriptor-on-failure
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:56 +0000 (13:34 +0100)]
Merge pull request #1383 from rubenk/fhcount-close-file-descriptor-on-failure

fhcount plugin: close file descriptor on failure

8 years agoMerge pull request #1382 from rubenk/modbus-fix-resource-leaks
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:42 +0000 (13:34 +0100)]
Merge pull request #1382 from rubenk/modbus-fix-resource-leaks

modbus plugin: fix 2 leaks on error paths

8 years agoMerge pull request #1381 from rubenk/filecount-fix-resource-leak
Ruben Kerkhof [Sun, 29 Nov 2015 12:34:11 +0000 (13:34 +0100)]
Merge pull request #1381 from rubenk/filecount-fix-resource-leak

filecount plugin: fix leak on error path

8 years agoirq plugin: close file descriptor on failure
Ruben Kerkhof [Sat, 28 Nov 2015 22:17:59 +0000 (23:17 +0100)]
irq plugin: close file descriptor on failure

CID 38018

8 years agofhcount plugin: close file descriptor on failure
Ruben Kerkhof [Sat, 28 Nov 2015 22:15:24 +0000 (23:15 +0100)]
fhcount plugin: close file descriptor on failure

8 years agofilecount plugin: fix leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 22:13:01 +0000 (23:13 +0100)]
filecount plugin: fix leak on error path

8 years agomodbus plugin: fix 2 leaks on error paths
Ruben Kerkhof [Sat, 28 Nov 2015 22:07:31 +0000 (23:07 +0100)]
modbus plugin: fix 2 leaks on error paths

8 years agoMerge pull request #1380 from rubenk/csv-plug-leak-on-error-path
Ruben Kerkhof [Sat, 28 Nov 2015 20:44:05 +0000 (21:44 +0100)]
Merge pull request #1380 from rubenk/csv-plug-leak-on-error-path

Csv plug leak on error path

8 years agoMerge pull request #1379 from rubenk/ceph-close-fd-on-error
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:55 +0000 (21:43 +0100)]
Merge pull request #1379 from rubenk/ceph-close-fd-on-error

ceph plugin: close fd on error

8 years agoMerge pull request #1378 from rubenk/bind-dont-free-invalid-pointer
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:44 +0000 (21:43 +0100)]
Merge pull request #1378 from rubenk/bind-dont-free-invalid-pointer

bind: tmp doesn't point to start of allocated memory

8 years agoMerge pull request #1377 from rubenk/mqtt-fix-out-of-bounds-write
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:29 +0000 (21:43 +0100)]
Merge pull request #1377 from rubenk/mqtt-fix-out-of-bounds-write

mqtt: fix an out-of-bounds write

8 years agoMerge pull request #1376 from rubenk/amqp-fix-buffer-size
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:17 +0000 (21:43 +0100)]
Merge pull request #1376 from rubenk/amqp-fix-buffer-size

amqp: use the right buffer size for sstrncpy

8 years agoMerge pull request #1375 from rubenk/redis-unlock-lock
Ruben Kerkhof [Sat, 28 Nov 2015 20:43:02 +0000 (21:43 +0100)]
Merge pull request #1375 from rubenk/redis-unlock-lock

write_redis: don't return with lock held

8 years agoMerge pull request #1374 from rubenk/powerdns-fix-array-initialization
Ruben Kerkhof [Sat, 28 Nov 2015 20:42:50 +0000 (21:42 +0100)]
Merge pull request #1374 from rubenk/powerdns-fix-array-initialization

powerdns plugin: fix array initialization

8 years agocsv plugin: remove trailing whitespace
Ruben Kerkhof [Sat, 28 Nov 2015 19:21:16 +0000 (20:21 +0100)]
csv plugin: remove trailing whitespace

8 years agocsv plugin: plug memory leak on error
Ruben Kerkhof [Sat, 28 Nov 2015 19:19:26 +0000 (20:19 +0100)]
csv plugin: plug memory leak on error

CID 38015

8 years agoceph plugin: close fd on error
Ruben Kerkhof [Sat, 28 Nov 2015 19:07:03 +0000 (20:07 +0100)]
ceph plugin: close fd on error

8 years agobind: tmp doesn't point to start of allocated memory
Ruben Kerkhof [Sat, 28 Nov 2015 18:45:42 +0000 (19:45 +0100)]
bind: tmp doesn't point to start of allocated memory

8 years agomqtt: fix an out-of-bounds write
Ruben Kerkhof [Sat, 28 Nov 2015 17:59:17 +0000 (18:59 +0100)]
mqtt: fix an out-of-bounds write

CID 37990

8 years agoamqp: use the right buffer size for sstrncpy
Ruben Kerkhof [Sat, 28 Nov 2015 17:48:20 +0000 (18:48 +0100)]
amqp: use the right buffer size for sstrncpy

buffer is a char *, not an array, so size_of returns the size
of the pointer.

8 years agowrite_redis: don't return with lock held
Ruben Kerkhof [Sat, 28 Nov 2015 17:37:15 +0000 (18:37 +0100)]
write_redis: don't return with lock held

8 years agopowerdns plugin: fix array initialization
Ruben Kerkhof [Sat, 28 Nov 2015 17:30:58 +0000 (18:30 +0100)]
powerdns plugin: fix array initialization

8 years agoMerge pull request #1371 from rubenk/mqtt-plug-leak
Ruben Kerkhof [Sat, 28 Nov 2015 16:16:44 +0000 (17:16 +0100)]
Merge pull request #1371 from rubenk/mqtt-plug-leak

mqtt: plug leak on error path

8 years agoFix build with older version of libprotobuf-c
Ruben Kerkhof [Sat, 28 Nov 2015 13:54:54 +0000 (14:54 +0100)]
Fix build with older version of libprotobuf-c

8 years agoRevert "Set bugreport url and homepage url"
Ruben Kerkhof [Sat, 28 Nov 2015 13:07:29 +0000 (14:07 +0100)]
Revert "Set bugreport url and homepage url"

The net-snmp public headers are generated by autoconf
so they also define PACKAGE_URL (and lots more).

Apparently this is completely normal and documented at
http://www.net-snmp.org/tutorial/tutorial-5/toolkit/autoconf/index.html

This reverts commit e16e805eae42f911a6f9ab81420fcaf1a957810f.

8 years agoMerge pull request #1199 from rubenk/remove-gcrypt-exec-prefix-check
Ruben Kerkhof [Sat, 28 Nov 2015 12:33:02 +0000 (13:33 +0100)]
Merge pull request #1199 from rubenk/remove-gcrypt-exec-prefix-check

Remove gcrypt exec prefix check

8 years agoMerge pull request #1210 from rubenk/protoc
Ruben Kerkhof [Sat, 28 Nov 2015 12:32:24 +0000 (13:32 +0100)]
Merge pull request #1210 from rubenk/protoc

Protoc

8 years agomqtt: plug leak on error path
Ruben Kerkhof [Sat, 28 Nov 2015 12:29:08 +0000 (13:29 +0100)]
mqtt: plug leak on error path

8 years agoMerge pull request #958 from rubenk/fix-version-gen-sh
Ruben Kerkhof [Sat, 28 Nov 2015 12:25:10 +0000 (13:25 +0100)]
Merge pull request #958 from rubenk/fix-version-gen-sh

Only run git describe when we're in a git repo

8 years agoOnly run git describe when we're in a git repo
Ruben Kerkhof [Wed, 4 Mar 2015 13:54:52 +0000 (14:54 +0100)]
Only run git describe when we're in a git repo

This fixes an issue I see when extracting a collectd
tarball into another git repo (the Fedora collectd rpm one).
In that case version-gen.sh picked up the last tag from the Fedora
repo, which is the wrong one.

8 years agoMerge pull request #1219 from rubenk/version-gen
Ruben Kerkhof [Sat, 28 Nov 2015 12:17:38 +0000 (13:17 +0100)]
Merge pull request #1219 from rubenk/version-gen

Some more version-gen.sh tweaks

8 years agoMerge pull request #1220 from rubenk/set-package-bugreport-and-homepage
Ruben Kerkhof [Sat, 28 Nov 2015 12:15:44 +0000 (13:15 +0100)]
Merge pull request #1220 from rubenk/set-package-bugreport-and-homepage

Set bugreport url and homepage url

8 years agoprotoc: check for headers in new location as well
Ruben Kerkhof [Sun, 9 Aug 2015 17:05:25 +0000 (19:05 +0200)]
protoc: check for headers in new location as well

Newer versions of protobuf-c have their headers in
/usr/include/protobuf-c, and a symlink from
/usr/include/google/protobuf-c/.

These symlinks will eventually disappear however, so be prepared.

8 years agoprotoc: check for libprotobuf-c as well
Ruben Kerkhof [Sun, 9 Aug 2015 17:02:25 +0000 (19:02 +0200)]
protoc: check for libprotobuf-c as well

8 years agoprotoc: simplify configure check
Ruben Kerkhof [Sun, 9 Aug 2015 16:28:30 +0000 (18:28 +0200)]
protoc: simplify configure check

8 years agoprotoc: slightly nicer output in silent mode
Ruben Kerkhof [Sun, 9 Aug 2015 15:23:11 +0000 (17:23 +0200)]
protoc: slightly nicer output in silent mode

make[1]: Entering directory '/home/ruben/src/collectd/src'
  PROTOC-C     pinba.pb-c.c
  PROTOC-C     riemann.pb-c.c

8 years agoprotoc: log when compiler is missing
Ruben Kerkhof [Sun, 9 Aug 2015 15:02:33 +0000 (17:02 +0200)]
protoc: log when compiler is missing

In the case where we do have the required headers
but don't have the compiler, this makes it more clear
that we're missing the latter.

8 years agoSilence protoc-c in silence mode
Ruben Kerkhof [Sun, 9 Aug 2015 14:09:57 +0000 (16:09 +0200)]
Silence protoc-c in silence mode

Instead of showing the full command line, this shows:
  GEN      pinba.pb-c.c
  GEN      riemann.pb-c.c

8 years agowrite_riemann: only compile .proto files when enabled
Ruben Kerkhof [Sun, 9 Aug 2015 13:52:33 +0000 (15:52 +0200)]
write_riemann: only compile .proto files when enabled

If the write_riemann plugin is not enabled there's no
need to compile the protobuf files.

8 years agoPinba: only compile .proto files when enabled
Ruben Kerkhof [Sun, 9 Aug 2015 13:50:55 +0000 (15:50 +0200)]
Pinba: only compile .proto files when enabled

If the pinba plugin is not enabled there's no
need to compile the protobuf files.

8 years agoMerge remote-tracking branch 'github/pr/1366'
Florian Forster [Sat, 28 Nov 2015 06:56:14 +0000 (07:56 +0100)]
Merge remote-tracking branch 'github/pr/1366'

8 years agoTravis: switch to new Trusty environment
Ruben Kerkhof [Fri, 27 Nov 2015 16:01:15 +0000 (17:01 +0100)]
Travis: switch to new Trusty environment

https://docs.travis-ci.com/user/trusty-ci-environment

8 years agoMerge branch 'pr/1345'
Florian Forster [Fri, 27 Nov 2015 09:06:20 +0000 (10:06 +0100)]
Merge branch 'pr/1345'

8 years agomqtt plugin: Add TLS options to the example config and improve documentation.
Florian Forster [Fri, 27 Nov 2015 09:05:48 +0000 (10:05 +0100)]
mqtt plugin: Add TLS options to the example config and improve documentation.

8 years agomqtt plugin: Rename "TLSprotocol" to "TLSProtocol".
Florian Forster [Fri, 27 Nov 2015 09:04:35 +0000 (10:04 +0100)]
mqtt plugin: Rename "TLSprotocol" to "TLSProtocol".

8 years agomqtt plugin: Rename "CACertificateFile" to "CACert".
Florian Forster [Fri, 27 Nov 2015 09:03:54 +0000 (10:03 +0100)]
mqtt plugin: Rename "CACertificateFile" to "CACert".

This way the option name is consistent with the name used by the cURL
plugins.

Sorry for previous comments in #1345 that pushed towards copying Apache
HTTPd's naming schema -- being consistent within collectd is more
important.

8 years agoMerge commit 'refs/pull/1360/head' of github.com:collectd/collectd
Florian Forster [Fri, 27 Nov 2015 06:42:25 +0000 (07:42 +0100)]
Merge commit 'refs/pull/1360/head' of github.com:collectd/collectd

8 years agoMerge remote-tracking branch 'github/pr/1355'
Florian Forster [Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)]
Merge remote-tracking branch 'github/pr/1355'

8 years agoAllow MQTT payloads without NULL string termination
Nicholas Humfrey [Thu, 26 Nov 2015 20:29:30 +0000 (20:29 +0000)]
Allow MQTT payloads without NULL string termination

8 years agoMerge pull request #1163 from rubenk/fix-data-race-in-df-and-cgroup-plugins
Ruben Kerkhof [Thu, 26 Nov 2015 20:28:10 +0000 (21:28 +0100)]
Merge pull request #1163 from rubenk/fix-data-race-in-df-and-cgroup-plugins

utils_mount: use reentrant getmntent_r when we can

8 years agotable plugin: log_warn is better than log_err
fanyeren [Thu, 26 Nov 2015 13:50:24 +0000 (21:50 +0800)]
table plugin: log_warn is better than log_err

8 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 26 Nov 2015 13:22:28 +0000 (14:22 +0100)]
Merge branch 'collectd-5.5'

8 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

8 years agoc_avl_pick needs to update the 'size' field of the tree when it deletes
Corey Kosak [Wed, 25 Nov 2015 21:54:30 +0000 (16:54 -0500)]
c_avl_pick needs to update the 'size' field of the tree when it deletes
a node.

Signed-off-by: Florian Forster <octo@collectd.org>
8 years agoutils_avltree_test.c: Extend unit test to test c_avl_pick().
Florian Forster [Thu, 26 Nov 2015 13:13:17 +0000 (14:13 +0100)]
utils_avltree_test.c: Extend unit test to test c_avl_pick().

This demonstrates the bug that c_avl_pick() does not decrease the AVL
tree's size.

Issue: #1353

8 years agoRemove duplicate call to pthread_mutex_destroy.
Corey Kosak [Wed, 25 Nov 2015 22:03:47 +0000 (17:03 -0500)]
Remove duplicate call to pthread_mutex_destroy.

8 years agostatsd plugin: Correctly free metrics at shutdown.
Florian Forster [Wed, 25 Nov 2015 10:51:04 +0000 (11:51 +0100)]
statsd plugin: Correctly free metrics at shutdown.

The previous shutdown handler leaked "timer" and "set" metrics. This is
not a huge problem in itself, as the daemon is exiting shortly after
anyway, but it makes debugging of memory leaks very hard.

Issue: #997

8 years agoapache plugin: DRY: use macro to determine number of fields.
Florian Forster [Fri, 20 Nov 2015 10:01:38 +0000 (11:01 +0100)]
apache plugin: DRY: use macro to determine number of fields.

9 years agoAdd TLS support
Jan-Piet Mens [Tue, 17 Nov 2015 13:44:20 +0000 (14:44 +0100)]
Add TLS support
addresses #1265
protect for newer libmosquitto
address octo's comments

9 years agoapache: parse whole response, not only the first 16 lines
Marc Fournier [Sun, 15 Nov 2015 10:49:06 +0000 (11:49 +0100)]
apache: parse whole response, not only the first 16 lines

mod_status recently started reporting more statistics. According to
http://www.apache.org/dist/httpd/CHANGES_2.4 `mod_proxy, mod_ssl,
mod_cache_socache, mod_socache_*: Support machine readable server-status
produced when using the "?auto" query string.` for version 2.4.13
onwards.

As we can't assume everything we need will be included in the first 16
lines of output anymore, we now simply scan through the whole output.

9 years agoRemove POLLRDNORM (equivalent to POLLIN)
Tamás Földesi [Wed, 8 Jul 2015 15:02:14 +0000 (17:02 +0200)]
Remove POLLRDNORM (equivalent to POLLIN)

9 years agoChecking for closed peer connection before send
Tamás Földesi [Tue, 30 Jun 2015 17:06:28 +0000 (19:06 +0200)]
Checking for closed peer connection before send

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Sun, 8 Nov 2015 20:26:26 +0000 (21:26 +0100)]
Merge branch 'collectd-5.5'

9 years agoAdd utils_ignorelist back to daemon (#1323)
Benjamin Drung [Tue, 27 Oct 2015 09:23:46 +0000 (10:23 +0100)]
Add utils_ignorelist back to daemon (#1323)

commit 216c6246b73645ac093de15b87aedc9abc6ebc80 moves the collectd
daemon files into the src/daemon/ directory, but also silently drops
utils_ignorelist. Dropping utils_ignorelist from the daemon has the
drawback that it cannot be used by plugins any more and that 16 plugins
need to bundle ignorelist.

Thus add utils_ignorelist back to the collectd daemon.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sun, 8 Nov 2015 16:14:54 +0000 (17:14 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoFix clang complaining about extraneous parenthesis.
Nathan Ward [Thu, 29 Oct 2015 01:22:44 +0000 (14:22 +1300)]
Fix clang complaining about extraneous parenthesis.

9 years agoASN_GAUGE (SNMP-SMIv2 Gauge32) is unsigned, not signed.
Nathan Ward [Wed, 28 Oct 2015 12:46:29 +0000 (01:46 +1300)]
ASN_GAUGE (SNMP-SMIv2 Gauge32) is unsigned, not signed.

9 years agoStart write threads after plugin initialization.
Jan Andres [Wed, 21 Oct 2015 11:50:43 +0000 (13:50 +0200)]
Start write threads after plugin initialization.

Some plugins such as "network" create own threads from within their
init callbacks which can then start submitting data to the queue
right away, even if the read threads haven't been started yet.

If write threads are started before plugin initialization, this can
result in a race where a plugin's write callback gets called before
that plugin's init callback has completed.

To fix this, delay starting the write threads until after all plugins
have been initialized.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Pierre-Yves Ritschard [Fri, 6 Nov 2015 09:32:55 +0000 (10:32 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agostatsd: provide a gauge for counters, holding the absolute count.
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.

When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 6 Nov 2015 08:42:11 +0000 (09:42 +0100)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agobattery: add missing capacity type to types.db
Marc Fournier [Fri, 6 Nov 2015 08:32:40 +0000 (09:32 +0100)]
battery: add missing capacity type to types.db

For the record, "capacity" was introduced by a2e732f8.

Also fix a bogus example in collectd.conf.

Thanks to @ryan-williams for reporting the problem !

Fix #1338

9 years agoapcups: prefix plugin name in INFO and DEBUG statements
Sergey [Tue, 3 Nov 2015 06:19:50 +0000 (07:19 +0100)]
apcups: prefix plugin name in INFO and DEBUG statements

Fixes #1329

9 years agoMerge pull request #1311 from pyr/fix/1282
Pierre-Yves Ritschard [Mon, 2 Nov 2015 08:20:54 +0000 (09:20 +0100)]
Merge pull request #1311 from pyr/fix/1282

statsd: provide a gauge for counters, holding the absolute count.

9 years agoMerge pull request #1309 from baryonix/time_fix
Marc Fournier [Fri, 30 Oct 2015 21:33:19 +0000 (22:33 +0100)]
Merge pull request #1309 from baryonix/time_fix

Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.

9 years agowrite_redis plugin: Add support for StoreRates option
Brian Kelly [Thu, 30 Jul 2015 13:42:36 +0000 (09:42 -0400)]
write_redis plugin: Add support for StoreRates option

9 years agowrite_redis plugin: Improve ZREMRANGEBYRANK command debug message
Brian Kelly [Fri, 17 Jul 2015 13:22:27 +0000 (09:22 -0400)]
write_redis plugin: Improve ZREMRANGEBYRANK command debug message

9 years agowrite_redis plugin: Fix ZREMBYRANK command debug message
Brian Kelly [Fri, 17 Jul 2015 13:05:21 +0000 (09:05 -0400)]
write_redis plugin: Fix ZREMBYRANK command debug message

9 years agowrite_redis plugin: Add option to limit sorted set size
Brian Kelly [Wed, 15 Jul 2015 17:53:19 +0000 (13:53 -0400)]
write_redis plugin: Add option to limit sorted set size

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Tue, 27 Oct 2015 23:03:06 +0000 (00:03 +0100)]
Merge branch 'collectd-5.5'

9 years agowrite_redis: fix a few typos in manpage
Ruben Kerkhof [Tue, 28 Jul 2015 09:59:35 +0000 (11:59 +0200)]
write_redis: fix a few typos in manpage

Also correct the maximum length of the node name.
The callback name is "write_redis/%s" so the maximum
length of a node name is DATA_MAX_NAME_LEN - strlen("write_redis") -1.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 27 Oct 2015 22:39:38 +0000 (23:39 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agowrite_redis: remove unused variable from wr_write()
Marc Fournier [Tue, 27 Oct 2015 22:32:20 +0000 (23:32 +0100)]
write_redis: remove unused variable from wr_write()

9 years agowrite_redis plugin: Remove old zadd command formatting code that should not be there...
Brian Kelly [Wed, 15 Jul 2015 15:40:18 +0000 (11:40 -0400)]
write_redis plugin: Remove old zadd command formatting code that should not be there to fix sorted set key names

9 years agocollectd.conf.pod: correct a small typo
Marc Fournier [Fri, 23 Oct 2015 13:56:58 +0000 (15:56 +0200)]
collectd.conf.pod: correct a small typo

9 years agoFix a few typos in collectd-exec(5)
Douglas Thrift [Tue, 20 Oct 2015 23:19:02 +0000 (16:19 -0700)]
Fix a few typos in collectd-exec(5)

9 years agostatsd: provide a gauge for counters, holding the absolute count.
Pierre-Yves Ritschard [Mon, 19 Oct 2015 09:53:26 +0000 (11:53 +0200)]
statsd: provide a gauge for counters, holding the absolute count.

When not using StoreRates false, this allows statsd aggregators
to hold on to the absolute count, if needed.

9 years agoFix TIMESPEC_TO_CDTIME_T() on 32-bit arch.
Jan Andres [Sat, 17 Oct 2015 18:07:10 +0000 (20:07 +0200)]
Fix TIMESPEC_TO_CDTIME_T() on 32-bit arch.

Add ULL prefix to constant to ensure we get a 64-bit unsigned multiply.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 14 Oct 2015 07:10:50 +0000 (09:10 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoprocesses: correctly count processes on FreeBSD
Herve COMMOWICK [Wed, 14 Oct 2015 06:57:05 +0000 (08:57 +0200)]
processes: correctly count processes on FreeBSD

because actually we count threads instead of processes

(partial backport of 85c31a6d66 for collectd-5.4 /mf)

9 years agoFix 'Modification of a read-only value attempted' error
Ciaran Mac An Iomaire [Wed, 7 Oct 2015 15:20:20 +0000 (08:20 -0700)]
Fix 'Modification of a read-only value attempted' error

9 years agoprocesses: correctly count processes on {free,open}BSD
Herve COMMOWICK [Thu, 8 Oct 2015 09:41:45 +0000 (11:41 +0200)]
processes: correctly count processes on {free,open}BSD

because actually we count threads instead of processes

9 years agosystemd.collectd.service: backport changes from master branch
Marc Fournier [Wed, 14 Oct 2015 06:50:28 +0000 (08:50 +0200)]
systemd.collectd.service: backport changes from master branch

9 years agoMerge remote-tracking branch 'origin/pr/1264'
Marc Fournier [Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)]
Merge remote-tracking branch 'origin/pr/1264'

9 years agopython: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.

9 years agoMerge pull request #1289 from trenkel/master
trenkel [Wed, 7 Oct 2015 14:51:29 +0000 (16:51 +0200)]
Merge pull request #1289 from trenkel/master

python: Fix double-free bug.