collectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.
netapp plugin: Fix a syntax error in an error message.
Thanks to facade from IRC for the hint.
Thanks to facade from IRC for the hint.
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/exec.c
Conflicts:
src/exec.c
Exec plugin: Update copyright header.
configfile: cf_read_dir: Don't abort reading a directory when reading one file fails.
Processes plugin: Fix a minor typo.
Exec plugin: Add a missing folding marker.
Exec plugin: Set the "noreturn" attribute on the "exec_child" function.
Exec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.
libiptc: avoid strict-aliasing warnings
libiptc: avoid strict-aliasing warnings
In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
CC libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec@gmail.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
libiptc: avoid strict-aliasing warnings
In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
CC libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec@gmail.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge remote branch 'origin/collectd-4.8' into collectd-4.8
configure.in: Check for "htonll".
The first patch adds support to check if the htonl and htonll functions
(which are used in AIX port) are available in configure. Until now the
AIX port used these functions without perform any existence test.
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
The first patch adds support to check if the htonl and htonll functions
(which are used in AIX port) are available in configure. Until now the
AIX port used these functions without perform any existence test.
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
memcached plugin: Add hack for AIX compatibility.
The second one port memcached plugin to AIX. Since AIX don't have
MSG_DONTWAIT flag support, we use MSG_NONBLOCK... and we hope to work
fine ever :)
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
The second one port memcached plugin to AIX. Since AIX don't have
MSG_DONTWAIT flag support, we use MSG_NONBLOCK... and we hope to work
fine ever :)
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
oracle plugin: Fix semantics of OCIAttrGet.
Apparently it returns success if it could fetch the parameter value and
doesn't interpret the value itself. So returning NULL when querying for
OCI_ATTR_SERVER_STATUS does not result in an error. Handle this as a
lost connection.
Thanks to Sven for pointing this out :)
Apparently it returns success if it could fetch the parameter value and
doesn't interpret the value itself. So returning NULL when querying for
OCI_ATTR_SERVER_STATUS does not result in an error. Handle this as a
lost connection.
Thanks to Sven for pointing this out :)
.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.
His name was mis-spelled in one commit as Rodolphe Quiedeville*l*.
His name was mis-spelled in one commit as Rodolphe Quiedeville*l*.
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/ping.c
Conflicts:
src/ping.c
contrib/redhat/collectd.spec: Updated for version 4.9.
I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.
I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.
debian/: Removed ancient Debian package files.
You might want to look at git://git.tokkee.org/pkg-collectd.git instead.
You might want to look at git://git.tokkee.org/pkg-collectd.git instead.
configure.in: Fix three small typos.
Build system: Put Java class files into a .jar file.
Hi,
I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.
Same holds true for jmx class files as well (probably jmx.jar?).
I could work on this if everyone is okay with it.
Regards
Amit
Hi,
I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.
Same holds true for jmx class files as well (probably jmx.jar?).
I could work on this if everyone is okay with it.
Regards
Amit
src/utils_cmd_listval.c: Fix a memory leak.
Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.
Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.
Bugfix: correctly handle spurious wakeups in pthread_cond_timedwait
This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
src/utils_format_json.c: Use "isfinite" rather than "isinf".
Makes it a bit easier to read.
Makes it a bit easier to read.
src/collectd.h: Add fallback implementations of "isfinite" and "isinf".
utils_format_json: serialize nan and inf as null, as per JSON spec
I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.
[
{
"plugin": "memcached",
"interval": 10,
"host": "myhost",
"values": [
nan,
5
],
"time": 1265239180,
"plugin_instance": "",
"type_instance": "",
"type": "ps_count"
}
]
After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.
This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.
[
{
"plugin": "memcached",
"interval": 10,
"host": "myhost",
"values": [
nan,
5
],
"time": 1265239180,
"plugin_instance": "",
"type_instance": "",
"type": "ps_count"
}
]
After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.
This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ping plugin: Improved some error messages.
contextswitch plugin: Handle large counter/derive values correctly.
Using "strtoul" for derive_t values fails for large counter values.
Thanks to Martin Merkel for reporting this :)
Using "strtoul" for derive_t values fails for large counter values.
Thanks to Martin Merkel for reporting this :)
collectd{-python,.conf}(5): Fixed some typos.
Thanks to lintian(1) for catching those!
Thanks to lintian(1) for catching those!
collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.
Thanks to lintian(1) for catching (some of) those! :-)
Thanks to lintian(1) for catching (some of) those! :-)
apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.
Thanks to Gary (bug tracker) for pointing this out :)
Thanks to Gary (bug tracker) for pointing this out :)
contrib/collection.cgi: Added ability to hide specified types.
It is useful when you don't want to see many graphs. How to use the patch:
apply it to collection.cgi and add lines with keyword ,,dontshowtype'' to
/etc/collectd/collection.conf:
dontshowtype: "if_errors"
dontshowtype: "if_packets"
Then you will see only if_octets types in "interface" plugin page.
Via Debian bug #566199.
It is useful when you don't want to see many graphs. How to use the patch:
apply it to collection.cgi and add lines with keyword ,,dontshowtype'' to
/etc/collectd/collection.conf:
dontshowtype: "if_errors"
dontshowtype: "if_packets"
Then you will see only if_octets types in "interface" plugin page.
Via Debian bug #566199.
src/filter_chain.c: Make info-message more verbose.
Use Curl AnyAuth (digest+basic) instead of just digest
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
exec plugin: Improved some error messages.
contrib/exec-munin.px: Add GPLv2 header.
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Conflicts:
ChangeLog
ChangeLog: Added fix in the processes plugin.
processes plugin: Fix handling of the ps_disk_{octets,ops} types.
There values were stored in a `long', then `counter_t', then interpreted as
`derive_t'. Changed that to `derive_t' only. Hopefully this fixes a bug
reported by Mark Moseley.
There values were stored in a `long', then `counter_t', then interpreted as
`derive_t'. Changed that to `derive_t' only. Hopefully this fixes a bug
reported by Mark Moseley.
ChangeLog: Updated for version 4.9.1.
ChangeLog: Updated for version 4.8.3.
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
collectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.
collectd.conf(5): Remove trailing whitespace.
types.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.
Merge branch 'collectd-4.8' into collectd-4.9
Merge branch 'collectd-4.7' into collectd-4.8
bindings/perl/lib/Collectd.pm: Add forgotten "config" callback type.
Thanks to "ntenev" for reporting the issue.
Thanks to "ntenev" for reporting the issue.
Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
Merge branch 'collectd-4.8' into collectd-4.9
rrdtool plugin: Correctly initialize the ->random_variation member.
This lead to huge negative values in that member, causing values to be only
written to upon exit. D'oh!
This lead to huge negative values in that member, causing values to be only
written to upon exit. D'oh!
14 years agoapache plugin: Fix a segmentation fault in the config handling of VerifyPeer / Verify...
apache plugin: Fix a segmentation fault in the config handling of VerifyPeer / VerifyHost.
Hello,
Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
the new version segfaults immediately at startup. With some help from gdb
I tracked down the problem to the apache module. It will occur if one
tries to use the VerifyPeer/VerifyHost options (I guess few people use
these as I don't see complaints?)
When the plugin attempts to read the value of a boolean option, instead of
using the pre-parsed int value, it misdetects the type of the option
(seems a mechanical mistake) and tries to use the string pointer, which is
actually NULL.
I'm sending a patch, it's actually shorter than the description ;)
Thanks to all developers and maintainers of collectd for working on it.
Have a nice holidays.
Hello,
Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
the new version segfaults immediately at startup. With some help from gdb
I tracked down the problem to the apache module. It will occur if one
tries to use the VerifyPeer/VerifyHost options (I guess few people use
these as I don't see complaints?)
When the plugin attempts to read the value of a boolean option, instead of
using the pre-parsed int value, it misdetects the type of the option
(seems a mechanical mistake) and tries to use the string pointer, which is
actually NULL.
I'm sending a patch, it's actually shorter than the description ;)
Thanks to all developers and maintainers of collectd for working on it.
Have a nice holidays.
Monitorus.pm: Put the plugin into the "Collectd::Plugins" namespace.
… rather than "Collectd::Plugin".
… rather than "Collectd::Plugin".
bindings/Makefile: Added Monitorus.pm to EXTRA_DIST.
src/collectd.conf: Added missing plugins and config options.
collectd.conf: Added "LoadPlugin Monitorus/OpenVZ" in the "perl" config.
README: Added missing plugins.
src/collectd.conf.in: Added an example config for the python plugin.
src/collectd.conf.in: Added an example config for the netapp plugin.
src/collectd.conf.in: Add example config for the routeros plugin.
routeros plugin: Use the node name for the "host" field.
Using hostname_g doesn't make much sense when you can define multiple routers,
so this is a bug because it doesn't allow specifying multiple routers as documented.
Using hostname_g doesn't make much sense when you can define multiple routers,
so this is a bug because it doesn't allow specifying multiple routers as documented.
contrib/snmp-probe-host.px: Implemented the “--exclude” option.
collectd-snmp(5): Comma fixes.
Annoying signal documentation.
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Bumped version to 4.8.2; Updated ChangeLog.
Merge branch 'collectd-4.7' into collectd-4.8
Network plugin license change with Aman Gupta's permission.
Conflicts:
ChangeLog
version-gen.sh
Network plugin license change with Aman Gupta's permission.
Conflicts:
ChangeLog
version-gen.sh
Bumped version to 4.7.5; Updated ChangeLog.
src/plugin.c: plugin_log: Print to stderr if no log plugin has been loaded.
network plugin: Change the license to LGPL 2.1.
This is done with Amit Gupta's consent. He did write changes for later versions
of the plugin.
This is done with Amit Gupta's consent. He did write changes for later versions
of the plugin.
oracle plugin: Check the connection status and reconnect if required.
Merge branch 'collectd-4.8' into collectd-4.9
ping plugin: Add MaxMissed option.
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.7' into collectd-4.8
Fixed refcount error.
memory plugin: Fixed handling of >4G of memory on Mac OS X.
contrib/collection3: Add Regexp::Common to the README.
configure: Fixed copy&paste error in --with-libupsclient.
Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
curl, df and processes plugins: Updated copyright information.
collectd.conf(5): If “MeasureResponseTime” is enabled, Match blocks are optional.
collectd.conf.in: Added the Report{Reserved,Inodes} options to the df plugin.
collectd-python(5): Remove trailing whitespace.
Collectd.pm: Improved some debug messages.
Also, this fixes a "use of uninitialized" warning.
Also, this fixes a "use of uninitialized" warning.
NetApp documentation of tested filers.
netapp: Better error messages.
hashed match: Fix only-C90 compiler warning.
Apparently 2184401929 is bigger than a signed int or something …
Apparently 2184401929 is bigger than a signed int or something …
ping plugin: Cleanup used variable names.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ChangeLog: Fix a typo.
ChangeLog: Added changes for 4.9.0.
Merge branch 'collectd-4.8'
Merge branch 'collectd-4.7' into collectd-4.8
hashed match: Use a different (larger) prime number.
The previous prime number, 251, did not distribute good enough into
three groups.
The previous prime number, 251, did not distribute good enough into
three groups.
openvz plugin: Remove `type' as first argument of `plugin_dispatch_values'.
monitorus plugin: Updated for the new API.
`type' is now part of the value list.
`type' is now part of the value list.
monitorus plugin: Removed the log function.
src/plugin.c: Warn if plugin_register_*() overwrites an existing callback.
src/plugin.c: Fixed a function name in an error message.
utils_heap: Fixed a typo: c_head_get_root() -> c_heap_get_root().
;-)
;-)
ping plugin: Added "SourceAddress" and "Device" configuration options.
As the name suggests, these options may be used to set the source address and
the outgoing device for ICMP_ECHO requests, just like oping's -I and -D
options.
As the name suggests, these options may be used to set the source address and
the outgoing device for ICMP_ECHO requests, just like oping's -I and -D
options.