Sebastian Harl [Mon, 9 Aug 2010 19:54:09 +0000 (21:54 +0200)]
collectdctl: Added support for the ‘putval’ command.
Sebastian Harl [Mon, 9 Aug 2010 19:29:07 +0000 (21:29 +0200)]
libcollectdclient: Added missing element to LCC_VALUE_LIST_INIT.
Sebastian Harl [Mon, 9 Aug 2010 15:39:24 +0000 (17:39 +0200)]
collectdctl: Moved examples section from help output to manpage.
Sebastian Harl [Mon, 9 Aug 2010 15:26:11 +0000 (17:26 +0200)]
collectdctl: ‘flush’ now supports multiple plugins/identifiers.
… just like the ‘unixsock’ plugin does.
Sebastian Harl [Sun, 8 Aug 2010 22:10:22 +0000 (00:10 +0200)]
collectdctl(1): Updated the manpage according to the latest changes.
Sebastian Harl [Sun, 8 Aug 2010 21:27:16 +0000 (23:27 +0200)]
collectdctl: Improved error reporting.
Sebastian Harl [Sun, 8 Aug 2010 21:23:40 +0000 (23:23 +0200)]
collectdctl: Added ‘listval’ command.
Sebastian Harl [Sun, 8 Aug 2010 20:22:11 +0000 (22:22 +0200)]
Renamed ‘collectd-flush’ to ‘collectdctl’ (collectd control interface).
Sebastian Harl [Sun, 8 Aug 2010 20:18:06 +0000 (22:18 +0200)]
collectd-flush: Added ‘getval’ to the help output.
Sebastian Harl [Sun, 8 Aug 2010 20:15:15 +0000 (22:15 +0200)]
collectd-flush: Added support for the ‘getval’ command.
Sebastian Harl [Sun, 8 Aug 2010 19:49:11 +0000 (21:49 +0200)]
collectd-flush: Moved connection handling out of ‘flush()’.
Sebastian Harl [Sun, 8 Aug 2010 19:41:45 +0000 (21:41 +0200)]
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.
Florian Forster [Sun, 8 Aug 2010 12:45:27 +0000 (14:45 +0200)]
amqp plugin: Enable the "ExchangeType" option in Publish blocks, too.
Florian Forster [Sun, 8 Aug 2010 12:36:30 +0000 (14:36 +0200)]
collectd.conf(5): Add missing blank line.
Florian Forster [Sun, 8 Aug 2010 12:30:50 +0000 (14:30 +0200)]
collectd.conf(5): Finish documenting the AMQP plugin.
Florian Forster [Sun, 8 Aug 2010 09:46:38 +0000 (11:46 +0200)]
collectd.conf(5): Started documenting the AMQP plugin.
Florian Forster [Sun, 8 Aug 2010 08:59:15 +0000 (10:59 +0200)]
curl json: Fix checking the response code.
Sebastian Harl [Sat, 7 Aug 2010 11:30:42 +0000 (13:30 +0200)]
src/Makefile: Build and ship (in the tarball) the collectd-flush manpage.
Sebastian Harl [Sat, 7 Aug 2010 07:51:08 +0000 (09:51 +0200)]
collectd-flush: Include version and author information in usage output.
Just like the other tools.
Sebastian Harl [Sat, 7 Aug 2010 07:48:16 +0000 (09:48 +0200)]
collectd-flush: Determine default socket from configured localstatedir.
Sebastian Harl [Sat, 7 Aug 2010 07:43:33 +0000 (09:43 +0200)]
collectd-flush: Do not use ‘getopt_long()’.
This is a GNU extension and, thus, not portable.
Also, pimped the usage output a bit.
Sebastian Harl [Sat, 7 Aug 2010 07:16:50 +0000 (09:16 +0200)]
collectd-flush: Simplified ‘usage()’ a bit.
Florian Forster [Fri, 6 Aug 2010 15:06:11 +0000 (17:06 +0200)]
amqp plugin: Use the content type to determine how to decode received messages.
The "Format" config option is now only valid in "Publish" blocks.
Florian Forster [Fri, 6 Aug 2010 13:45:13 +0000 (15:45 +0200)]
amqp plugin: Improve handling of the "routing key".
If no routing key is configured, the publish code will now create one based
on the value's identifier. The subscribing code will no longer use a
default but use an empty routing key if nothing was configured.
Florian Forster [Fri, 6 Aug 2010 13:12:07 +0000 (15:12 +0200)]
amqp plugin: Implement parsing of "PUTVAL" data.
Data transmission via AMQP works now! \o/
Florian Forster [Fri, 6 Aug 2010 13:01:40 +0000 (15:01 +0200)]
amqp plugin: Implement the "Format" config option.
By default, the publishing code now creates "command" (i.e. PUTVAL) output.
For now this is easier to parse, so use this for the subscribing code.
(For now, anyways. I guess JSON will come later, too.)
Florian Forster [Fri, 6 Aug 2010 13:02:57 +0000 (15:02 +0200)]
Merge branch 'master' into sp/amqp
Florian Forster [Fri, 6 Aug 2010 12:59:56 +0000 (14:59 +0200)]
src/utils_cmd_putval.[ch]: Implement "create_putval".
Florian Forster [Fri, 6 Aug 2010 12:40:55 +0000 (14:40 +0200)]
write_http plugin: Move "wh_value_list_to_string" to src/common.[ch].
Florian Forster [Fri, 6 Aug 2010 12:10:46 +0000 (14:10 +0200)]
amqp plugin: Only accept the "Persistent" option in "Publish" blocks.
Florian Forster [Fri, 6 Aug 2010 11:54:34 +0000 (13:54 +0200)]
amqp plugin: Add a debug message.
Florian Forster [Fri, 6 Aug 2010 11:54:23 +0000 (13:54 +0200)]
amqp plugin: Enable the "StoreRates" option only when configuring a "Publish" block.
Florian Forster [Fri, 6 Aug 2010 07:04:24 +0000 (09:04 +0200)]
collectd-flush: Minor coding style changes.
Florian Forster [Fri, 6 Aug 2010 06:59:46 +0000 (08:59 +0200)]
collectd-flush: Add a missing "break" in a "switch" case.
Hakon-Dugstad.Johnsen@telenor.com [Thu, 5 Aug 2010 14:40:18 +0000 (16:40 +0200)]
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>
Hakon-Dugstad.Johnsen@telenor.com [Thu, 5 Aug 2010 14:37:45 +0000 (16:37 +0200)]
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>
Florian Forster [Thu, 5 Aug 2010 13:01:03 +0000 (15:01 +0200)]
amqp plugin: First step towards subscribing to data via AMQP.
Florian Forster [Thu, 5 Aug 2010 09:25:17 +0000 (11:25 +0200)]
amqp plugin: Use the "camqp" prefix for all functions.
The library uses the "amqp" prefix, so we should use something else.
Florian Forster [Thu, 5 Aug 2010 09:18:53 +0000 (11:18 +0200)]
amqp plugin: Implement publishing to multiple brokers.
Florian Forster [Thu, 5 Aug 2010 07:32:47 +0000 (09:32 +0200)]
amqp plugin: Chose (hopefully sane) default values for all config options.
Florian Forster [Thu, 5 Aug 2010 07:32:20 +0000 (09:32 +0200)]
src/collectd.conf.in: Add missing config options of the AMQP plugin.
Florian Forster [Wed, 4 Aug 2010 21:22:00 +0000 (23:22 +0200)]
amqp plugin: Added some comments. Rewrapped lines of the license header.
Florian Forster [Wed, 4 Aug 2010 21:08:50 +0000 (23:08 +0200)]
amqp plugin: Implement the "StoreRates" option.
Florian Forster [Wed, 4 Aug 2010 21:08:16 +0000 (23:08 +0200)]
amqp plugin: Put the connecting code into a separate function.
Florian Forster [Wed, 4 Aug 2010 20:45:17 +0000 (22:45 +0200)]
amqp plugin: Initialize the port number to 5672.
Florian Forster [Wed, 4 Aug 2010 20:44:15 +0000 (22:44 +0200)]
amqp plugin: Let the user chose the delivery method.
Use "volatile" by default, but enable the user to switch to "persistent" if
it is important that no value is lost.
Florian Forster [Wed, 4 Aug 2010 17:31:44 +0000 (19:31 +0200)]
amqp plugin: Implement persistent connection handling.
A connection is now opened on the first value to be written and is kept
open for as long as possible. This is hopefully much more efficient than
opening a new connection for each value.
The value_list_t is now converted to JSON first, before locking the
global connection object, in order to hold the lock for the least
possible time.
Florian Forster [Wed, 4 Aug 2010 17:00:50 +0000 (19:00 +0200)]
amqp plugin: Add error messages and give saner example config values.
Florian Forster [Wed, 4 Aug 2010 16:05:06 +0000 (18:05 +0200)]
src/collectd.conf.in: Add the AMQP plugin.
Florian Forster [Wed, 4 Aug 2010 15:59:31 +0000 (17:59 +0200)]
amqp plugin: Adapt to the new syntax of "format_json_value_list".
Garret Heaton [Tue, 20 Jul 2010 01:56:31 +0000 (18:56 -0700)]
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Florian Forster [Mon, 22 Mar 2010 19:07:31 +0000 (20:07 +0100)]
README: Add the amqp plugin and the librabbitmq dependency.
Florian Forster [Mon, 22 Mar 2010 19:01:39 +0000 (20:01 +0100)]
configure.in: Move the checks for librabbitmq …
… so the checks are roughly alphabetical. "Roughly", because the leading
"lib" is ignored when sorting.
Florian Forster [Mon, 22 Mar 2010 19:00:17 +0000 (20:00 +0100)]
amqp plugin: Use the global (and widely used) "sfree" macro …
… rather than the private "config_free" function.
Florian Forster [Mon, 22 Mar 2010 18:58:33 +0000 (19:58 +0100)]
amqp plugin: Use "service_name_to_port_number" to parse the "Port" config option.
Florian Forster [Mon, 22 Mar 2010 18:56:13 +0000 (19:56 +0100)]
amqp plugin: Explain numeric arguments to "amqp_login" and "amqp_basic_publish".
Florian Forster [Mon, 22 Mar 2010 18:52:09 +0000 (19:52 +0100)]
amqp plugin: Fix a typo.
Florian Forster [Mon, 22 Mar 2010 18:51:57 +0000 (19:51 +0100)]
src/Makefile.am: Fix librabbitmq CPP- and LD-flags.
Sebastien Pahl [Tue, 9 Feb 2010 16:15:55 +0000 (17:15 +0100)]
First implentation of an amqp output plugin
It's ugly for now but it works.
Florian Forster [Wed, 4 Aug 2010 12:43:38 +0000 (14:43 +0200)]
redis plugin: Use "sizeof" rather than repeating the size.
Florian Forster [Wed, 4 Aug 2010 12:40:04 +0000 (14:40 +0200)]
curl_json plugin: Use a more descriptive define as return value.
Florian Forster [Wed, 4 Aug 2010 09:49:06 +0000 (11:49 +0200)]
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.
Florian Forster [Wed, 4 Aug 2010 09:36:04 +0000 (11:36 +0200)]
redis plugin: Fix typos preventing a successful build.
Andres J. Diaz [Fri, 30 Jul 2010 14:06:48 +0000 (16:06 +0200)]
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! :)
Sebastian Harl [Wed, 28 Jul 2010 20:42:48 +0000 (22:42 +0200)]
collectd-perl(5): Mention that "Globals" should be enabled.
Sebastian Harl [Wed, 28 Jul 2010 20:42:23 +0000 (22:42 +0200)]
collectd.conf(5): Documents LoadPlugin's "Globals" option.
Garret Heaton [Tue, 20 Jul 2010 01:56:31 +0000 (18:56 -0700)]
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Florian Forster [Tue, 13 Jul 2010 11:58:34 +0000 (13:58 +0200)]
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.
Florian Forster [Tue, 13 Jul 2010 10:09:05 +0000 (12:09 +0200)]
README: Add the "varnish" plugin.
Florian Forster [Tue, 13 Jul 2010 09:50:44 +0000 (11:50 +0200)]
varnish plugin: Update the copyright and author information.
Florian Forster [Fri, 9 Jul 2010 10:05:32 +0000 (12:05 +0200)]
Merge branch 'collectd-4.10'
Florian Forster [Fri, 9 Jul 2010 10:01:28 +0000 (12:01 +0200)]
Bumped version to 4.10.1; Updated ChangeLog.
Florian Forster [Fri, 9 Jul 2010 09:58:28 +0000 (11:58 +0200)]
swap plugin: Multiply swap sizes by 1024.
This fixes a regression introduced in
6a3935d.
Florian Forster [Fri, 9 Jul 2010 09:49:31 +0000 (11:49 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Fri, 9 Jul 2010 09:47:07 +0000 (11:47 +0200)]
ChangeLog: Fix the release date for 4.9.3.
Florian Forster [Fri, 9 Jul 2010 09:39:08 +0000 (11:39 +0200)]
Bumped version to 4.9.3; Updated ChangeLog.
Florian Forster [Tue, 6 Jul 2010 11:00:32 +0000 (13:00 +0200)]
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).
Florian Forster [Mon, 5 Jul 2010 18:09:04 +0000 (20:09 +0200)]
network plugin: Remove the "CacheFlush" config option.
Florian Forster [Mon, 5 Jul 2010 18:08:04 +0000 (20:08 +0200)]
df plugin: Remove the "ReportReserved" config option.
Florian Forster [Mon, 5 Jul 2010 09:26:13 +0000 (11:26 +0200)]
hddtemp plugin: Remove the "TranslateDevicename" config option.
Florian Forster [Mon, 5 Jul 2010 08:46:00 +0000 (10:46 +0200)]
v5upgrade target: Implement handling of the "mysql_qcache" and "mysql_threads" types.
Florian Forster [Mon, 5 Jul 2010 08:38:35 +0000 (10:38 +0200)]
v5upgrade target: Don't use "memcpy" to copy static strings.
Florian Forster [Mon, 5 Jul 2010 08:27:46 +0000 (10:27 +0200)]
mysql plugin: Remove the "mysql_threads" type.
Florian Forster [Mon, 5 Jul 2010 08:24:01 +0000 (10:24 +0200)]
mysql plugin: Remove the "mysql_qcache" type.
Florian Forster [Mon, 5 Jul 2010 08:12:32 +0000 (10:12 +0200)]
mysql plugin: Remove legacy config handling code.
Florian Forster [Mon, 5 Jul 2010 07:52:20 +0000 (09:52 +0200)]
contrib/exec-smartctl: Use the environment variables by default.
Florian Forster [Mon, 5 Jul 2010 07:51:15 +0000 (09:51 +0200)]
contrib/exec-smartctl: Print the "PUTVAL" command.
Florian Forster [Mon, 5 Jul 2010 07:45:46 +0000 (09:45 +0200)]
contrib/exec-nagios.px: Use the environment variables for defaults.
Florian Forster [Mon, 5 Jul 2010 07:45:19 +0000 (09:45 +0200)]
contrib/exec-nagios.px: Escape the hostname.
Florian Forster [Mon, 5 Jul 2010 07:40:55 +0000 (09:40 +0200)]
contrib/exec-munin.px: Use the environment variables for defaults.
Florian Forster [Mon, 5 Jul 2010 07:40:33 +0000 (09:40 +0200)]
contrib/exec-munin.px: Use the "PUTVAL" command explicitly.
Florian Forster [Mon, 5 Jul 2010 07:34:13 +0000 (09:34 +0200)]
collectd-exec(5): Document the removed backwards compatibility code.
Florian Forster [Mon, 5 Jul 2010 07:26:44 +0000 (09:26 +0200)]
exec plugin: Remove backwards compatibility code.
Florian Forster [Sat, 3 Jul 2010 09:08:21 +0000 (11:08 +0200)]
Merge remote branch 'mfournier/varnish-data-reorg'
Marc Fournier [Wed, 30 Jun 2010 22:24:13 +0000 (00:24 +0200)]
Varnish plugin: renamed values to match configuration key names.
Florian Forster [Wed, 30 Jun 2010 08:47:07 +0000 (10:47 +0200)]
collectd-nagios: Implement the "-m" option (treat NaNs as critical).
Florian Forster [Mon, 28 Jun 2010 15:52:19 +0000 (17:52 +0200)]
Remove usage of obsoleted XSI extensions wrt. the "test" command.
Alexander Wuerstlein [Mon, 28 Jun 2010 07:57:02 +0000 (09:57 +0200)]
Fix usage of Solaris /usr/bin/echo
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 28 Jun 2010 08:01:39 +0000 (10:01 +0200)]
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.
Florian Forster [Mon, 28 Jun 2010 07:25:58 +0000 (09:25 +0200)]
df plugin: Report an error if "cu_mount_getlist" fails.