Merge pull request #1076 from schuellerf/master
Update smart.c
Update smart.c
Update smart.c
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
src/daemon/configfile.c: Remove unnecessary "continue" statements.
Merge remote-tracking branch 'github/pr/1067'
plugin: not return -1 if plugin_flush_callback_name fails
Do not call plugin_unregister if the read registration fails.
plugin: fix white space.
plugin: remove cast type information from malloc.
plugin: move the code to create flush/name to plugin_flush_callback_name
apcups plugin: Implement the "PersistentConnection" option.
If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.
Fixes: #617
If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.
Fixes: #617
apcups plugin: Handle "END APC" lines correctly and stop reading.
Fixes: #617
Fixes: #617
apcups plugin: Fight code rot.
* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.
* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.
Support for call the flush callback at regular intervals using
the read plugin callback.
the read plugin callback.
varnish: update plugin_register_complex_read() to new default value
... just a follow up to cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
... just a follow up to cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
processes: revert re-introduction of ps_read_tasks
This commit partially revert 30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
This commit partially revert 30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
src/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex read".
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
Merge remote-tracking branch 'github/pr/1036'
Conflicts:
src/processes.c
Conflicts:
src/processes.c
Merge branch 'pr/1033'
processes plugin: Read number of threads from /proc/$pid/stat as a fallback.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
Remove old systemd unit
collectd.service superseded by systemd.collectd.service
collectd.service superseded by systemd.collectd.service
Merge remote-tracking branch 'github/pr/1056'
Plugin network: add support for the timeout argument in the flush callback
processes: change type to contextswitch and types to derive_t
processes: use cf_util_get_boolean for get "CollectContextSwitch"
processes: delete added white spaces
processes: rename ps_ctx_switch to report_ctx_switch
processes: remove function ps_read_tasks
Processes: fix types in ps_read_status, change to unsigned long.
Processes: in ps_read_status fix check to skip lines
if it doesn't start with "Vm" and it doesn't start "Threads".
if it doesn't start with "Vm" and it doesn't start "Threads".
zone: add mentions to README and AUTHORS files
RPM specfile: handle new zone plugin
Merge remote-tracking branch 'github/pr/1054'
Make flow more obvious
Add myself
No busy looping around open()
Use sizeof() instead of duplicating the variable length
Handle case when zone_scandir() returns NULL
Return -1 in zone_read on error
Get pagesize only once during initialization
Handle case when zone_find_stats() returns NULL
Use ZONENAME_MAX and handle errors returned by getzonenamebyid()
Prefix all warnings and error messages with plugin name
Use (void *) in c_avl_create()
Use type 'percent' instead of 'zone_cpu'
update changelog + bump release dates
Build system: Fix linking with libheap.la and depend on testing.h.
collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
Build system: Build tested units as libraries.
This simplifies the build rules for the tests, aka. check programs.
* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
other directories.
Fixes: #1042
This simplifies the build rules for the tests, aka. check programs.
* test_foo.c have been renamed to foo_test.c.
* foo_test.c now reside right next to foo.c and foo.h.
* Build and refer to .la files, rather than depending on .c files from
other directories.
Fixes: #1042
write_redis: Replaced method for checking for a NULL value for the redis connection
write_redis: Log error message from redis command failures
write_redis: improve checking the redis connection
Filterchain: if we don't find a writer, output the available writers to syslog.
bindings/java/Makefile.am: Add "uninstall-local" target.
Otherwise "make distcheck" will complain about leftover files.
Otherwise "make distcheck" will complain about leftover files.
bindings/java/Makefile.am: Use $(srcdir) when specifying dependencies.
This fixes out-of-tree builds, like "make distcheck" does.
This fixes out-of-tree builds, like "make distcheck" does.
ChangeLog: Update date to 2015-05-22.
write_sensu, write_tsdb plugins: Use GAUGE_FORMAT.
Issue #1039
Issue #1039
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/write_redis.c
Conflicts:
src/write_redis.c
write_redis: Fix timestamp sent to Redis.
Various plugins: Use the global GAUGE_FORMAT.
This fixes the postgresql, rrdtool, target_notification, write_graphite and
write_redis plugins to use the globally defined format for gauges.
Issue #1039
This fixes the postgresql, rrdtool, target_notification, write_graphite and
write_redis plugins to use the globally defined format for gauges.
Issue #1039
src/collectd.h: Define GAUGE_FORMAT.
This format is also used in format_values(), so exported gauges follow a common
format.
See also issue #1039
This format is also used in format_values(), so exported gauges follow a common
format.
See also issue #1039
src/utils_format_json.[ch]: Export gauges with 15 decimal places of precision.
Fixes: #1039
Fixes: #1039
ChangeLog: Import changes from the wiki.
RPM specfile: fix changelog formatting
RPM specfile: also bump release number
RPM specfile: update changelog for 5.5
Plugin process: collect voluntary and involuntary context switches.
contrib/wiki2changelog.pl: Add script converting from wiki to ChangeLog.
ChangeLog: Change text width to 80 characters.
Bump version to 5.5.0; Update ChangeLog.
ipc plugin: Group functions by operating system.
Plugin process: in Linux read the number of threads from
/proc/pid/status instead of counter the number of files in
/proc/pid/task/*.
/proc/pid/status instead of counter the number of files in
/proc/pid/task/*.
Merge branch 'collectd-5.4'
Merge branch 'collectd-5.3' into collectd-5.4
Merge branch 'collectd-4.10' into collectd-5.3
curl_xml: fix 3 small memory leaks
Discovered while testing the previous 2 commits. NB: valgrind
already complained about these before 0afea606 was applied, so this
isn't related to issue #935.
Discovered while testing the previous 2 commits. NB: valgrind
already complained about these before 0afea606 was applied, so this
isn't related to issue #935.
Fix test for tables and empty instance
Change-Id: I9a3fc3ded9566bd68c80e5fbce2d8b717ea1848d
Change-Id: I9a3fc3ded9566bd68c80e5fbce2d8b717ea1848d
Revert "curl_xml plugin: Fixed tautological pointer comparison error."
Fixes #931
This reverts commit 0afea60611f115a28b8ec331aba610e3038c1ef2.
Fixes #931
This reverts commit 0afea60611f115a28b8ec331aba610e3038c1ef2.
Enable the processes plugin by default on Solaris.
It now builds and works correctly in both 32-bit and 64-bit mode.
It now builds and works correctly in both 32-bit and 64-bit mode.
processes: Solaris: Consistently use long to represent a pid
pid_t may be defined as an int or a long depending on circumstances.
Use a long everywhere so we don't have to fiddle with typecasts.
This fixes an issue where an incorrect printf format string would
be used for a pid_t in 32-bit builds.
pid_t may be defined as an int or a long depending on circumstances.
Use a long everywhere so we don't have to fiddle with typecasts.
This fixes an issue where an incorrect printf format string would
be used for a pid_t in 32-bit builds.
processes: Fix build for Solaris 32-bit binary
Work around a #error in <sys/procfs.h> that occurs when building a
32-bit binary with _FILE_OFFSET_BITS=64. This uses a hack similar
to the one in swap.c.
Work around a #error in <sys/procfs.h> that occurs when building a
32-bit binary with _FILE_OFFSET_BITS=64. This uses a hack similar
to the one in swap.c.
processes: Fix ps_get_cmdline() on Solaris.
Return value of read_file_contents() was checked incorrectly.
Return value of read_file_contents() was checked incorrectly.
zfs_arc: Don't spam the log if we fail to read the "l2_size" kstat value.
The value got lost with some patch to Solaris 10 and has only reappeared
recently in 11.2. If we ever fail to read this value, stop trying, so we
don't report an error on every interval.
The value got lost with some patch to Solaris 10 and has only reappeared
recently in 11.2. If we ever fail to read this value, stop trying, so we
don't report an error on every interval.
oconfig: fix oconfig_free to free all elements
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
Merge remote-tracking branch 'github/pr/1009'
Adding fhcount plugin
README: add mention to libcap
Merge remote-tracking branch 'origin/pr/651'
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
Merge pull request #919 from baryonix/solaris-misc-fixes
Fixes for zfs_arc and processes plugins on Solaris
Fixes for zfs_arc and processes plugins on Solaris
Merge pull request #1023 from ciomaire/write_kafka_ldflags
when --with-librdkafka arg is not a path searched by linker
when --with-librdkafka arg is not a path searched by linker
Turbostat: Use the 'count' gauge to count SMIs
Merge remote-tracking branch 'github/pr/1027'
libcollectdclient: Propagate errors when signing / encrypting network packets.
Zone support for Solaris, forward-port of https://mail-archive.com/collectd@verplant.org/msg01232.html
oconfig: fix oconfig_free to free all elements
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.
Merge branch 'collectd-5.4'
Merge branch 'collectd-5.3' into collectd-5.4
/bin/sh on OSX doesn't understand -n
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
Merge pull request #1024 from rubenk/fix-version-gen-on-osx
/bin/sh on OSX doesn't understand -n
/bin/sh on OSX doesn't understand -n
Merge pull request #1016 from mfournier/write_sensu-format-string
write_sensu: fix format-string portability problem
write_sensu: fix format-string portability problem
/bin/sh on OSX doesn't understand -n
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead
This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead