Bump version to 4.10.2; Update ChangeLog.
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
Bump version to 4.9.4; Update ChangeLog.
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
netapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented collecting SIS data
swap plugin: Fix a bug collecting swap I/O.
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Fixed RedHat init script to shut down collectd on reboot/halt.
collectd.conf(5): Document the dangers of messing with the interval setting.
processes plugin: Don't complain about a failed open(/proc/$PID/cmdline)
... if the error is ENOENT. This merely means we were too slow and that
we can safely ignore the process.
... if the error is ENOENT. This merely means we were too slow and that
we can safely ignore the process.
src/utils_rrdcreate.c: Remove a too strict assertion.
We don't actually check anywhere that vl->time is greater than 10, so we
cannot assure this.
We don't actually check anywhere that vl->time is greater than 10, so we
cannot assure this.
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/collectd.conf.in
src/python.c
Conflicts:
src/collectd.conf.in
src/python.c
README: Add libperfstat as an optional dependency.
netapp plugin: Fixed a bug that prevented the configured interval to be passed on to the dispatch function.
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
Fixed epic documentation fail. Python3 and meta-data support was added with 4.10 but is still listed as missing.
Add sys.argv. Not too many programs consider the possibility that it might not exist resulting in unhandled exceptions.
Fixed possible memory leak in case of broken match_value configs.
src/types.db: Remove unused type "pinba_view".
src/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".
curl_json plugin: Restore struct when handling error.
src/collectd.h: Do not include <sensors/sensors.h> here.
Fix errno thread-safety under AIX
Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.
This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.
Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...
Here is the relevant part of /usr/include/errno.h on AIX:
#if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
/*
* Per thread errno is provided by the threads provider. Both the extern
* int
* and the per thread value must be maintained by the threads library.
*/
extern int *_Errno( void );
#define errno (*_Errno())
#else
extern int errno;
#endif /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.
This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.
Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...
Here is the relevant part of /usr/include/errno.h on AIX:
#if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
/*
* Per thread errno is provided by the threads provider. Both the extern
* int
* and the per thread value must be maintained by the threads library.
*/
extern int *_Errno( void );
#define errno (*_Errno())
#else
extern int errno;
#endif /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
collection3: Add graph for "ps_disk_octets".
notify_email plugin: Check for "session == NULL" and return gracefully.
I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.
I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.
notify_email plugin: Serialize all accesses to libesmtp using a mutex.
collection3: fix multiple hosts selection issue
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
network plugin: Use the complain mechanism to inform the user about ignored signatures.
src/utils_tail: Remove newline characters at the end of a line.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
utils_match: Let '^' and '$' affect lines rather than the full string.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Thanks to Renaud Chaput for pointing this out!
Thanks to Renaud Chaput for pointing this out!
Merge branch 'collectd-4.9' into collectd-4.10
src/utils_heap.c: Fix calculation of the parent's index.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
Merge branch 'collectd-4.9' into collectd-4.10
src/plugin.c: Improve an info message.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.
src/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
src/configfile.c: Continue parsing config files if stat'ing one file fails.
curl json: Fix checking the response code.
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Was calling sys.stderror instead of sys.stderr.
curl_json plugin: Use a more descriptive define as return value.
collectd-perl(5): Mention that "Globals" should be enabled.
collectd.conf(5): Documents LoadPlugin's "Globals" option.
curl_json plugin: Use the "number" callback of libyajl.
The "integer" callback only works with "long"s, which are 32bit on
x86 and other 32bit architectures. The "number" callback gets the raw
string for us to parse ourselves – honoring the data source type in the
process.
The "integer" and "double" callbacks have been removed, since they are not
used if the "number" callback is present.
The "integer" callback only works with "long"s, which are 32bit on
x86 and other 32bit architectures. The "number" callback gets the raw
string for us to parse ourselves – honoring the data source type in the
process.
The "integer" and "double" callbacks have been removed, since they are not
used if the "number" callback is present.
Bumped version to 4.10.1; Updated ChangeLog.
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
ChangeLog: Fix the release date for 4.9.3.
Bumped version to 4.9.3; Updated ChangeLog.
src/plugin.c: Check "read_loop" when returning from "pthread_cond_timedwait".
Otherwise it may take up to $Interval seconds until all read threads
shut down. This bug was introduced in version 4.8.4 (commit dbe1a7d).
Otherwise it may take up to $Interval seconds until all read threads
shut down. This bug was introduced in version 4.8.4 (commit dbe1a7d).
Remove usage of obsoleted XSI extensions wrt. the "test" command.
Fix usage of Solaris /usr/bin/echo
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
df plugin: Remove the complaint code again.
Calls to the plugin are delayed when an error is returned anyway, so it's
better to have an error message in addition to the "has failed, will suspend"
message generated in src/plugin.c.
Calls to the plugin are delayed when an error is returned anyway, so it's
better to have an error message in addition to the "has failed, will suspend"
message generated in src/plugin.c.
df plugin: Report an error if "cu_mount_getlist" fails.
collection3: df_complex graph: Add "reserved" space.
collection3: Add Windows data sources to the "memory" graph.
collection3: Add graphs for "bitrate", "signal_power", "signal_quality", and "snr".
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
src/common.h: Add some documentation for "strtoderive".
swap plugin: Use "strtoderive" to parse strings.
bindings/java/Makefile.am: Fix rebuilding of Java plugins.
python plugin: Switch back to calling the type object to create a new object like in collectd-4.9.
PyObject_New should not be used.
This should fix a compile problem with some versions of Python.
PyObject_New should not be used.
This should fix a compile problem with some versions of Python.
Merge branch 'collectd-4.9' into collectd-4.10
bind plugin: Fix building with --enable-standards.
Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9
contrib/GenericJMX.conf: Use the "jmx_memory" type.
collectd.conf(5): Fixed some typos.
Thanks to lintian for reporting one of them ;-)
Thanks to lintian for reporting one of them ;-)
collectd2html.pl: Further improvements to the XHTML support.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
collectd2html.pl: Produce XHTML output.
… as requested in Debian bug #575029.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
… as requested in Debian bug #575029.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
collectd2html: Fixed recursive mode.
Also, improved default settings to match the collectd4 series.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Also, improved default settings to match the collectd4 series.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
powerdns plugin: Fixed communication when talking to pdns 2.9.22.
powerdns version 2.9.22 (and above) require a newline at the end of
commands sent to the server.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
powerdns version 2.9.22 (and above) require a newline at the end of
commands sent to the server.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
collectd.conf.in: Added further sample config options.
collectd.conf.in: Added a sample config for the “modbus” plugin.
… copied from the plugin sources.
… copied from the plugin sources.
collectd.conf(5): Added documentation for the pinba plugin.
snmp.c: compilation fixes for AIX
The C and C++ standards allows the character type char to be signed or
unsigned, depending on the platform and compiler. Most systems,
including x86 GNU/Linux and Microsoft Windows, use signed char, but
those based on PowerPC and ARM processors typically use unsigned char.
This patch fixes a "comparison is always true" warning on AIX (powerpc)
which leads the compilation to abort because of the -Werror flag.
Being unsigned by default, a char is always >0.
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The C and C++ standards allows the character type char to be signed or
unsigned, depending on the platform and compiler. Most systems,
including x86 GNU/Linux and Microsoft Windows, use signed char, but
those based on PowerPC and ARM processors typically use unsigned char.
This patch fixes a "comparison is always true" warning on AIX (powerpc)
which leads the compilation to abort because of the -Werror flag.
Being unsigned by default, a char is always >0.
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
processes.c: fix uninitialized variables warnings
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Bugfix for libcollectdclient lcc_putval.
Hello,
I'm using collectd to monitor system and process parameters of our code under
test running on a cluster. The test processes communicate to collectd via the
unixsock plugin, but there was a small error in the client library which I had
to fix first.
The wire format of the putval command is missing a space behind the closing
double quote of the identifier. As I said, it is a small fix, but nevertheless
I attached the patch for client.c. The bug is present in 4.6 (that is the
version I'm using in production), but I fixed it against 4.10.0.
Cheers,
Johan
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Hello,
I'm using collectd to monitor system and process parameters of our code under
test running on a cluster. The test processes communicate to collectd via the
unixsock plugin, but there was a small error in the client library which I had
to fix first.
The wire format of the putval command is missing a space behind the closing
double quote of the identifier. As I said, it is a small fix, but nevertheless
I attached the patch for client.c. The bug is present in 4.6 (that is the
version I'm using in production), but I fixed it against 4.10.0.
Cheers,
Johan
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
snmp plugin: csnmp_value_list_to_value: Include the OID in the log message.
snmp plugin: Don't print a warning if the ASN type is "ASN_NULL".
Thanks to "Flyinvap" for pointing this out.
Thanks to "Flyinvap" for pointing this out.
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/python.c
Conflicts:
src/python.c
Merge remote branch 'origin/collectd-4.9' into collectd-4.9
configure.in: htonll check depends on linker
Fixing a cross-compile issue by depending only on a linker check.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Fixing a cross-compile issue by depending only on a linker check.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
python: Fixed some memory leaks in the write and notification callbacks.
Thanks to Volkmar Uhlig for the hint.
Thanks to Volkmar Uhlig for the hint.
python: Fixed a crash if the plugin was loaded but not configured.
src/Makefile.am: Fix building / packaging without the Pinba plugin.
Getting the dependency right on generated sources wasn't quite as easy as I
hoped.
Getting the dependency right on generated sources wasn't quite as easy as I
hoped.
collectd-python(5): Fix POD syntax error.
rrdtool plugin: Degrade a less than helpful warning to a debug message.
python plugin: Disable strict aliasing.
"Py_True" and "Py_False" have some weird implementation that GCC can't cope
with. Disable strict aliasing (and warnings relating to it) in order to avoid
those problems at the cost of optimization.
"Py_True" and "Py_False" have some weird implementation that GCC can't cope
with. Disable strict aliasing (and warnings relating to it) in order to avoid
those problems at the cost of optimization.
python plugin: Remove "const" of usage strings.
The struct member isn't const, resulting in a warning.
The struct member isn't const, resulting in a warning.
ChangeLog: Add attribution for the Pinba plugin.
src/Makefile.am: Fix build-dependencies for the pinba plugin.
Using BUILT_SOURCES, pinba.pb-c.[ch] are built *before* the regular
build step.
Using BUILT_SOURCES, pinba.pb-c.[ch] are built *before* the regular
build step.
version-gen.sh: Bump version to 4.10.0.
Merge remote branch 'powdahound/master'
Merge branch 'collectd-4.9'
Merge branch 'collectd-4.8' into collectd-4.9
ChangeLog: Add the pinba plugin.
README: Added the pinba plugin and its dependency.
AUTHORS: Added "Phoenix Kayo".
Merge branch 'ka/pinba'