src/types.db: Remove the "mysql_qcache" and "mysql_threads" types.
Use the "v5upgrade" taret to preserve compatibility.
Use the "v5upgrade" taret to preserve compatibility.
Merge branch 'collectd-4.10'
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.
collectd-nagios: Remove forgotten commend.
collectd-nagios: Remove unnecessary includes.
The UNIX socket is now handled in the library, no need for including
those files anymore.
The UNIX socket is now handled in the library, no need for including
those files anymore.
collectdctl: Reorder includes and set strict C99/POSIX mode.
This enables NAN on some systems, e.g. old Linux boxes.
This enables NAN on some systems, e.g. old Linux boxes.
collectdctl: Fix comparison with uninitialized variable.
collectdctl: Fix problems with strict aliasing.
Merge branch 'collectd-4.10'
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.
Merge branch 'ad/redis'
Merge branch 'ff/redis' into ad/redis
write_redis plugin: Add all identifiers to a "set".
This should make it easy for front-ends to discover available metrics.
This should make it easy for front-ends to discover available metrics.
write_redis plugin: Use an "append" macro to fill the values buffer.
This way we don't have to copy the entire buffer, which is hopefully
faster.
This way we don't have to copy the entire buffer, which is hopefully
faster.
write_redis plugin: Fix copyright information.
redis plugin: Add default configuration.
redis plugin: Improve the types used for storing information.
redis plugin: Use a linked list rather than an AVL tree.
Since the main purpose of the data structure is to iterate over it, using
an AVL tree here is less efficient than a linked list. Also, it's easier
to read.
Since the main purpose of the data structure is to iterate over it, using
an AVL tree here is less efficient than a linked list. Also, it's easier
to read.
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.
src/utils_db_query.[ch]: Remove legacy code.
The "legacy mode" supported an old configuration schema of the
PostgreSQL plugin. This commit removes it, so only the recommended
configuration remains possible.
The "legacy mode" supported an old configuration schema of the
PostgreSQL plugin. This commit removes it, so only the recommended
configuration remains possible.
write_redis plugin: Add a new plugin writing collectd data to an instance of Redis.
collectd.conf(5): Improve the "Redis plugin" documentation a bit.
configure.in: Reorder the library checks alphabetically.
redis plugin: Simplify configuration handling.
Fix a number of minor bugs.
- The Port configuration option is a string, not a number. Fix
documentation.
- Fix a bad status assignement in port parser.
- Remove default node. Now node is mandatory to prevent
duplicates in tree.
- Update configuration example too.
- The Port configuration option is a string, not a number. Fix
documentation.
- Fix a bad status assignement in port parser.
- Remove default node. Now node is mandatory to prevent
duplicates in tree.
- Update configuration example too.
14 years agocollectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit archit...
collectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit architectures.
collectdctl: Added support for ‘U’ (undef) values in ‘putval’.
libcollectdclient: Fixed handling of ‘U’ (undef) in ‘PUTVAL’.
collectdctl: Improved error reporting.
collectdctl: Added support for the ‘putval’ command.
libcollectdclient: Added missing element to LCC_VALUE_LIST_INIT.
collectdctl: Moved examples section from help output to manpage.
collectdctl: ‘flush’ now supports multiple plugins/identifiers.
… just like the ‘unixsock’ plugin does.
… just like the ‘unixsock’ plugin does.
collectdctl(1): Updated the manpage according to the latest changes.
collectdctl: Improved error reporting.
collectdctl: Added ‘listval’ command.
Renamed ‘collectd-flush’ to ‘collectdctl’ (collectd control interface).
collectd-flush: Added ‘getval’ to the help output.
collectd-flush: Added support for the ‘getval’ command.
collectd-flush: Moved connection handling out of ‘flush()’.
collectd-flush: Switched to a command based syntax.
Basically, the command line now looks similar to the ‘unixsock’ text protocol,
i.e., a command is specified as first non-option argument followed by any
options of that command as defined by the protocol.
Basically, the command line now looks similar to the ‘unixsock’ text protocol,
i.e., a command is specified as first non-option argument followed by any
options of that command as defined by the protocol.
curl json: Fix checking the response code.
src/Makefile: Build and ship (in the tarball) the collectd-flush manpage.
collectd-flush: Include version and author information in usage output.
Just like the other tools.
Just like the other tools.
collectd-flush: Determine default socket from configured localstatedir.
collectd-flush: Do not use ‘getopt_long()’.
This is a GNU extension and, thus, not portable.
Also, pimped the usage output a bit.
This is a GNU extension and, thus, not portable.
Also, pimped the usage output a bit.
collectd-flush: Simplified ‘usage()’ a bit.
src/utils_cmd_putval.[ch]: Implement "create_putval".
write_http plugin: Move "wh_value_list_to_string" to src/common.[ch].
collectd-flush: Minor coding style changes.
collectd-flush: Add a missing "break" in a "switch" case.
Update Makefile.am to build collectd-flush
As I am no automake expert, I basically copied
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
As I am no automake expert, I basically copied
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Add collectd-flush command line utility.
collectd-flush is a small command-line utility which uses libcollectdclient
to flush collectd through the unixsock plugin. As far as I know, there is
no easy way to work with unix sockets from the shell, so if someone
wanted to flush collectd without this program, they would need to do it
through some other language (or restart the deamon).
I am no C wizard, so please bear with me if I have
done something a stupid way. :)
The code is based on/inspired by collectd-nagios.
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
collectd-flush is a small command-line utility which uses libcollectdclient
to flush collectd through the unixsock plugin. As far as I know, there is
no easy way to work with unix sockets from the shell, so if someone
wanted to flush collectd without this program, they would need to do it
through some other language (or restart the deamon).
I am no C wizard, so please bear with me if I have
done something a stupid way. :)
The code is based on/inspired by collectd-nagios.
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Was calling sys.stderror instead of sys.stderr.
redis plugin: Use "sizeof" rather than repeating the size.
curl_json plugin: Use a more descriptive define as return value.
redis plugin: Whitespace fixes.
I've re-indented the entire plugin because indentation was all over the
place. Sorry, if this breaks any patches for you. I'm not usually a
friend of doing this, but I felt it'd be best to do this early on to
annoy the smallest possible number of people.
I've re-indented the entire plugin because indentation was all over the
place. Sorry, if this breaks any patches for you. I'm not usually a
friend of doing this, but I felt it'd be best to do this early on to
annoy the smallest possible number of people.
redis plugin: Fix typos preventing a successful build.
Add redis plugin.
This commit adds a new redis plugin, which connect to a number of redis
server and get information about their status, using the libcredis > 0.2.2
library. The plugin get the following information:
* bgsave_in_progress
* change_since_last_save
* connected_clients
* connected_slaves
* total_command_processed
* total_connection_received
* uptime_in_seconds
* used_memory
Here is an example of configuration file:
<Plugin redis>
<Node example>
Host "localhost"
Timeout 2000
</Node>
</Plugin>
And the output of rrdtool plugin must be something similar to this:
redis-example/bgsave_in_progress.rrd
redis-example/changes_since_last_save.rrd
redis-example/connected_clients.rrd
redis-example/connected_slaves.rrd
redis-example/total_commands_processed.rrd
redis-example/total_connections_received.rrd
redis-example/uptime_in_seconds.rrd
redis-example/used_memory.rrd
Enjoy! :)
This commit adds a new redis plugin, which connect to a number of redis
server and get information about their status, using the libcredis > 0.2.2
library. The plugin get the following information:
* bgsave_in_progress
* change_since_last_save
* connected_clients
* connected_slaves
* total_command_processed
* total_connection_received
* uptime_in_seconds
* used_memory
Here is an example of configuration file:
<Plugin redis>
<Node example>
Host "localhost"
Timeout 2000
</Node>
</Plugin>
And the output of rrdtool plugin must be something similar to this:
redis-example/bgsave_in_progress.rrd
redis-example/changes_since_last_save.rrd
redis-example/connected_clients.rrd
redis-example/connected_slaves.rrd
redis-example/total_commands_processed.rrd
redis-example/total_connections_received.rrd
redis-example/uptime_in_seconds.rrd
redis-example/used_memory.rrd
Enjoy! :)
collectd-perl(5): Mention that "Globals" should be enabled.
collectd.conf(5): Documents LoadPlugin's "Globals" option.
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Was calling sys.stderror instead of sys.stderr.
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.
README: Add the "varnish" plugin.
varnish plugin: Update the copyright and author information.
Merge branch 'collectd-4.10'
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).
network plugin: Remove the "CacheFlush" config option.
df plugin: Remove the "ReportReserved" config option.
hddtemp plugin: Remove the "TranslateDevicename" config option.
v5upgrade target: Implement handling of the "mysql_qcache" and "mysql_threads" types.
v5upgrade target: Don't use "memcpy" to copy static strings.
mysql plugin: Remove the "mysql_threads" type.
mysql plugin: Remove the "mysql_qcache" type.
mysql plugin: Remove legacy config handling code.
contrib/exec-smartctl: Use the environment variables by default.
contrib/exec-smartctl: Print the "PUTVAL" command.
contrib/exec-nagios.px: Use the environment variables for defaults.
contrib/exec-nagios.px: Escape the hostname.
contrib/exec-munin.px: Use the environment variables for defaults.
contrib/exec-munin.px: Use the "PUTVAL" command explicitly.
collectd-exec(5): Document the removed backwards compatibility code.
exec plugin: Remove backwards compatibility code.
Merge remote branch 'mfournier/varnish-data-reorg'
Varnish plugin: renamed values to match configuration key names.
collectd-nagios: Implement the "-m" option (treat NaNs as critical).
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.