Code

collectd.git
11 years agoadd log_logstash plugin to emit logstash json_event messages.
Pierre-Yves Ritschard [Thu, 27 Jun 2013 13:52:30 +0000 (15:52 +0200)]
add log_logstash plugin to emit logstash json_event messages.

11 years agoMerge branch 'feature-write_graphite-udp' of git://github.com/jjmaestro/collectd
Florian Forster [Tue, 18 Jun 2013 06:14:59 +0000 (08:14 +0200)]
Merge branch 'feature-write_graphite-udp' of git://github.com/jjmaestro/collectd

11 years agowrite_graphite plugin: avoid flooding the log with the protocol error check
J. Javier Maestro [Sun, 16 Jun 2013 17:37:32 +0000 (19:37 +0200)]
write_graphite plugin: avoid flooding the log with the protocol error check

Moving the protocol error checking from `wg_callback_init` to `wg_config_node`.
This avoids flooding the log, as suggested by Florian Forster (@octo).

11 years agowrite_graphite plugin: config should fail on error
J. Javier Maestro [Sun, 16 Jun 2013 16:05:53 +0000 (18:05 +0200)]
write_graphite plugin: config should fail on error

This is the preferred way of handling config, as it can be seen in snmp.c. It's
important to fail on a config error to simplify code in other callbacks.

11 years agoFix typo
Cyril Plisko [Sun, 9 Jun 2013 16:11:04 +0000 (19:11 +0300)]
Fix typo

recive -> receive

11 years agowrite_graphite plugin: Adding myself to AUTHORS :)
J. Javier Maestro [Mon, 3 Jun 2013 17:32:56 +0000 (19:32 +0200)]
write_graphite plugin: Adding myself to AUTHORS :)

11 years agoMerge branch 'xl/zfs'
Florian Forster [Tue, 4 Jun 2013 06:42:25 +0000 (08:42 +0200)]
Merge branch 'xl/zfs'

11 years agozfs_arc plugin: Fix indentation.
Florian Forster [Tue, 4 Jun 2013 06:36:10 +0000 (08:36 +0200)]
zfs_arc plugin: Fix indentation.

11 years agozfs_arc plugin: Use a buffer with fixed size rather than allocating on the heap.
Florian Forster [Tue, 4 Jun 2013 06:35:09 +0000 (08:35 +0200)]
zfs_arc plugin: Use a buffer with fixed size rather than allocating on the heap.

The key length is very predicable, so buffer length is not a problem.

11 years agozfs_arc plugin: Add copyright information for Xin Li.
Florian Forster [Tue, 4 Jun 2013 06:11:26 +0000 (08:11 +0200)]
zfs_arc plugin: Add copyright information for Xin Li.

11 years agowrite_graphite plugin: Adding LogSendErrors to docs, README, etc.
J. Javier Maestro [Mon, 3 Jun 2013 17:31:48 +0000 (19:31 +0200)]
write_graphite plugin: Adding LogSendErrors to docs, README, etc.

11 years agowrite_graphite plugin: Adding LogSendErrors boolean flag
J. Javier Maestro [Mon, 3 Jun 2013 17:24:38 +0000 (19:24 +0200)]
write_graphite plugin: Adding LogSendErrors boolean flag

Sometimes we don't want to hog the syslog with errors that are produced
when the graphite server is down.

Especially for UDP, we want to be able to truly fire-and-forget
(remember to monitor UDP packet receipt failures though :) and having
errors written to the syslog is a burden that should be avoided.

11 years agowrite_graphite plugin: Adding UDP support to docs, README, etc.
J. Javier Maestro [Mon, 3 Jun 2013 17:04:29 +0000 (19:04 +0200)]
write_graphite plugin: Adding UDP support to docs, README, etc.

11 years agowrite_graphite plugin: Adding TCP/UDP support via config
J. Javier Maestro [Mon, 3 Jun 2013 17:03:44 +0000 (19:03 +0200)]
write_graphite plugin: Adding TCP/UDP support via config

UDP allows to "fire-and-forget" data while not bringing the servers down
due to TCP's connection oriented overhead.

The new versions of Graphite support both TCP and UDP streams so it made
sense to add UDP support.

11 years agowrite_riemann plugin: Implement the "TTLFactor" option.
Florian Forster [Mon, 3 Jun 2013 07:07:15 +0000 (09:07 +0200)]
write_riemann plugin: Implement the "TTLFactor" option.

Github: #336

11 years agoMerge branch 'yaccz/curl-status'
Florian Forster [Sat, 1 Jun 2013 07:25:28 +0000 (09:25 +0200)]
Merge branch 'yaccz/curl-status'

11 years agoMerge branch 'vb/df'
Florian Forster [Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)]
Merge branch 'vb/df'

11 years agocurl plugin: Fix compiler warning.
Florian Forster [Sat, 1 Jun 2013 07:23:04 +0000 (09:23 +0200)]
curl plugin: Fix compiler warning.

The compiler thinks the "start" variable may be used uninitialized.

11 years agocollectd.conf(5): Minor fixes.
Florian Forster [Sat, 1 Jun 2013 07:20:59 +0000 (09:20 +0200)]
collectd.conf(5): Minor fixes.

11 years agodf plugin: Rename the percent metrics.
Florian Forster [Sat, 1 Jun 2013 07:19:07 +0000 (09:19 +0200)]
df plugin: Rename the percent metrics.

* Change type to "percent".
* Use "<disk>-bytes" and "<disk>-inodes" as plugin instance. This way we're
  able to use "percent" for both.
* Remove one level of indentation.
* Make casting more explicit (e.g. don't divide a float by a size_t).

11 years agodf plugin: Remove trailing whitespace.
Florian Forster [Fri, 31 May 2013 16:18:40 +0000 (18:18 +0200)]
df plugin: Remove trailing whitespace.

And fix indentation.

11 years agoPlugin df: ReportPercentage
Vedran Bartonicek [Fri, 31 May 2013 10:40:59 +0000 (13:40 +0300)]
Plugin df: ReportPercentage

11 years agoPlugin df free space as percentage.
Vedran Bartonicek [Mon, 27 May 2013 19:42:08 +0000 (22:42 +0300)]
Plugin df free space as percentage.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoImplement ARC data collection on FreeBSD.
Xin Li [Thu, 30 May 2013 18:25:09 +0000 (11:25 -0700)]
Implement ARC data collection on FreeBSD.

11 years agocontrib/redhat/init.d-collectd: Rename variable to …PIDDIR.
Florian Forster [Thu, 30 May 2013 06:26:09 +0000 (08:26 +0200)]
contrib/redhat/init.d-collectd: Rename variable to …PIDDIR.

Github: #298

11 years agoallow for non-root user to run script.
Fabien Wernli [Thu, 11 Apr 2013 08:43:29 +0000 (10:43 +0200)]
allow for non-root user to run script.
As collectdmon handles its pidfile, this would require to change
COLLECTMONPIDIR to something else than only-root writeable /var/run

Change-Id: I45d2de9dcc976f3b1e18cef5b6b78eeca1d270b2
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'yaccz/curl-status'
Florian Forster [Sun, 26 May 2013 15:35:17 +0000 (17:35 +0200)]
Merge branch 'yaccz/curl-status'

11 years agocurl plugin: Use cdtime to calculate response times.
Florian Forster [Sun, 26 May 2013 15:34:07 +0000 (17:34 +0200)]
curl plugin: Use cdtime to calculate response times.

11 years agocurl plugin: Don't abort when reading the response code failed.
Florian Forster [Sun, 26 May 2013 15:28:13 +0000 (17:28 +0200)]
curl plugin: Don't abort when reading the response code failed.

11 years agocurl plugin: Remove the curl-only auxiliary configuration functions.
Florian Forster [Sun, 26 May 2013 15:23:42 +0000 (17:23 +0200)]
curl plugin: Remove the curl-only auxiliary configuration functions.

11 years agocurl plugin: Fix compile issue (long vs. long*).
Florian Forster [Sun, 26 May 2013 15:22:48 +0000 (17:22 +0200)]
curl plugin: Fix compile issue (long vs. long*).

11 years agoMerge branch 'more-varnish-stats'
Florian Forster [Sat, 25 May 2013 18:20:48 +0000 (20:20 +0200)]
Merge branch 'more-varnish-stats'

11 years agosrc/configfile.c: Add the "AutoLoadPlugin" option.
Florian Forster [Sat, 25 May 2013 08:57:58 +0000 (10:57 +0200)]
src/configfile.c: Add the "AutoLoadPlugin" option.

When enabled, <Plugin ...> blocks will automatically load plugins.
Thanks to Tim Bunce for suggesting this!

Github: #333

11 years agosrc/plugin.c: Fix a comment regarding duplicate plugin_load() calls.
Florian Forster [Sat, 25 May 2013 08:32:23 +0000 (10:32 +0200)]
src/plugin.c: Fix a comment regarding duplicate plugin_load() calls.

11 years agosrc/plugin.c: Move the perl and python "global" magic to plugin_load().
Florian Forster [Sat, 25 May 2013 08:31:54 +0000 (10:31 +0200)]
src/plugin.c: Move the perl and python "global" magic to plugin_load().

The config file handling is really not the best place to have this. Also,
the feature I'm working on would have to copy this magic if left in the
config code, and I *really* don't want that.

11 years agocollectd.conf(5): Document the new "LoadPlugin" behavior.
Florian Forster [Sat, 25 May 2013 07:58:46 +0000 (09:58 +0200)]
collectd.conf(5): Document the new "LoadPlugin" behavior.

Github: #333

11 years agosrc/plugin.c: Make plugin_load() idempotent, i.e. don't load plugins twice.
Florian Forster [Sat, 25 May 2013 07:46:36 +0000 (09:46 +0200)]
src/plugin.c: Make plugin_load() idempotent, i.e. don't load plugins twice.

Previously, multiple 'LoadPlugin "foo"' lines would dlopen the same .so file
twice and call its module_register function twice. This would eventually result
in complaints about callbacks with the same name being registered. With this
patch each plugin is only loaded only once, allowing people to write "self
contained" configuration segments.

Thanks to Tim Bunce for suggesting this!

Github: #333

11 years agoMerge branch 'ef/mic'
Florian Forster [Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)]
Merge branch 'ef/mic'

11 years agoREADME: Document power consumption being collected by the mic plugin.
Florian Forster [Fri, 17 May 2013 14:45:30 +0000 (16:45 +0200)]
README: Document power consumption being collected by the mic plugin.

11 years agomic plugin: Fix indentation issue.
Florian Forster [Fri, 17 May 2013 14:44:02 +0000 (16:44 +0200)]
mic plugin: Fix indentation issue.

11 years agomic plugin: Change the name of the power settings …
Florian Forster [Fri, 17 May 2013 14:26:23 +0000 (16:26 +0200)]
mic plugin: Change the name of the power settings …

… to reflec the names documented in the manpage.

11 years agovarnish plugin: update config docs for new collectors
Nick Stenning [Fri, 17 May 2013 12:04:59 +0000 (13:04 +0100)]
varnish plugin: update config docs for new collectors

11 years agoDrop suffixes, now that we are putting them in correct types
Evan Felix [Thu, 16 May 2013 15:51:12 +0000 (08:51 -0700)]
Drop suffixes, now that we are putting them in correct types

11 years agoDo proper storage of power numbers, do conversion to base units.
Evan Felix [Thu, 16 May 2013 00:14:54 +0000 (17:14 -0700)]
Do proper storage of power numbers, do conversion to base units.

11 years agoAdd Documentaion for Power collection in the mic plugin
Evan Felix [Tue, 14 May 2013 22:13:04 +0000 (15:13 -0700)]
Add Documentaion for Power collection in the mic plugin

11 years agomic plugin: Code for power readings.
Evan Felix [Tue, 14 May 2013 18:07:46 +0000 (11:07 -0700)]
mic plugin: Code for power readings.

11 years agoadd MeasureResponseCode refs #319
Jan (yac) Matějka [Mon, 13 May 2013 13:55:59 +0000 (15:55 +0200)]
add MeasureResponseCode refs #319

11 years agocurl_xml plugin: Allow arbitrarily long callback names.
Florian Forster [Sun, 12 May 2013 10:21:07 +0000 (12:21 +0200)]
curl_xml plugin: Allow arbitrarily long callback names.

Fixes issue #286.

11 years agosrc/common.[ch]: Add the ssnprintf_alloc() function.
Florian Forster [Sun, 12 May 2013 10:17:47 +0000 (12:17 +0200)]
src/common.[ch]: Add the ssnprintf_alloc() function.

11 years agosrc/plugin.c: Allocate read-callback names on the heap.
Florian Forster [Sun, 12 May 2013 09:53:52 +0000 (11:53 +0200)]
src/plugin.c: Allocate read-callback names on the heap.

This allows to use arbitrarily long callback names.
Prerequisite for fixing #286.

11 years agocollectd.conf(5): Add documentation for the MIC plugin.
Florian Forster [Sat, 11 May 2013 08:59:02 +0000 (10:59 +0200)]
collectd.conf(5): Add documentation for the MIC plugin.

11 years agoconfigure.in: Remove the unused "plugin_mic" variable.
Florian Forster [Sat, 11 May 2013 08:11:24 +0000 (10:11 +0200)]
configure.in: Remove the unused "plugin_mic" variable.

11 years agomic plugin: Use the "core number" as plugin instance.
Florian Forster [Sat, 11 May 2013 07:55:09 +0000 (09:55 +0200)]
mic plugin: Use the "core number" as plugin instance.

Previously, per-core CPU statistics would be dispatched as (e.g.):

  <host>/mic-0/cpu-1-user

This makes graping hard, because it required to parse the type instance to
seperate out different graphs. The core number has therefore been moved to the
plugin instance, so the "mic" plugin behaves more like the "cpu" plugin, e.g.:

  <host>/mic-0-cpu-1/cpu-user

11 years agomic plugin: Some more coding style changes. Mostly breaking long lines.
Florian Forster [Sat, 11 May 2013 07:50:27 +0000 (09:50 +0200)]
mic plugin: Some more coding style changes. Mostly breaking long lines.

11 years agomic plugin: Remove the NUM_THERMS define.
Florian Forster [Sat, 11 May 2013 07:40:05 +0000 (09:40 +0200)]
mic plugin: Remove the NUM_THERMS define.

Also some coding style changes: Limit line length, move temporary variables
to an innter scope, print the temperature name in an error message (rather
than its ID).

11 years agoAUTHORS, README: Add Evan and the mic plugin.
Florian Forster [Sat, 11 May 2013 07:31:50 +0000 (09:31 +0200)]
AUTHORS, README: Add Evan and the mic plugin.

11 years agocleanup mic number initializing. Prefix Debug and error messages
Evan Felix [Fri, 10 May 2013 18:01:37 +0000 (11:01 -0700)]
cleanup mic number initializing. Prefix Debug and error messages

11 years agoUse proper values out of memory utilization
Evan Felix [Thu, 9 May 2013 23:24:33 +0000 (16:24 -0700)]
Use proper values out of memory utilization

11 years agoFix input parameter
Evan Felix [Thu, 9 May 2013 22:00:36 +0000 (15:00 -0700)]
Fix input parameter

11 years agoCleanup errors from upstream review, cleanup typeographical errors.
Evan Felix [Thu, 9 May 2013 21:30:19 +0000 (14:30 -0700)]
Cleanup errors from upstream review, cleanup typeographical errors.

11 years agohere's some bits to fix CFLAGS to CPPFLAGS
David Brown [Mon, 6 May 2013 23:02:19 +0000 (16:02 -0700)]
here's some bits to fix CFLAGS to CPPFLAGS

11 years agorework dependencies for mic plugin
Evan Felix [Fri, 26 Apr 2013 23:02:47 +0000 (16:02 -0700)]
rework dependencies for mic plugin

11 years agofix copy framework error
Evan Felix [Mon, 22 Apr 2013 23:44:33 +0000 (16:44 -0700)]
fix copy framework error

11 years agoAUTHORS, README: Add the "cgroups" plugin.
Florian Forster [Fri, 10 May 2013 07:05:03 +0000 (09:05 +0200)]
AUTHORS, README: Add the "cgroups" plugin.

11 years agocgroups plugin: Rename the "cgroups_cpuacct" plugin.
Florian Forster [Fri, 10 May 2013 07:04:27 +0000 (09:04 +0200)]
cgroups plugin: Rename the "cgroups_cpuacct" plugin.

The new name is sufficient and much easier to type / remember.

11 years agovarnish plugin: add missing fields
Nick Stenning [Tue, 7 May 2013 09:30:35 +0000 (10:30 +0100)]
varnish plugin: add missing fields

This commit adds a large number of fields exported by the varnish stats
interface which have not previously been collected. A number are still missing,
as it is not immediately obvious which stat group they should go in:

    accept_fail
    client_drop_late

and, from Varnish 3.X:

    vmods
    n_gzip
    n_gunzip

In addition, there are a number of fields which were added at the end of the 2.X
series, but in the absence of a way of detecting whether we're compiling against
2.0.X or 2.1.X, are necessarily disabled when compiling against 2.X:

    dir_dns_lookups
    dir_dns_failed
    dir_dns_hit
    dir_dns_cache_full
    backend_retry
    fetch_1xx
    fetch_204
    fetch_304

11 years agocollectd.conf(5): Fixed a typo (comma vs. dot) and markup fixes.
Florian Forster [Fri, 26 Apr 2013 14:25:37 +0000 (16:25 +0200)]
collectd.conf(5): Fixed a typo (comma vs. dot) and markup fixes.

11 years agosrc/types.db: Remove the unused "cpuacct" type.
Florian Forster [Fri, 26 Apr 2013 14:22:56 +0000 (16:22 +0200)]
src/types.db: Remove the unused "cpuacct" type.

11 years agocgroups_cpuacct plugin: Read file line-by-line.
Florian Forster [Fri, 26 Apr 2013 14:14:24 +0000 (16:14 +0200)]
cgroups_cpuacct plugin: Read file line-by-line.

Use the field name from the file as type instance when dispatching values.

11 years agovarnish plugin: missing definition in default config
Nick Stenning [Thu, 25 Apr 2013 12:14:31 +0000 (13:14 +0100)]
varnish plugin: missing definition in default config

11 years agoAdd config options
Evan Felix [Mon, 22 Apr 2013 15:04:50 +0000 (08:04 -0700)]
Add config options

11 years agoadd cpu stat gathering
Evan Felix [Fri, 19 Apr 2013 01:04:56 +0000 (18:04 -0700)]
add cpu stat gathering

11 years agoAdd Thermal gathering, and the config properly
Evan Felix [Thu, 18 Apr 2013 23:46:05 +0000 (16:46 -0700)]
Add Thermal gathering, and the config properly

11 years agoInitial implementation of build addition, and memory gathering for the mic card
Evan Felix [Thu, 18 Apr 2013 20:28:04 +0000 (13:28 -0700)]
Initial implementation of build addition, and memory gathering for the mic card

11 years agocgroups_cpuacct plugin: Re-indent read_cpuacct_root().
Florian Forster [Thu, 18 Apr 2013 10:12:40 +0000 (12:12 +0200)]
cgroups_cpuacct plugin: Re-indent read_cpuacct_root().

The rest of the file is indented using tabs.

11 years agocgroups_cpuacct plugin: Use type "cpu" to submit value lists.
Florian Forster [Thu, 18 Apr 2013 10:10:37 +0000 (12:10 +0200)]
cgroups_cpuacct plugin: Use type "cpu" to submit value lists.

11 years agocgroups_cpuacct plugin: Minor style fixes.
Florian Forster [Thu, 18 Apr 2013 10:05:12 +0000 (12:05 +0200)]
cgroups_cpuacct plugin: Minor style fixes.

* Avoid mixed declarations.
* Use parse_value() rather than atoll().
* Comment static arguments to walk_directory().
* Return an error if the read() function can't locate the cgroup
  mount point.

11 years agosrc/common.[ch]: read_file_contents: Use {s,}size_t rather than int.
Florian Forster [Thu, 18 Apr 2013 09:29:04 +0000 (11:29 +0200)]
src/common.[ch]: read_file_contents: Use {s,}size_t rather than int.

11 years agoAdd cgroups_cpuacct plugin to collect CPU user/system time per cgroup
Michael Stapelberg [Fri, 16 Dec 2011 20:10:05 +0000 (20:10 +0000)]
Add cgroups_cpuacct plugin to collect CPU user/system time per cgroup

This is handy for computers using systemd, as systemd puts each service
into a separate cgroup.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'cm/lvm'
Florian Forster [Wed, 17 Apr 2013 05:56:08 +0000 (07:56 +0200)]
Merge branch 'cm/lvm'

Github: #291
Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoAUTHORS, README: Add Chad and the LVM plugin.
Florian Forster [Wed, 17 Apr 2013 05:55:25 +0000 (07:55 +0200)]
AUTHORS, README: Add Chad and the LVM plugin.

11 years agoChanged plugin from volume to lvm
Chad Malfait [Sat, 13 Apr 2013 19:34:38 +0000 (13:34 -0600)]
Changed plugin from volume to lvm

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoRemoved un-needed files
Chad Malfait [Sat, 13 Apr 2013 17:30:55 +0000 (11:30 -0600)]
Removed un-needed files

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoamqp: add Graphite{SeparateInstances,AlwaysAppendDS} options
Laurent [Sun, 14 Apr 2013 10:23:32 +0000 (12:23 +0200)]
amqp: add Graphite{SeparateInstances,AlwaysAppendDS} options

11 years agovolume plugin: Fix a couple of issues from the code review.
Florian Forster [Sat, 13 Apr 2013 06:25:15 +0000 (08:25 +0200)]
volume plugin: Fix a couple of issues from the code review.

* Use df_complex as data type.
* Submit LV sizes and "free", but not "total" and "used".
* Fix error handling; don't use variable if it is NULL, remove calls to
  exit().

11 years agosnmp plugin: Removed "mixed delaration".
Florian Forster [Thu, 11 Apr 2013 15:09:11 +0000 (08:09 -0700)]
snmp plugin: Removed "mixed delaration".

This should fix this warning Fabien Wernli reported:
snmp.c:1381: warning: ISO C90 forbids mixed declarations and code

11 years agoChanged data type from vg to vol_group and lv to logical_vol to be more descriptive
Chad Malfait [Thu, 11 Apr 2013 05:48:38 +0000 (23:48 -0600)]
Changed data type from vg to vol_group and lv to logical_vol to be more descriptive

11 years agochanged symbol check for lvm2app
Chad Malfait [Thu, 11 Apr 2013 05:15:56 +0000 (23:15 -0600)]
changed symbol check for lvm2app

11 years agoadded missing comma to AC_CHECK_LIB for lvm2app
Chad Malfait [Thu, 11 Apr 2013 02:36:06 +0000 (20:36 -0600)]
added missing comma to AC_CHECK_LIB for lvm2app

11 years agoAdded logical volume size metrics
Chad Malfait [Thu, 11 Apr 2013 01:57:07 +0000 (19:57 -0600)]
Added logical volume size metrics

11 years agosrc/Makefile.am: Really don't distribute *.pb-c.[ch]. collectd-5.3.0
Florian Forster [Wed, 10 Apr 2013 15:38:48 +0000 (17:38 +0200)]
src/Makefile.am: Really don't distribute *.pb-c.[ch].

11 years agosrc/Makefile.am: Add *.proto to EXTRA_DIST. D'oh!
Florian Forster [Wed, 10 Apr 2013 14:54:27 +0000 (16:54 +0200)]
src/Makefile.am: Add *.proto to EXTRA_DIST. D'oh!

11 years agoBuild system: Don't ship the generated *.pb-c.[ch] files.
Florian Forster [Wed, 10 Apr 2013 14:46:14 +0000 (16:46 +0200)]
Build system: Don't ship the generated *.pb-c.[ch] files.

They depend on specific versions of the protobuf-c.h header file, so
shipping this will cause problems for people having a different version
of protoc-c installed. This reverts some of the work done in #269, but
distcheck should still work. Meh.

11 years agoRedHat RPM spec: updated for 5.3.0
Marc Fournier [Wed, 10 Apr 2013 12:39:13 +0000 (14:39 +0200)]
RedHat RPM spec: updated for 5.3.0

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoconfigure.in: Fix libgcrypt flags on FreeBSD.
Florian Forster [Wed, 10 Apr 2013 02:33:23 +0000 (04:33 +0200)]
configure.in: Fix libgcrypt flags on FreeBSD.

On FreeBSD, AM_PATH_LIBGCRYPT sets LIBGCRYPT_CFLAGS but not
LIBGCRYPT_CPPFLAGS. Use both variables to be on the save side.

11 years agoBump version to 5.3.0; Update ChangeLog.
Florian Forster [Wed, 10 Apr 2013 02:08:59 +0000 (19:08 -0700)]
Bump version to 5.3.0; Update ChangeLog.

11 years agoMerge branch 'collectd-5.2'
Florian Forster [Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)]
Merge branch 'collectd-5.2'

11 years agoBump version to 5.2.2; Update ChangeLog. collectd-5.2.2
Florian Forster [Tue, 9 Apr 2013 00:59:28 +0000 (17:59 -0700)]
Bump version to 5.2.2; Update ChangeLog.

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Tue, 9 Apr 2013 00:55:06 +0000 (17:55 -0700)]
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
ChangeLog
version-gen.sh

11 years agoBump version to 5.1.3; Update ChangeLog. collectd-5.1.3
Florian Forster [Tue, 9 Apr 2013 00:54:19 +0000 (17:54 -0700)]
Bump version to 5.1.3; Update ChangeLog.