Code

collectd.git
13 years agoPATCH apache.c: support IBM HTTP Server.
Manuel Luis Sanmartín Rozada [Wed, 8 Sep 2010 09:01:23 +0000 (11:01 +0200)]
PATCH apache.c: support IBM HTTP Server.

IBM HTTP Server is a version of apache 2 that comes with Websphere.
IBM change the server name header to:

Server: IBM_HTTP_Server

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agolpar plugin: Explain donations a bit more.
Florian Forster [Sat, 11 Sep 2010 09:24:14 +0000 (11:24 +0200)]
lpar plugin: Explain donations a bit more.

13 years agolpar plugin: Rename the "system" metric (from "sys").
Florian Forster [Sat, 11 Sep 2010 09:18:47 +0000 (11:18 +0200)]
lpar plugin: Rename the "system" metric (from "sys").

13 years agoFix errno thread-safety under AIX
Aurelien Reynaud [Sat, 19 Jun 2010 18:03:52 +0000 (20:03 +0200)]
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>
13 years agolpar plugin: Introduce a "NS_TO_TICKS" macro.
Florian Forster [Sat, 11 Sep 2010 09:04:44 +0000 (11:04 +0200)]
lpar plugin: Introduce a "NS_TO_TICKS" macro.

This makes the code easier to read, IMHO.

13 years agolpar plugin: Move / add comments.
Florian Forster [Sat, 11 Sep 2010 09:04:04 +0000 (11:04 +0200)]
lpar plugin: Move / add comments.

13 years agolpar plugin update
Aurélien Reynaud [Thu, 9 Sep 2010 20:43:16 +0000 (22:43 +0200)]
lpar plugin update

Hello,

here is a new patch against ar/lpar with the following features :

- get back to the original implementation with gauges only. A new type
"vcpu" is created (it was "lpar_pcpu" in the original)

- I tried to keep as much as possible of your changes, but some have
been reverted (the init function is back) because it was simpler for me
to port my previous code rather than adapt it to the current form. Feel
free to change them again

- the "consumed" metric might seem superfluous at first sight as it
could be calculated in the frontend in the general case. But I thought
it might come in handy when dealing with dedicated partitions, where
donated and stolen values are no easy concepts. Not everyone wants to
dig into the code and the APIs to find out what they mean and whether
they should be added to or substracted from other values...

As a side note, one  of the changes you introduced was better checking
of the return status from perfstat_partition_total() using errno. This
reminded me that under AIX errno is by default unsafe to use in a
multithreaded environment (which collectd is). I posted a fix ("Fix
errno thread-safety under AIX") on Sat, 19 Jun 2010, which if I am not
mistaken has not been merged yet.

Best regards,

Aurélien Reynaud

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agocollection3: Add graph for "ps_disk_octets".
Florian Forster [Sun, 5 Sep 2010 08:12:02 +0000 (10:12 +0200)]
collection3: Add graph for "ps_disk_octets".

13 years agonotify_email plugin: Check for "session == NULL" and return gracefully.
Florian Forster [Sun, 5 Sep 2010 07:42:40 +0000 (09:42 +0200)]
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.

13 years agonotify_email plugin: Serialize all accesses to libesmtp using a mutex.
Florian Forster [Sun, 5 Sep 2010 07:36:55 +0000 (09:36 +0200)]
notify_email plugin: Serialize all accesses to libesmtp using a mutex.

13 years agocollection3: fix multiple hosts selection issue
Jerome Oufella [Wed, 1 Sep 2010 18:35:58 +0000 (14:35 -0400)]
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>
13 years agonginx plugin: Make the cURL callback code easier to understand.
Florian Forster [Sat, 4 Sep 2010 20:30:44 +0000 (22:30 +0200)]
nginx plugin: Make the cURL callback code easier to understand.

13 years agolpar plugin: Fix error handling of the "perfstat_partition_total" function.
Florian Forster [Fri, 3 Sep 2010 10:48:26 +0000 (12:48 +0200)]
lpar plugin: Fix error handling of the "perfstat_partition_total" function.

According to the documentation the function returns -1 on error. The
code now assumes anything but one (the number of structures filled) as
error.

13 years agolpar plugin: Document why comsumed ticks may be larger than entitled ticks.
Florian Forster [Fri, 3 Sep 2010 10:22:25 +0000 (12:22 +0200)]
lpar plugin: Document why comsumed ticks may be larger than entitled ticks.

13 years agolpar plugin: Refactor reading of "shared partitions".
Florian Forster [Fri, 3 Sep 2010 09:05:37 +0000 (11:05 +0200)]
lpar plugin: Refactor reading of "shared partitions".

Especially calculating the ticks unavailable to the partition has been
improved. The "pool statistics" may need some further work.

The code has been written without an AIX machine at hand, so it's
absolutely untested and may not even compile. Sorry.

13 years agolpar plugin: Use booleans for the config options.
Florian Forster [Fri, 3 Sep 2010 07:39:13 +0000 (09:39 +0200)]
lpar plugin: Use booleans for the config options.

13 years agolpar plugin: new attempt
Aurélien Reynaud [Wed, 1 Sep 2010 20:28:38 +0000 (22:28 +0200)]
lpar plugin: new attempt

Hello Florian,

here is a new version of my lpar plugin. I tried to address the
shortcomings of the previous attempt:

- Minimum and maximum proc capacity are gone, being static values
- The plugin now uses the cpu type for every value, so there is no need
anymore for the lpar_cpu type
- This also means there is no need anymore to compute rates in the
plugin, so the code is IMHO much more elegant
- There is a config option "ReportBySerial", as described in my previous
email
- We now use pool_busy_time directly instead of computing it from total
and idle

The patch is against the current 4.10 branch, rather than against
ar/lpar, because it is more of a complete rewrite than just fixes. I
could provide a patch against ar/lpar however if you prefer so.

Regards,

Aurélien Reynaud

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
13 years agolpar plugin: Use the "cpu" type for the general CPU statistics.
Florian Forster [Wed, 18 Aug 2010 09:31:38 +0000 (11:31 +0200)]
lpar plugin: Use the "cpu" type for the general CPU statistics.

13 years agoNew plugin - lpar
Aurélien Reynaud [Tue, 10 Aug 2010 18:37:53 +0000 (20:37 +0200)]
New plugin - lpar

Hello,

here is a patch against 4.10 adding a new plugin "lpar".

LPAR stands for Logical PARtitions, which is the virtualization solution
for IBM high-end power systems running AIX.

The standard cpu plugin shows cpu usage as a percentage of each cpu
available to the system, but in an LPAR the number of cpus and their
apparent power can vary according to the load of every LPAR sharing the
same hardware and to the policy set by the admin.

This new plugin allows to monitor real (physical) CPU usage of the
virtualized system, as well as some other metrics specific to IBM's
partitioning solution.

Regards,

Aurélien Reynaud

--
Love is like PI - natural, irrational, endless, and very important.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agonetwork plugin: Use the complain mechanism to inform the user about ignored signatures.
Florian Forster [Wed, 1 Sep 2010 18:36:40 +0000 (20:36 +0200)]
network plugin: Use the complain mechanism to inform the user about ignored signatures.

13 years agoperl plugin: Remove the deprecated "plugin_flush_{all,one}" functions.
Florian Forster [Sun, 29 Aug 2010 07:56:31 +0000 (09:56 +0200)]
perl plugin: Remove the deprecated "plugin_flush_{all,one}" functions.

13 years agoperl plugin: Remove deprecated compatibility code from "Collectd_plugin_dispatch_values".
Florian Forster [Sun, 29 Aug 2010 07:50:59 +0000 (09:50 +0200)]
perl plugin: Remove deprecated compatibility code from "Collectd_plugin_dispatch_values".

13 years agosrc/types.db: Remove the "mysql_qcache" and "mysql_threads" types.
Florian Forster [Sun, 29 Aug 2010 07:39:09 +0000 (09:39 +0200)]
src/types.db: Remove the "mysql_qcache" and "mysql_threads" types.

Use the "v5upgrade" taret to preserve compatibility.

13 years agoadd support for sysctlbyname: vm.stats.sys.v_swtch
Kimo Rosenbaum [Tue, 24 Aug 2010 20:27:03 +0000 (13:27 -0700)]
add support for sysctlbyname: vm.stats.sys.v_swtch

13 years agosrc/utils_tail: Remove newline characters at the end of a line.
Sebastian Harl [Mon, 23 Aug 2010 17:02:06 +0000 (19:02 +0200)]
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.

13 years agoutils_match: Let '^' and '$' affect lines rather than the full string.
Sebastian Harl [Mon, 23 Aug 2010 16:56:02 +0000 (18:56 +0200)]
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.

13 years agosrc/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Florian Forster [Fri, 20 Aug 2010 06:22:00 +0000 (08:22 +0200)]
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.

Thanks to Renaud Chaput for pointing this out!

13 years agoMerge branch 'collectd-4.10'
Florian Forster [Thu, 19 Aug 2010 13:02:48 +0000 (15:02 +0200)]
Merge branch 'collectd-4.10'

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Thu, 19 Aug 2010 13:02:41 +0000 (15:02 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agosrc/utils_heap.c: Fix calculation of the parent's index.
Florian Forster [Thu, 19 Aug 2010 13:00:26 +0000 (15:00 +0200)]
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.

13 years agocollectd-nagios: Remove forgotten commend.
Florian Forster [Thu, 19 Aug 2010 07:59:34 +0000 (09:59 +0200)]
collectd-nagios: Remove forgotten commend.

13 years agocollectd-nagios: Remove unnecessary includes.
Florian Forster [Thu, 19 Aug 2010 07:57:54 +0000 (09:57 +0200)]
collectd-nagios: Remove unnecessary includes.

The UNIX socket is now handled in the library, no need for including
those files anymore.

13 years agocollectdctl: Reorder includes and set strict C99/POSIX mode.
Florian Forster [Wed, 18 Aug 2010 08:22:36 +0000 (10:22 +0200)]
collectdctl: Reorder includes and set strict C99/POSIX mode.

This enables NAN on some systems, e.g. old Linux boxes.

13 years agocollectdctl: Fix comparison with uninitialized variable.
Florian Forster [Wed, 18 Aug 2010 08:22:11 +0000 (10:22 +0200)]
collectdctl: Fix comparison with uninitialized variable.

13 years agocollectdctl: Fix problems with strict aliasing.
Florian Forster [Wed, 18 Aug 2010 08:21:49 +0000 (10:21 +0200)]
collectdctl: Fix problems with strict aliasing.

13 years agoMerge branch 'collectd-4.10'
Florian Forster [Tue, 17 Aug 2010 16:53:38 +0000 (18:53 +0200)]
Merge branch 'collectd-4.10'

13 years agoMerge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Tue, 17 Aug 2010 16:53:29 +0000 (18:53 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10

13 years agosrc/plugin.c: Improve an info message.
Florian Forster [Tue, 17 Aug 2010 16:52:36 +0000 (18:52 +0200)]
src/plugin.c: Improve an info message.

Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.

13 years agoMerge branch 'ad/redis'
Florian Forster [Tue, 17 Aug 2010 16:43:37 +0000 (18:43 +0200)]
Merge branch 'ad/redis'

13 years agoMerge branch 'ff/redis' into ad/redis
Florian Forster [Tue, 17 Aug 2010 16:43:33 +0000 (18:43 +0200)]
Merge branch 'ff/redis' into ad/redis

13 years agowrite_redis plugin: Add all identifiers to a "set".
Florian Forster [Tue, 17 Aug 2010 14:45:42 +0000 (16:45 +0200)]
write_redis plugin: Add all identifiers to a "set".

This should make it easy for front-ends to discover available metrics.

13 years agowrite_redis plugin: Use an "append" macro to fill the values buffer.
Florian Forster [Tue, 17 Aug 2010 14:09:55 +0000 (16:09 +0200)]
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.

13 years agowrite_redis plugin: Fix copyright information.
Florian Forster [Tue, 17 Aug 2010 13:54:15 +0000 (15:54 +0200)]
write_redis plugin: Fix copyright information.

13 years agoredis plugin: Add default configuration.
Florian Forster [Tue, 17 Aug 2010 13:50:26 +0000 (15:50 +0200)]
redis plugin: Add default configuration.

13 years agoredis plugin: Improve the types used for storing information.
Florian Forster [Tue, 17 Aug 2010 13:48:25 +0000 (15:48 +0200)]
redis plugin: Improve the types used for storing information.

13 years agoredis plugin: Use a linked list rather than an AVL tree.
Florian Forster [Tue, 17 Aug 2010 13:20:59 +0000 (15:20 +0200)]
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.

13 years agocollectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
Florian Forster [Tue, 17 Aug 2010 06:07:35 +0000 (08:07 +0200)]
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.

13 years agosrc/utils_match.c: Use strtoull(3) for counter and absolute data sources.
Florian Forster [Tue, 17 Aug 2010 06:05:38 +0000 (08:05 +0200)]
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.

13 years agosrc/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Florian Forster [Mon, 16 Aug 2010 08:32:27 +0000 (10:32 +0200)]
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.

13 years agosrc/configfile.c: Continue parsing config files if stat'ing one file fails.
Florian Forster [Fri, 13 Aug 2010 21:15:48 +0000 (23:15 +0200)]
src/configfile.c: Continue parsing config files if stat'ing one file fails.

13 years agosrc/utils_db_query.[ch]: Remove legacy code.
Florian Forster [Wed, 11 Aug 2010 13:45:01 +0000 (15:45 +0200)]
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.

13 years agowrite_redis plugin: Add a new plugin writing collectd data to an instance of Redis.
Florian Forster [Tue, 10 Aug 2010 11:26:45 +0000 (13:26 +0200)]
write_redis plugin: Add a new plugin writing collectd data to an instance of Redis.

13 years agocollectd.conf(5): Improve the "Redis plugin" documentation a bit.
Florian Forster [Tue, 10 Aug 2010 09:18:42 +0000 (11:18 +0200)]
collectd.conf(5): Improve the "Redis plugin" documentation a bit.

13 years agoconfigure.in: Reorder the library checks alphabetically.
Florian Forster [Tue, 10 Aug 2010 09:08:03 +0000 (11:08 +0200)]
configure.in: Reorder the library checks alphabetically.

13 years agoredis plugin: Simplify configuration handling.
Florian Forster [Tue, 10 Aug 2010 08:54:31 +0000 (10:54 +0200)]
redis plugin: Simplify configuration handling.

13 years agoFix a number of minor bugs.
Andres J. Diaz [Mon, 9 Aug 2010 08:45:06 +0000 (10:45 +0200)]
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.

13 years agocollectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit archit...
Florian Forster [Tue, 10 Aug 2010 07:35:00 +0000 (09:35 +0200)]
collectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit architectures.

13 years agoamqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block...
Florian Forster [Tue, 10 Aug 2010 07:20:54 +0000 (09:20 +0200)]
amqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block, too.

13 years agocollectdctl: Added support for ‘U’ (undef) values in ‘putval’.
Sebastian Harl [Mon, 9 Aug 2010 20:04:54 +0000 (22:04 +0200)]
collectdctl: Added support for ‘U’ (undef) values in ‘putval’.

13 years agolibcollectdclient: Fixed handling of ‘U’ (undef) in ‘PUTVAL’.
Sebastian Harl [Mon, 9 Aug 2010 20:03:02 +0000 (22:03 +0200)]
libcollectdclient: Fixed handling of ‘U’ (undef) in ‘PUTVAL’.

13 years agocollectdctl: Improved error reporting.
Sebastian Harl [Mon, 9 Aug 2010 19:57:05 +0000 (21:57 +0200)]
collectdctl: Improved error reporting.

13 years agocollectdctl: Added support for the ‘putval’ command.
Sebastian Harl [Mon, 9 Aug 2010 19:54:09 +0000 (21:54 +0200)]
collectdctl: Added support for the ‘putval’ command.

13 years agolibcollectdclient: Added missing element to LCC_VALUE_LIST_INIT.
Sebastian Harl [Mon, 9 Aug 2010 19:29:07 +0000 (21:29 +0200)]
libcollectdclient: Added missing element to LCC_VALUE_LIST_INIT.

13 years agocollectdctl: Moved examples section from help output to manpage.
Sebastian Harl [Mon, 9 Aug 2010 15:39:24 +0000 (17:39 +0200)]
collectdctl: Moved examples section from help output to manpage.

13 years agocollectdctl: ‘flush’ now supports multiple plugins/identifiers.
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.

13 years agocollectdctl(1): Updated the manpage according to the latest changes.
Sebastian Harl [Sun, 8 Aug 2010 22:10:22 +0000 (00:10 +0200)]
collectdctl(1): Updated the manpage according to the latest changes.

13 years agocollectdctl: Improved error reporting.
Sebastian Harl [Sun, 8 Aug 2010 21:27:16 +0000 (23:27 +0200)]
collectdctl: Improved error reporting.

13 years agocollectdctl: Added ‘listval’ command.
Sebastian Harl [Sun, 8 Aug 2010 21:23:40 +0000 (23:23 +0200)]
collectdctl: Added ‘listval’ command.

13 years agoRenamed ‘collectd-flush’ to ‘collectdctl’ (collectd control interface).
Sebastian Harl [Sun, 8 Aug 2010 20:22:11 +0000 (22:22 +0200)]
Renamed ‘collectd-flush’ to ‘collectdctl’ (collectd control interface).

13 years agocollectd-flush: Added ‘getval’ to the help output.
Sebastian Harl [Sun, 8 Aug 2010 20:18:06 +0000 (22:18 +0200)]
collectd-flush: Added ‘getval’ to the help output.

13 years agocollectd-flush: Added support for the ‘getval’ command.
Sebastian Harl [Sun, 8 Aug 2010 20:15:15 +0000 (22:15 +0200)]
collectd-flush: Added support for the ‘getval’ command.

13 years agocollectd-flush: Moved connection handling out of ‘flush()’.
Sebastian Harl [Sun, 8 Aug 2010 19:49:11 +0000 (21:49 +0200)]
collectd-flush: Moved connection handling out of ‘flush()’.

13 years agocollectd-flush: Switched to a command based syntax.
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.

13 years agoamqp plugin: Enable the "ExchangeType" option in Publish blocks, too.
Florian Forster [Sun, 8 Aug 2010 12:45:27 +0000 (14:45 +0200)]
amqp plugin: Enable the "ExchangeType" option in Publish blocks, too.

13 years agocollectd.conf(5): Add missing blank line.
Florian Forster [Sun, 8 Aug 2010 12:36:30 +0000 (14:36 +0200)]
collectd.conf(5): Add missing blank line.

13 years agocollectd.conf(5): Finish documenting the AMQP plugin.
Florian Forster [Sun, 8 Aug 2010 12:30:50 +0000 (14:30 +0200)]
collectd.conf(5): Finish documenting the AMQP plugin.

13 years agocollectd.conf(5): Started 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.

13 years agocurl json: Fix checking the response code.
Florian Forster [Sun, 8 Aug 2010 08:59:15 +0000 (10:59 +0200)]
curl json: Fix checking the response code.

13 years agosrc/Makefile: Build and ship (in the tarball) the collectd-flush manpage.
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.

13 years agocollectd-flush: Include version and author information in usage output.
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.

13 years agocollectd-flush: Determine default socket from configured localstatedir.
Sebastian Harl [Sat, 7 Aug 2010 07:48:16 +0000 (09:48 +0200)]
collectd-flush: Determine default socket from configured localstatedir.

13 years agocollectd-flush: Do not use ‘getopt_long()’.
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.

13 years agocollectd-flush: Simplified ‘usage()’ a bit.
Sebastian Harl [Sat, 7 Aug 2010 07:16:50 +0000 (09:16 +0200)]
collectd-flush: Simplified ‘usage()’ a bit.

13 years agoamqp plugin: Use the content type to determine how to decode received messages.
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.

13 years agoamqp plugin: Improve handling of the "routing key".
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.

13 years agoamqp plugin: Implement parsing of "PUTVAL" data.
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/

13 years agoamqp plugin: Implement the "Format" config option.
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.)

13 years agoMerge branch 'master' into sp/amqp
Florian Forster [Fri, 6 Aug 2010 13:02:57 +0000 (15:02 +0200)]
Merge branch 'master' into sp/amqp

13 years agosrc/utils_cmd_putval.[ch]: Implement "create_putval".
Florian Forster [Fri, 6 Aug 2010 12:59:56 +0000 (14:59 +0200)]
src/utils_cmd_putval.[ch]: Implement "create_putval".

13 years agowrite_http plugin: Move "wh_value_list_to_string" to src/common.[ch].
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].

13 years agoamqp plugin: Only accept the "Persistent" option in "Publish" blocks.
Florian Forster [Fri, 6 Aug 2010 12:10:46 +0000 (14:10 +0200)]
amqp plugin: Only accept the "Persistent" option in "Publish" blocks.

13 years agoamqp plugin: Add a debug message.
Florian Forster [Fri, 6 Aug 2010 11:54:34 +0000 (13:54 +0200)]
amqp plugin: Add a debug message.

13 years agoamqp plugin: Enable the "StoreRates" option only when configuring a "Publish" block.
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.

13 years agocollectd-flush: Minor coding style changes.
Florian Forster [Fri, 6 Aug 2010 07:04:24 +0000 (09:04 +0200)]
collectd-flush: Minor coding style changes.

13 years agocollectd-flush: Add a missing "break" in a "switch" case.
Florian Forster [Fri, 6 Aug 2010 06:59:46 +0000 (08:59 +0200)]
collectd-flush: Add a missing "break" in a "switch" case.

13 years agoUpdate Makefile.am to build collectd-flush
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 &aring;.

Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agoAdd collectd-flush command line utility.
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 &aring;.

Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
13 years agoamqp plugin: First step towards subscribing to data via AMQP.
Florian Forster [Thu, 5 Aug 2010 13:01:03 +0000 (15:01 +0200)]
amqp plugin: First step towards subscribing to data via AMQP.

13 years agoamqp plugin: Use the "camqp" prefix for all functions.
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.

13 years agoamqp plugin: Implement publishing to multiple brokers.
Florian Forster [Thu, 5 Aug 2010 09:18:53 +0000 (11:18 +0200)]
amqp plugin: Implement publishing to multiple brokers.