Code

collectd.git
12 years agoMerge branch 'jr/varnish'
Florian Forster [Sat, 17 Mar 2012 10:45:44 +0000 (11:45 +0100)]
Merge branch 'jr/varnish'

12 years agoMerge pull request #48 from octo/pk/processes
Florian Forster [Sat, 17 Mar 2012 10:41:47 +0000 (03:41 -0700)]
Merge pull request #48 from octo/pk/processes

Fix processes plugin under FreeBSD.

12 years agoprocesses plugin: Minimize whitespace-only changes.
Florian Forster [Sat, 17 Mar 2012 10:41:04 +0000 (11:41 +0100)]
processes plugin: Minimize whitespace-only changes.

12 years agoprocesses plugin: Some more minor coding style fixes.
Florian Forster [Sat, 17 Mar 2012 10:34:43 +0000 (11:34 +0100)]
processes plugin: Some more minor coding style fixes.

12 years agoMerge pull request #52 from octo/cf/ethstat
Florian Forster [Sat, 17 Mar 2012 10:20:22 +0000 (03:20 -0700)]
Merge pull request #52 from octo/cf/ethstat

ethstat support

12 years agoethstat plugin: Implement the "MappedOnly" option.
Florian Forster [Sat, 17 Mar 2012 10:18:57 +0000 (11:18 +0100)]
ethstat plugin: Implement the "MappedOnly" option.

12 years agoethstat plugin: Fix indentation. It was a mess, sorry.
Florian Forster [Sat, 17 Mar 2012 09:54:37 +0000 (10:54 +0100)]
ethstat plugin: Fix indentation. It was a mess, sorry.

12 years agoethstat plugin: Implement the "Map" option.
Florian Forster [Mon, 12 Mar 2012 12:35:38 +0000 (13:35 +0100)]
ethstat plugin: Implement the "Map" option.

12 years agoethstat plugin: Add documentation.
Florian Forster [Mon, 12 Mar 2012 06:38:19 +0000 (07:38 +0100)]
ethstat plugin: Add documentation.

12 years agoethstat plugin: Use the system header files if available.
Florian Forster [Sun, 11 Mar 2012 18:22:06 +0000 (19:22 +0100)]
ethstat plugin: Use the system header files if available.

And disable the plugin when they are not.

12 years agoethstat module: Fix allocation of "ifacelist".
Florian Forster [Sun, 11 Mar 2012 14:53:39 +0000 (15:53 +0100)]
ethstat module: Fix allocation of "ifacelist".

And remove uses of strcpy(3).

12 years agoethstat plugin: Fix includes.
Florian Forster [Sun, 11 Mar 2012 14:49:55 +0000 (15:49 +0100)]
ethstat plugin: Fix includes.

12 years agoethstat plugin: Collect performance statistics from NICs.
Cyril Feraudet [Tue, 4 Oct 2011 13:00:04 +0000 (15:00 +0200)]
ethstat plugin: Collect performance statistics from NICs.

Hi all,

For my needs at work I wrote a plugin for collectd and I wish to share it with
you.

This plugins, temporary called ethstat and wrote in C, collect lot of
performance counter about network interface as "ethtool -S ethX" do by asking
NIC driver module.

At the moment this plugin work only under Linux. Any help would be great for
make it working under Solaris, AIX and co ...

If you think this plugin may be included to collectd sources, what is the
procedure to do it ?

Regards,
Cyril Feraudet

To be added to configuration file to make it work :

LoadPlugin ethstat

<Plugin ethstat>
 Iface "eth0"
 #Iface "eth1"
 #Iface "eth2"
 #Iface "eth3"
</Plugin>

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agovarnish plugin: Simplify the v2/v3 define structs.
Florian Forster [Sun, 11 Mar 2012 14:14:40 +0000 (15:14 +0100)]
varnish plugin: Simplify the v2/v3 define structs.

This somewhat duplicates the code in the read callback, but it's easier to read
than having four or so defines in one function.

Addresses GitHub issue #14.

12 years agovarnish plugin: Closed VSM
Jérôme Renard [Tue, 20 Dec 2011 14:22:55 +0000 (15:22 +0100)]
varnish plugin: Closed VSM

12 years agovarnish plugin: Switched to AC_CHECK_HEADERS
Jérôme Renard [Wed, 26 Oct 2011 23:20:47 +0000 (01:20 +0200)]
varnish plugin: Switched to AC_CHECK_HEADERS

12 years agovarnish plugin: Fixed wrong function name
Jérôme Renard [Wed, 26 Oct 2011 23:02:39 +0000 (01:02 +0200)]
varnish plugin: Fixed wrong function name

12 years agovarnish plugin: Added basic Varnish 3.0 support
Jérôme Renard [Wed, 26 Oct 2011 21:15:00 +0000 (23:15 +0200)]
varnish plugin: Added basic Varnish 3.0 support

12 years agovarnish plugin: Added Varnish version detection flag
Jérôme Renard [Wed, 26 Oct 2011 19:14:15 +0000 (21:14 +0200)]
varnish plugin: Added Varnish version detection flag

12 years agoprocesses plugin: A few coding style fixes for the FreeBSD code.
Florian Forster [Sun, 19 Feb 2012 22:01:35 +0000 (23:01 +0100)]
processes plugin: A few coding style fixes for the FreeBSD code.

Change-Id: I3469a605c0dc0b7ce51049636ab3f82b03fdfa17

12 years agocollectd-5.0.1-mine.patch some processes.c fixes for FreeBSD
Phil Kulin [Sun, 8 Jan 2012 16:50:27 +0000 (19:50 +0300)]
collectd-5.0.1-mine.patch some processes.c fixes for FreeBSD

I welcome from rainy Ingermanland!

Our thoughts are now occupied by Putin and vodka, however...

I have paid attention to a little incorrect data which is given out by
a processes plugin on my beautifull FreeBSD system.
I have corrected them and in process have made absolutely slightly
have improved accuracy and productivity of a processes plugin for
FreeBSD systems.

- Fix strange plural call of getpagesize(). Has entered a global
variable and initialization procedure for FreeBSD
- Data was summarized on all processes including threads. It led to
absolutely uncertain result. Fix based on codebase of FreeBSD top
programm. KERN_PROC_ALL attribute keep for future purposes.
- Gets command argument failed for some processes as system and some
other. It led to error messages to console. Fix based on codebase of
FreeBSD top programm.
- System and user CPU times turned out from the sum of miliseconds
and... Oh! microseconds in one glass with overflow possibility. Fixed.

My girlfriend has left me for such Christmas vacation, but I am
assured that have made good business.

Patch in mail attachment.

--
Non nobis Domine non nobis sed Nomini Tuo da gloriam
Phil Kulin

Change-Id: Ib88faadf5a0fd335b426e9024b0a2e438ddbaf1f
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agowrite_mongodb plugin: Fix reconnection behavior.
Florian Forster [Fri, 9 Mar 2012 15:58:15 +0000 (16:58 +0100)]
write_mongodb plugin: Fix reconnection behavior.

The previous code would never detect a disconnect and act appropriately. In the
process, manual tracking of the connection state is removed in favor of
mongo_is_connected().

12 years agowrite_mongodb plugin: Export DS names and DS types.
Florian Forster [Wed, 7 Mar 2012 10:10:06 +0000 (11:10 +0100)]
write_mongodb plugin: Export DS names and DS types.

The values are exported as an array now. This is very close to the way data is
exported as JSON.

12 years agoMerge pull request #43 from octo/ff/numa
Florian Forster [Wed, 7 Mar 2012 09:54:36 +0000 (01:54 -0800)]
Merge pull request #43 from octo/ff/numa

numa plugin: Add plugin for Non-Uniform Memory Access (NUMA).

12 years agocollectd.conf.in: Add the numa plugin.
Florian Forster [Wed, 7 Mar 2012 09:53:21 +0000 (10:53 +0100)]
collectd.conf.in: Add the numa plugin.

12 years agowrite_mongodb plugin: Actually store time as "date" type.
Florian Forster [Mon, 5 Mar 2012 09:35:58 +0000 (10:35 +0100)]
write_mongodb plugin: Actually store time as "date" type.

12 years agonuma plugin: Add plugin for Non-Uniform Memory Access (NUMA).
Florian Forster [Sun, 4 Mar 2012 09:41:11 +0000 (10:41 +0100)]
numa plugin: Add plugin for Non-Uniform Memory Access (NUMA).

Change-Id: I2610c7d8f73082154672114ad82001c6bd1b6f14

12 years agowrite_mongodb plugin: Actually implement the "Timeout" option.
Florian Forster [Wed, 29 Feb 2012 22:11:26 +0000 (23:11 +0100)]
write_mongodb plugin: Actually implement the "Timeout" option.

Change-Id: I8eb1bc53a15cd301d663e55a5ea71e46013f04c5

12 years agocollectd.conf(5): Add documentation for the write_mongodb plugin.
Florian Forster [Wed, 29 Feb 2012 22:09:58 +0000 (23:09 +0100)]
collectd.conf(5): Add documentation for the write_mongodb plugin.

Resolves GitHub issue #37.

Change-Id: I9b2ff533003e379f0eb81de256a946fdf8851661

12 years agoMerge pull request #36 from octo/mh/softraid
Florian Forster [Tue, 28 Feb 2012 09:12:09 +0000 (01:12 -0800)]
Merge pull request #36 from octo/mh/softraid

Merge the "md" plugin, collecting disk counts from Linux software-RAID devices.

12 years agoAUTHORS, README: Add Michael Hanselmann / the md plugin.
Florian Forster [Tue, 28 Feb 2012 09:10:10 +0000 (10:10 +0100)]
AUTHORS, README: Add Michael Hanselmann / the md plugin.

12 years agocollectd.conf(5): Update the information on the md plugin.
Florian Forster [Tue, 28 Feb 2012 09:06:54 +0000 (10:06 +0100)]
collectd.conf(5): Update the information on the md plugin.

12 years agomd plugin: Change metrics so each disk is reported only once.
Florian Forster [Tue, 28 Feb 2012 08:54:59 +0000 (09:54 +0100)]
md plugin: Change metrics so each disk is reported only once.

This hopefully makes graphing easier.

12 years agoMerge pull request #38 from octo/ff/mongodb
Florian Forster [Tue, 28 Feb 2012 05:53:01 +0000 (21:53 -0800)]
Merge pull request #38 from octo/ff/mongodb

write_mongodb plugin: Implement the "StoreRates" option.

12 years agowrite_mongodb plugin: Implement the "StoreRates" option.
Florian Forster [Mon, 27 Feb 2012 21:41:48 +0000 (22:41 +0100)]
write_mongodb plugin: Implement the "StoreRates" option.

Change-Id: I73503de7605d456156664fd91c81cac1f3624939

12 years agoPlugin for Linux Software-RAID devices
Michael Hanselmann [Tue, 22 Feb 2011 23:18:12 +0000 (00:18 +0100)]
Plugin for Linux Software-RAID devices

This is an initial implementation of a plugin to collect information
about Linux Software-RAID (md) devices. It reports the number of
component devices, number of devices in array, number of active,
working, failed and spare disks.

Change-Id: Id0ba8e678f33153112e9999c6341dd2ce71b10c0
Signed-off-by: Michael Hanselmann <public@hansmi.ch>
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocontrib/exec-ksm.sh: Exec plugin for Kernel Samepage Merging (KSM).
Florian Forster [Fri, 2 Sep 2011 17:58:44 +0000 (13:58 -0400)]
contrib/exec-ksm.sh: Exec plugin for Kernel Samepage Merging (KSM).

Change-Id: I98d834ca849b21637c8fb00a63a037b73e0879b7

12 years agoMerge branch 'collectd-5.0'
Florian Forster [Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)]
Merge branch 'collectd-5.0'

Conflicts:
src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sat, 25 Feb 2012 17:15:36 +0000 (18:15 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/df.c

Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953

12 years agocontrib/exec-nagios.px: Implement the "NRPEConfig" option.
Florian Forster [Mon, 19 Apr 2010 11:04:35 +0000 (13:04 +0200)]
contrib/exec-nagios.px: Implement the "NRPEConfig" option.

12 years agosyslog plugin: Copy the BUFFER_ADD() macro from src/utils_format_json.c.
Florian Forster [Sat, 25 Feb 2012 16:55:36 +0000 (17:55 +0100)]
syslog plugin: Copy the BUFFER_ADD() macro from src/utils_format_json.c.

Also determine the string representation of the severity in the switch
block, since it's much easier to read than the ?:-cascade.

Change-Id: Ieb5467633db3e06e1fad6a60b5a19fd7708e2002

12 years agosyslog plugin: Log "OKAY" notifications with severity "NOTICE".
Florian Forster [Sat, 25 Feb 2012 16:33:05 +0000 (17:33 +0100)]
syslog plugin: Log "OKAY" notifications with severity "NOTICE".

It's a noteworthy event that implies normal operation, i.e. NOTICE. Also
renamed "severity" to "log_severity" to emphasize its use.

Change-Id: I7f3e4b12dabeb0caa9c9c8c86924bf77b2627ba1

12 years agosyslog plugin: Change notification severity handling.
Florian Forster [Sat, 25 Feb 2012 16:31:23 +0000 (17:31 +0100)]
syslog plugin: Change notification severity handling.

This way it is more like log severity handling, i.e. "OKAY" implies
"WARNING" and "WARNING" implies "FAILURE".

Change-Id: I972c09e4bc9e26b5abeb17cc4d8c5e0e1a42e1c3

12 years agosyslog plugin: Parse "value" as severity, not "key".
Florian Forster [Sat, 25 Feb 2012 16:25:50 +0000 (17:25 +0100)]
syslog plugin: Parse "value" as severity, not "key".

Change-Id: I4a7bde018be5a8925c9a998cd3e89e0289453063

12 years agosrc/plugin.c: Fix use of strcmp().
Florian Forster [Sat, 25 Feb 2012 16:12:45 +0000 (17:12 +0100)]
src/plugin.c: Fix use of strcmp().

Change-Id: I078ca80ba6e3cac413186c2ad063d32cdfbb398e

12 years agoAdd notifications to syslog plugin
Fabien Wernli [Wed, 26 Oct 2011 09:22:46 +0000 (11:22 +0200)]
Add notifications to syslog plugin

Deduplicated some code from logfile and syslog
and added NotifyLevel option to plugin.

Change-Id: I364067189d628420333cb625c885a256399e076a
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agobind plugin: Fix use of the "QType" types.
Florian Forster [Sat, 25 Feb 2012 15:56:35 +0000 (16:56 +0100)]
bind plugin: Fix use of the "QType" types.

This should resolve GitHub issue #21.

Change-Id: I67e4b440a6fbc8a8608fa672fb3320b05f9c0a12

12 years agoMerge pull request #22 from bostjan/master
Florian Forster [Sat, 25 Feb 2012 15:04:41 +0000 (07:04 -0800)]
Merge pull request #22 from bostjan/master

php-collection: Fixed DS definitions for apache_bytes, apache_requests and apache_scoreboard merge

12 years agodf plugin: Fix a compiler issue with Mac OS X 10.7.
Florian Forster [Sat, 25 Feb 2012 10:42:19 +0000 (11:42 +0100)]
df plugin: Fix a compiler issue with Mac OS X 10.7.

Xcode Version 4.1 (11C74), GitHub issue #24

Change-Id: Ic6f49a95868c7f77bfb19f9c8afc87a97a1bf670

12 years agophp-collection: Fixed DS definitions for apache_bytes, apache_requests and apache_sco...
Bostjan Skufca [Fri, 24 Feb 2012 19:05:13 +0000 (20:05 +0100)]
php-collection: Fixed DS definitions for apache_bytes, apache_requests and apache_scoreboard merge

12 years agoMerge pull request #18 from octo/hmh/sensors
Florian Forster [Thu, 23 Feb 2012 09:37:42 +0000 (01:37 -0800)]
Merge pull request #18 from octo/hmh/sensors

sensors plugin: Fix initialization code.

12 years agosensors plugin: Make "conffile" non-const.
Florian Forster [Thu, 23 Feb 2012 09:34:57 +0000 (10:34 +0100)]
sensors plugin: Make "conffile" non-const.

Change-Id: I0c718ee6cd727bd9868633312ea0f81a2b8f0e41

12 years agocollectd.conf(5): Document the "SensorConfigFile" option.
Florian Forster [Thu, 23 Feb 2012 09:28:30 +0000 (10:28 +0100)]
collectd.conf(5): Document the "SensorConfigFile" option.

Change-Id: I48ab713fbb7d0edefb6f3cb6948277144a66abdd

12 years agosensors plugin: Fix memory leak in configuration; enhance comments.
Florian Forster [Thu, 23 Feb 2012 09:23:27 +0000 (10:23 +0100)]
sensors plugin: Fix memory leak in configuration; enhance comments.

Change-Id: Ic4f9d2aae1aec9fbd83307fe3bb7d476f49f6827

12 years agosrc/collectd.conf.in: Add the "ParseTime" option to the "Plugin bind" block.
Florian Forster [Wed, 22 Feb 2012 17:50:53 +0000 (18:50 +0100)]
src/collectd.conf.in: Add the "ParseTime" option to the "Plugin bind" block.

Change-Id: I4e6828d66ee441e0973b3f8ff73a1a50d4d6c90b

12 years agobind plugin: Implement the "ParseTime" option.
Florian Forster [Wed, 22 Feb 2012 17:37:46 +0000 (18:37 +0100)]
bind plugin: Implement the "ParseTime" option.

Change-Id: Ic1994440d462079bc16c70da495ff51728cb4aba

12 years agosensors plugin: Fix initialization code.
Henrique de Moraes Holschuh [Sat, 16 Oct 2010 01:21:57 +0000 (22:21 -0300)]
sensors plugin: Fix initialization code.

Sensors often require scaling. Also, you often have to disable them, or name
them.

The libsensors config file provides all these facilities.  Without it, the
sensor plugin is mostly useless except for some values that are often already
properly scaled by the kernel (some temperatures, some fan tachometers).

In particular, it is utterly useless for voltage monitoring outside of the 3.3V
rails.

The plugin should either evaluate the libsensors config files at startup, or it
should provide facilities to give proper names and first-order polinomial
scaling+offset.

Change-Id: I97312bee5ca33fefe846a8cdc292818d46819574
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agowrite_graphite plugin: Enable "StoreRates" by default.
Florian Forster [Mon, 20 Feb 2012 16:20:47 +0000 (17:20 +0100)]
write_graphite plugin: Enable "StoreRates" by default.

Change-Id: I814c45d035ce42de07815fecfe0b667080e2d900

12 years agowrite_graphite plugin: Add the "SeparateInstances" option.
Florian Forster [Mon, 20 Feb 2012 16:20:21 +0000 (17:20 +0100)]
write_graphite plugin: Add the "SeparateInstances" option.

Change-Id: I8670b62ed323698c7764d3039ccd8af052bd1b6f

12 years agotarget_scale plugin: Coding style fixes.
Florian Forster [Sun, 19 Feb 2012 21:33:45 +0000 (22:33 +0100)]
target_scale plugin: Coding style fixes.

Change-Id: I5a992fe0b0206455bf910a739927f2243b05b89b

12 years agoAMQP plugin: Support sub-second sleep intervals.
Florian Forster [Sun, 19 Feb 2012 11:51:09 +0000 (12:51 +0100)]
AMQP plugin: Support sub-second sleep intervals.

Change-Id: I9afcd8d17f1251b0765dfbdae5ed8581b73b15fe

12 years agoAMQP plugin: Fix sleeping of "interval_g seconds".
Florian Forster [Sun, 19 Feb 2012 11:42:57 +0000 (12:42 +0100)]
AMQP plugin: Fix sleeping of "interval_g seconds".

Since "interval_g" was changed to "cdtime_t", the plugin would sleep 2^30 times
as long as intended. D'oh! Thanks to Xavier for reporting this!

Change-Id: I8e9992307a1fdbb2df799a5359eb6695409684df

12 years agoCollectd's scale plugin now supports scaling only on specific data sources, yay!
Gerrie Roos [Wed, 25 May 2011 16:28:55 +0000 (18:28 +0200)]
Collectd's scale plugin now supports scaling only on specific data sources, yay!

Change-Id: I91dc04fbd0a8e982ce09a766f12d024bdbef634f

12 years agoMerge branch 'collectd-5.0'
Florian Forster [Sun, 19 Feb 2012 10:21:31 +0000 (11:21 +0100)]
Merge branch 'collectd-5.0'

Conflicts:
configure.in

Change-Id: Ifffa7df6b6c758650af7d942c26c8bd89568d8ea

12 years agoBump version to 5.0.3; Update ChangeLog. collectd-5.0.3
Florian Forster [Sun, 19 Feb 2012 10:12:43 +0000 (11:12 +0100)]
Bump version to 5.0.3; Update ChangeLog.

Change-Id: I3c73ac8b3ac73227e20ea32d052f5bea1575e29a

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sun, 19 Feb 2012 10:11:28 +0000 (11:11 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
version-gen.sh

Change-Id: Id72b28eb1432835ab710d1f551bb886d0638e079

12 years agoUpdate ChangeLog. collectd-4.10.6
Florian Forster [Sun, 19 Feb 2012 09:58:46 +0000 (10:58 +0100)]
Update ChangeLog.

Change-Id: I41518e6e48c089e79919d1bc65b03744872bcec0

12 years agoexec plugin: Replace tabs with spaces to fix indentation.
Florian Forster [Fri, 17 Feb 2012 14:09:26 +0000 (15:09 +0100)]
exec plugin: Replace tabs with spaces to fix indentation.

Change-Id: I6e623f237c1d79007bd471732476a4e32dafde97

12 years agonetwork plugin: Fixed incorrect collectd warning when configuring network plugin.
Gerrie Roos [Tue, 20 Dec 2011 04:30:59 +0000 (06:30 +0200)]
network plugin: Fixed incorrect collectd warning when configuring network plugin.

Cosmetic only

Change-Id: I4c4c8fe19c23e9aa31b35e61eba31aa686429c10
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoexec plugin: incorrectly exited select loop on signal.
Gerrie Roos [Tue, 10 Jan 2012 07:00:42 +0000 (09:00 +0200)]
exec plugin: incorrectly exited select loop on signal.

Sometimes dead modules won't be started up correctly or running ones
would not generate stats anymore.  Problem manifests more often under
load and on multicore hw

Change-Id: Ifb70a74c0cd55fc421b65a1f4332147916eadb70
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoconfigure.in: Use the `--libs_r' option of mysql-config.
Cyril Feraudet [Tue, 14 Feb 2012 09:47:27 +0000 (10:47 +0100)]
configure.in: Use the `--libs_r' option of mysql-config.

Rather than the `--libs' option.

Change-Id: Idd2a3828f4d154f353c44a4b69aa094acbadcabf
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge branch 'ss/graphite'
Florian Forster [Mon, 13 Feb 2012 21:10:52 +0000 (22:10 +0100)]
Merge branch 'ss/graphite'

12 years agocollectd.conf(5): Improve description of the write_graphite plugin.
Florian Forster [Mon, 13 Feb 2012 21:03:07 +0000 (22:03 +0100)]
collectd.conf(5): Improve description of the write_graphite plugin.

Change-Id: Ide28fe5eef021bc18cfd05202b1efefea693350c

12 years agowrite_graphite plugin: Set a (hopefully unique) callback name.
Florian Forster [Mon, 13 Feb 2012 20:27:40 +0000 (21:27 +0100)]
write_graphite plugin: Set a (hopefully unique) callback name.

Change-Id: Iab70d4f40a614bc04b70b61868d30721ee9641c1

12 years agowrite_graphite plugin: Simplify wg_write_messages().
Florian Forster [Mon, 13 Feb 2012 13:33:44 +0000 (14:33 +0100)]
write_graphite plugin: Simplify wg_write_messages().

There is no need for special handling of values with one / more data sources.

Change-Id: I849d4a881ed50ad1c7b8cf5c0abd1c5d62fe5258

12 years agowrite_graphite plugin: Report configuration errors for the EscapeCharacter option.
Florian Forster [Thu, 9 Feb 2012 09:48:50 +0000 (10:48 +0100)]
write_graphite plugin: Report configuration errors for the EscapeCharacter option.

Change-Id: Ia99e2c8d9c7ced344bb52f4d80957fa9abe3e7db

12 years agowrite_graphite plugin: Print the time as an unsigned int.
Florian Forster [Thu, 9 Feb 2012 09:46:21 +0000 (10:46 +0100)]
write_graphite plugin: Print the time as an unsigned int.

Change-Id: I61f4952c8debdf7c80c4e1e4647cf42ecf00f033

12 years agowrite_graphite plugin: Use CR-LF line endings.
Florian Forster [Wed, 8 Feb 2012 17:25:03 +0000 (18:25 +0100)]
write_graphite plugin: Use CR-LF line endings.

Using this line ending in ASCII conversations over the network has been a
convention since the 1970s, let's stick with it.

Change-Id: I5d0640e520a70483ab9256989f89e9e2dcab7643

12 years agowrite_graphite plugin: Use swrite() instead of write().
Florian Forster [Wed, 8 Feb 2012 15:38:01 +0000 (16:38 +0100)]
write_graphite plugin: Use swrite() instead of write().

swrite() ensures that the entire buffer is written before the buffer is reset.

Change-Id: I105d42d8ea5b71acd5a5e37b7cc4209045f28d47

12 years agowrite_graphite plugin: Decrese buffer size.
Florian Forster [Wed, 8 Feb 2012 09:25:59 +0000 (10:25 +0100)]
write_graphite plugin: Decrese buffer size.

The larger the buffer, the longer you need to wait for the data to be written
to Carbon. The new buffer size assumes an MTU of 1500 bytes (Ethernet payload)
and keeps margins for IPv6 and TCP (with timestamps). This should decrease the
number of packets needed (because data is now cleanly aligned to the packet
size) and decrease the overall time spent buffered.

Change-Id: I73021608f1ff0f22f9e73cd62b7fb5ea79421546

12 years agosrc/collectd.conf.in: Rename "write_mongo" to "write_mongodb".
Florian Forster [Tue, 7 Feb 2012 17:23:00 +0000 (18:23 +0100)]
src/collectd.conf.in: Rename "write_mongo" to "write_mongodb".

Change-Id: I42fdd3d4a380ab50d0c4e14bc2ed2b09f09bf716

12 years agosrc/collectd.conf.in: Add the write_graphite plugin.
Florian Forster [Tue, 7 Feb 2012 17:21:33 +0000 (18:21 +0100)]
src/collectd.conf.in: Add the write_graphite plugin.

Change-Id: I238d9bd7d2413bdc747f0603cb6e97d777252fcd

12 years agowrite_graphite plugin: Implement the "AlwaysAppendDS" option.
Florian Forster [Tue, 7 Feb 2012 17:19:20 +0000 (18:19 +0100)]
write_graphite plugin: Implement the "AlwaysAppendDS" option.

Don't append DS name by default, except when there is more than one DS.
The "AlwaysAppendDS" option can be used to force the plugin to always
append the DS.

Change-Id: I0221bef49375e3b5c5de99bb8f5a9cd641b696c3

12 years agowrite_graphite plugin: Fix trailing underscores.
Florian Forster [Tue, 7 Feb 2012 17:16:02 +0000 (18:16 +0100)]
write_graphite plugin: Fix trailing underscores.

This may also fix an off-by-one error when the name is long enough. D'oh!

Change-Id: Ibc5a68f9bc93eed6366d074b55a7aca020bcf990

12 years agowrite_graphite plugin: Implement the StoreRates option.
Florian Forster [Tue, 7 Feb 2012 16:59:00 +0000 (17:59 +0100)]
write_graphite plugin: Implement the StoreRates option.

Most of it was already present in the code anyway, so I just added the
appropriate config handling.

Change-Id: I7ce8be2f5b075da690872ec72b3610eae05b3c6c

12 years agopinba, postgres and routeros plugins: Use the cf_util_get_service() function.
Florian Forster [Mon, 6 Feb 2012 17:07:08 +0000 (18:07 +0100)]
pinba, postgres and routeros plugins: Use the cf_util_get_service() function.

PostgreSQL plugin: Also abolish the config_set_s() function in favor of
cf_util_get_string().

Change-Id: Ib3d903c48a30fd6a8417e8ee999368eda15d69d7

12 years agowrite_graphite plugin: Use cf_util_get_service() for the "Port" option.
Florian Forster [Mon, 6 Feb 2012 13:54:40 +0000 (14:54 +0100)]
write_graphite plugin: Use cf_util_get_service() for the "Port" option.

Change-Id: If3f0b32f86a40dbaa22837dc15f51429239af03a

12 years agoMerge branch 'master' into ss/graphite
Florian Forster [Mon, 6 Feb 2012 13:37:52 +0000 (14:37 +0100)]
Merge branch 'master' into ss/graphite

12 years agosrc/configfile.[ch]: Add cf_util_get_service() for getting service names.
Florian Forster [Mon, 6 Feb 2012 10:49:59 +0000 (11:49 +0100)]
src/configfile.[ch]: Add cf_util_get_service() for getting service names.

Change-Id: I310c0d076a82927958fba04dd9eedbc706742dce

12 years agocollectd.conf(5): Add stub for the write_graphite plugin.
Florian Forster [Mon, 6 Feb 2012 09:48:14 +0000 (10:48 +0100)]
collectd.conf(5): Add stub for the write_graphite plugin.

Change-Id: I129127ff7216b8a23f9cb638df49192f5b16e45f

12 years agoBump version to 4.10.6; Update ChangeLog.
Florian Forster [Sun, 5 Feb 2012 13:02:07 +0000 (14:02 +0100)]
Bump version to 4.10.6; Update ChangeLog.

Change-Id: I95bfb6e742ba7ad9e2b9c89dc990cd4bf573dbfa

12 years agoBuild system: Remove superfluous C(PP)FLAG.
Florian Forster [Sun, 5 Feb 2012 12:49:45 +0000 (13:49 +0100)]
Build system: Remove superfluous C(PP)FLAG.

Change-Id: Ic2f665869f863b1e0dca9b5ccde2803715386a3c

12 years agoBuild system: Use pkg-config to configure libiptc.
Florian Forster [Sat, 4 Feb 2012 15:28:02 +0000 (16:28 +0100)]
Build system: Use pkg-config to configure libiptc.

This hopefully fixes Goobuntu Bug #375733.

Change-Id: I0a4215351ce836fb62418cbd40bee27fd695d9da

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Fri, 3 Feb 2012 10:49:04 +0000 (11:49 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

12 years agowrite_graphite plugin: Fix locking.
Florian Forster [Fri, 3 Feb 2012 09:54:58 +0000 (10:54 +0100)]
write_graphite plugin: Fix locking.

wg_send_buffer() is called from wg_flush_nolock(). When calling
wg_flush_nolock(), the thread has to hold cb->send_lock. Locking it again
will fail, but this condition is not checked for. Then the lock is
released twice which may result in concurrency issues.

Change-Id: Ie3062d50e6545adeb95b3a1938837c1f26835a56

12 years agowrite_graphite plugin: Remove the unused "server" field.
Florian Forster [Fri, 3 Feb 2012 09:52:18 +0000 (10:52 +0100)]
write_graphite plugin: Remove the unused "server" field.

Change-Id: I6ae59f4a2f6be69f891bbfa16afddc5ec9be9bad

12 years agowrite_graphite plugin: Update the copyright header.
Florian Forster [Fri, 3 Feb 2012 09:51:50 +0000 (10:51 +0100)]
write_graphite plugin: Update the copyright header.

It's based on the write_http plugin, so these copyrights apply as well.

Change-Id: I9def5e5b7e3cf6081f820df07187f47dd9d4b92b

12 years agowrite_graphite plugin: Escape *all* the things!
Florian Forster [Fri, 3 Feb 2012 09:34:51 +0000 (10:34 +0100)]
write_graphite plugin: Escape *all* the things!

Dots and spaces can appear anywhere, e.g. spaces in hostnames and dots in type
instances. Escape them all to avoid unintended special treatment by Carbon /
Graphite.

Change-Id: Iccc330934bcd765a237a1fed42d0cdb4bf3aa2b1

12 years agoMerge pull request #20 from pyr/ss/graphite
Florian Forster [Fri, 3 Feb 2012 09:05:46 +0000 (01:05 -0800)]
Merge pull request #20 from pyr/ss/graphite

Remove spaces and dots from the identifier.

12 years agowrite_graphite plugin: Remove duplicate includes.
Florian Forster [Fri, 3 Feb 2012 09:03:58 +0000 (10:03 +0100)]
write_graphite plugin: Remove duplicate includes.

Change-Id: I8745634aee66edde18f5720a6b4882d51e19ee12