collectd.git
11 years agowrite_riemann plugin: Remove the "Delay" option.
Florian Forster [Fri, 18 Jan 2013 10:55:53 +0000 (11:55 +0100)]
write_riemann plugin: Remove the "Delay" option.

11 years agodbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().
Florian Forster [Fri, 18 Jan 2013 10:42:40 +0000 (11:42 +0100)]
dbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().

11 years agoAdd Hostname option to dbi plugin. Use cdbi_config_set_string and fix udb_query_prepa...
Daniel Hilst [Thu, 3 Jan 2013 20:09:03 +0000 (18:09 -0200)]
Add Hostname option to dbi plugin. Use cdbi_config_set_string and fix udb_query_prepare_result argument

11 years agoAdd Hostname option to Database block of dbi plugin
Daniel Hilst [Thu, 3 Jan 2013 19:57:16 +0000 (17:57 -0200)]
Add Hostname option to Database block of dbi plugin

11 years agowrite_riemann plugin: Remove unused defines.
Florian Forster [Fri, 18 Jan 2013 10:37:34 +0000 (11:37 +0100)]
write_riemann plugin: Remove unused defines.

11 years agocollectd.conf(5): Add documentation for the write_riemann plugin.
Florian Forster [Thu, 17 Jan 2013 13:07:12 +0000 (14:07 +0100)]
collectd.conf(5): Add documentation for the write_riemann plugin.

11 years agowrite_riemann plugin: Unify the plugin's configuration semantic.
Florian Forster [Thu, 17 Jan 2013 12:37:09 +0000 (13:37 +0100)]
write_riemann plugin: Unify the plugin's configuration semantic.

The "write_mongodb" and "write_redis" plugins follow the same general
config schema, i.e. <Node /> blocks with "Host" and "Port" options.
Adapt the same style for "write_riemann".

11 years agowrite_graphite plugin: Remove two more redundant error messages.
Florian Forster [Thu, 17 Jan 2013 09:50:08 +0000 (10:50 +0100)]
write_graphite plugin: Remove two more redundant error messages.

The failing functions already print an error message; don't spam the logs
by duplicating this.

Further fixes Github issue #236.

11 years agosrc/utils_complain.[ch]: Fix the complaint mechanism after the sub-second change.
Florian Forster [Thu, 17 Jan 2013 09:48:45 +0000 (10:48 +0100)]
src/utils_complain.[ch]: Fix the complaint mechanism after the sub-second change.

11 years agowrite_graphite: Use the complain mechanism to report connection errors.
Florian Forster [Thu, 17 Jan 2013 08:51:56 +0000 (09:51 +0100)]
write_graphite: Use the complain mechanism to report connection errors.

Fixes Github issue #236. Thanks to @pyr for reporting it!

11 years agosrc/collectd.conf.in: Rename "riemann" to "write_riemann".
Florian Forster [Thu, 17 Jan 2013 08:46:20 +0000 (09:46 +0100)]
src/collectd.conf.in: Rename "riemann" to "write_riemann".

11 years agowrite_riemann plugin: Ensure a unified logging prefix.
Florian Forster [Thu, 17 Jan 2013 08:28:24 +0000 (09:28 +0100)]
write_riemann plugin: Ensure a unified logging prefix.

11 years agowrite_riemann plugin: Rename the "riemann" plugin.
Florian Forster [Wed, 16 Jan 2013 21:00:11 +0000 (22:00 +0100)]
write_riemann plugin: Rename the "riemann" plugin.

11 years agoriemann plugin: Clean up the riemann_connect() function.
Florian Forster [Wed, 16 Jan 2013 20:50:37 +0000 (21:50 +0100)]
riemann plugin: Clean up the riemann_connect() function.

Don't warn when connecting to some address fails. The system could, for
example, not have any IPv6 connectivity but the address record also
includes an IPv6 address. In this case a connect(2) call will fail but
this is not a problem.

Due to the new locking one of the concurrency checks was made redundant.

11 years agoMerge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
Florian Forster [Wed, 16 Jan 2013 12:26:46 +0000 (13:26 +0100)]
Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2

11 years agowrite_graphite: Decrease a buffer size.
Florian Forster [Wed, 16 Jan 2013 12:18:32 +0000 (13:18 +0100)]
write_graphite: Decrease a buffer size.

If the buffer is too large, it is possible that the message cannot be
send using the send buffer, leading to a failed assertion in
wg_send_message().

Fixes Github issue #226. Thanks to @bwhaley for reporting this.

11 years agoLook for IOPowerSources.h on Darwin only
Ruben Kerkhof [Mon, 19 Nov 2012 11:54:06 +0000 (12:54 +0100)]
Look for IOPowerSources.h on Darwin only

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agodbi plugin: Implement support for numeric options.
Florian Forster [Wed, 16 Jan 2013 11:36:51 +0000 (12:36 +0100)]
dbi plugin: Implement support for numeric options.

Fixes Github issue #233.

11 years agoMerge branch 'collectd-5.2'
Florian Forster [Mon, 14 Jan 2013 09:53:29 +0000 (10:53 +0100)]
Merge branch 'collectd-5.2'

11 years agoMerge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2

11 years agoMerge branch 'collectd-4.10' into collectd-5.1
Florian Forster [Mon, 14 Jan 2013 09:53:13 +0000 (10:53 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1

11 years agodbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().
Florian Forster [Mon, 14 Jan 2013 09:48:03 +0000 (10:48 +0100)]
dbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().

11 years agoFixed a small typo in the ethstat plugin
Jeff Schroeder [Mon, 31 Dec 2012 17:48:25 +0000 (11:48 -0600)]
Fixed a small typo in the ethstat plugin

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge remote-tracking branch 'github-octo/pyr/riemann' into pyr/riemann
Florian Forster [Mon, 14 Jan 2013 08:49:17 +0000 (09:49 +0100)]
Merge remote-tracking branch 'github-octo/pyr/riemann' into pyr/riemann

11 years agoriemann plugin: Implement the "StoreRates" option.
Florian Forster [Sun, 13 Jan 2013 22:14:13 +0000 (23:14 +0100)]
riemann plugin: Implement the "StoreRates" option.

11 years agoethstat plugin: Fix the map lookup.
Florian Forster [Fri, 11 Jan 2013 18:45:43 +0000 (19:45 +0100)]
ethstat plugin: Fix the map lookup.

Previously, a pointer into the configuration structure was used to look
up the mappings. Because the configuration structure is freed or
otherwise modified, this does not work as intended (and may actually
lead to a segmentation fault when unlucky).

For completeness sake, a shutdown callback was added to free the used
memory on exit.

Fixes Github issue 224.

11 years agoriemann plugin: Use the new strarray interface to allow indefinite number of tags.
Florian Forster [Fri, 11 Jan 2013 12:43:59 +0000 (13:43 +0100)]
riemann plugin: Use the new strarray interface to allow indefinite number of tags.

11 years agosrc/common.[ch]: Implement strarray_{add,free}.
Florian Forster [Fri, 11 Jan 2013 13:56:35 +0000 (14:56 +0100)]
src/common.[ch]: Implement strarray_{add,free}.

11 years agoriemann plugin: Fix two minor bugs.
Florian Forster [Fri, 11 Jan 2013 10:52:14 +0000 (11:52 +0100)]
riemann plugin: Fix two minor bugs.

11 years agoriemann plugin: Fix a double-free issue with the shared structure.
Florian Forster [Fri, 11 Jan 2013 10:30:14 +0000 (11:30 +0100)]
riemann plugin: Fix a double-free issue with the shared structure.

The reference to the riemann_host structure is shared between the write
and the notification callback. Upon exit, riemann_free() is called twice,
via the user_data_t structure passed to the register functions. Previously
this would have caused a double-free, which is unacceptable.

This patch introduces a reference counter and will only free the structure
(and close the socket) when the last reference is freed.

The locking has been moved out of the riemann_connect() function and into
the riemann_send() function. It is unlikely, but not impossible that two
threads interfere with each other when writing to the socket.

11 years agoRedHat RPM spec: remove unnecessary dependency on libstatgrab
Marc Fournier [Fri, 11 Jan 2013 10:23:52 +0000 (11:23 +0100)]
RedHat RPM spec: remove unnecessary dependency on libstatgrab

11 years agoriemann plugin: Add support for service names.
Florian Forster [Fri, 11 Jan 2013 09:33:36 +0000 (10:33 +0100)]
riemann plugin: Add support for service names.

I.e. you can not define a "riemann" service in /etc/services and then use
«Port "riemann"» in the configuration. Also add support for arbitrarily
long host names.

11 years agoriemann plugin: Move the creation of protobufs into their own function.
Florian Forster [Thu, 10 Jan 2013 10:40:58 +0000 (11:40 +0100)]
riemann plugin: Move the creation of protobufs into their own function.

This also adds a couple more tags, e.g. "type:..." and so on. The "host"
field is now correctly populated from the vl->host or n->host field.

11 years agoriemann plugin: Make all private funcitons and module-global variables "static".
Florian Forster [Wed, 9 Jan 2013 10:19:57 +0000 (11:19 +0100)]
riemann plugin: Make all private funcitons and module-global variables "static".

11 years agoriemann plugin: Remove trailing white-space.
Florian Forster [Wed, 9 Jan 2013 10:18:34 +0000 (11:18 +0100)]
riemann plugin: Remove trailing white-space.

11 years agoriemann plugin: Improve the riemann_send() function.
Florian Forster [Wed, 9 Jan 2013 10:18:05 +0000 (11:18 +0100)]
riemann plugin: Improve the riemann_send() function.

Make the passed in "Msg*" const, use swrite() to make sure the entire
buffer is sent and break out the disconnect logic into an own function.

11 years agotake into account PR comments from @octo
Pierre-Yves Ritschard [Wed, 9 Jan 2013 09:02:50 +0000 (10:02 +0100)]
take into account PR comments from @octo

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoadd support for notifications as well
Pierre-Yves Ritschard [Fri, 28 Dec 2012 20:51:12 +0000 (21:51 +0100)]
add support for notifications as well

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoRiemann UDP write plugin
Pierre-Yves Ritschard [Fri, 21 Dec 2012 21:26:02 +0000 (22:26 +0100)]
Riemann UDP write plugin

First implementation of a riemann plugin.
This is basic for now and only support
sending to a UDP target, later work will
include notification support and service
rewriting.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoRedHat RPM spec: bump release number
Marc Fournier [Fri, 4 Jan 2013 09:00:59 +0000 (10:00 +0100)]
RedHat RPM spec: bump release number

11 years agoRedHat RPM spec: package php-collection/collection3 independently
Marc Fournier [Thu, 3 Jan 2013 17:10:19 +0000 (18:10 +0100)]
RedHat RPM spec: package php-collection/collection3 independently

11 years agoredhat/collectd.spec - typo.
Marc Fournier [Thu, 3 Jan 2013 15:19:51 +0000 (16:19 +0100)]
redhat/collectd.spec - typo.

11 years agoRedHat specfile: updated for 5.2.0
Marc Fournier [Fri, 21 Dec 2012 15:55:15 +0000 (16:55 +0100)]
RedHat specfile: updated for 5.2.0

Also includes a couple of cleanups mentioned in github#186.

11 years agoRemove the redundant and little used STATIC_ARRAY_LEN() macro.
Florian Forster [Fri, 14 Dec 2012 10:40:41 +0000 (11:40 +0100)]
Remove the redundant and little used STATIC_ARRAY_LEN() macro.

11 years agoapcups plugin: Implement the "ReportSeconds" option.
Florian Forster [Fri, 14 Dec 2012 10:40:12 +0000 (11:40 +0100)]
apcups plugin: Implement the "ReportSeconds" option.

11 years agosrc/types.db: Remove the maximum value from "timeleft".
Florian Forster [Thu, 13 Dec 2012 08:55:04 +0000 (09:55 +0100)]
src/types.db: Remove the maximum value from "timeleft".

11 years agoformat_graphite: Implement the "separate instances" and "always append ds" options.
Florian Forster [Thu, 13 Dec 2012 08:52:22 +0000 (09:52 +0100)]
format_graphite: Implement the "separate instances" and "always append ds" options.

Fixes Github issue #214.

11 years agoMerge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
Florian Forster [Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)]
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2

11 years agoFix when gcrypt.h is missing (libcollectdclient)
Yves Mettier [Wed, 21 Nov 2012 10:41:10 +0000 (11:41 +0100)]
Fix when gcrypt.h is missing (libcollectdclient)

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFix for nanosleep missing on Solaris
Yves Mettier [Wed, 21 Nov 2012 10:40:42 +0000 (11:40 +0100)]
Fix for nanosleep missing on Solaris

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agopostgresql plugin: Fixed a memory leak occurring on every (successful) write.
Sebastian Harl [Thu, 29 Nov 2012 08:01:37 +0000 (09:01 +0100)]
postgresql plugin: Fixed a memory leak occurring on every (successful) write.

11 years agozfs_arc plugin: Fix the type used for mutex misses.
Florian Forster [Thu, 29 Nov 2012 06:58:25 +0000 (07:58 +0100)]
zfs_arc plugin: Fix the type used for mutex misses.

Thanks to Yves Mettier for pointing this out!

11 years agoUpdating data source for collectd v5, see https://collectd.org/wiki/index.php/V4_to_v...
Zuhaib M Siddique [Tue, 13 Nov 2012 03:15:48 +0000 (19:15 -0800)]
Updating data source for collectd v5, see https://collectd.org/wiki/index.php/V4_to_v5_migration_guide

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'sh/config-include'
Florian Forster [Wed, 28 Nov 2012 09:16:26 +0000 (10:16 +0100)]
Merge branch 'sh/config-include'

11 years agoconfigfile: Free a string buffer returned by cf_util_get_string().
Sebastian Harl [Wed, 28 Nov 2012 08:44:59 +0000 (09:44 +0100)]
configfile: Free a string buffer returned by cf_util_get_string().

11 years agoconfig: Implemented include filter pattern as sub-option in a <Include> block.
Sebastian Harl [Wed, 28 Nov 2012 08:32:43 +0000 (09:32 +0100)]
config: Implemented include filter pattern as sub-option in a <Include> block.

This has the advantage of being more easy to read/understand and also being
more flexible. E.g. multiple filters and other options may be specified in the
future.

Thanks to octo for suggesting this!

11 years agoMerge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
Florian Forster [Wed, 28 Nov 2012 07:17:39 +0000 (08:17 +0100)]
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2

11 years agovarnish plugin: Make sure the argument passed to VSM_n_Arg() is not NULL.
Florian Forster [Wed, 28 Nov 2012 07:15:29 +0000 (08:15 +0100)]
varnish plugin: Make sure the argument passed to VSM_n_Arg() is not NULL.

Fixes Github issue 202.

11 years agoAdd missing "Graphite" to the amqp format list.
Bernd Ahlers [Tue, 27 Nov 2012 08:42:41 +0000 (09:42 +0100)]
Add missing "Graphite" to the amqp format list.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoaggregation plugin: Make it possible to set parts of the identifier.
Florian Forster [Mon, 26 Nov 2012 10:30:25 +0000 (11:30 +0100)]
aggregation plugin: Make it possible to set parts of the identifier.

11 years agoconfig: Added support for specifying include filter patterns.
Sebastian Harl [Sat, 24 Nov 2012 09:26:20 +0000 (10:26 +0100)]
config: Added support for specifying include filter patterns.

An optional second argument may now be passed to the "Include" configuration
option. If specified (and if the fnmatch() function was available at build
time), only files matching this pattern will be included. For example, the
following will include all files matching "*.conf" in any subdirectory of
/etc/collectd.d/:

  Include "/etc/collectd.d" "*.conf"

This is useful, e.g. for distributions in order to include a possibly empty
directory in the default configuration including all subdirectories but also
making it possible to ship further documents like README files.

11 years agocollectd.conf: Added example PostgreSQL writer configuration.
Sebastian Harl [Tue, 20 Nov 2012 12:13:01 +0000 (13:13 +0100)]
collectd.conf: Added example PostgreSQL writer configuration.

11 years agocollectd.conf: Added a short explanation to the 'Interval' setting.
Sebastian Harl [Tue, 20 Nov 2012 12:07:16 +0000 (13:07 +0100)]
collectd.conf: Added a short explanation to the 'Interval' setting.

… mentioning the per-plugin interval setting.

11 years agoREADME: Added 'pf' and 'aggregation' plugins.
Sebastian Harl [Tue, 20 Nov 2012 11:41:27 +0000 (12:41 +0100)]
README: Added 'pf' and 'aggregation' plugins.

11 years agosrc/utils_vl_lookup.[ch]: Support selecting values by regex.
Florian Forster [Mon, 19 Nov 2012 21:37:18 +0000 (22:37 +0100)]
src/utils_vl_lookup.[ch]: Support selecting values by regex.

The name generated by the Aggregation plugin currently includes the
regular expression, which is suboptimal. We need to come up with something
clever there I guess.

11 years agofix redis default node initialization
Pierre-Yves Ritschard [Mon, 19 Nov 2012 13:34:04 +0000 (14:34 +0100)]
fix redis default node initialization

unbreak redis plugin build

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agocollectd-tg(1): Add manpage.
Florian Forster [Mon, 19 Nov 2012 15:29:24 +0000 (16:29 +0100)]
collectd-tg(1): Add manpage.

11 years agoAllow for conditional compilation of plugins
Ruben Kerkhof [Sun, 18 Nov 2012 14:56:31 +0000 (15:56 +0100)]
Allow for conditional compilation of plugins

To enable/disable a plugin you can toggle the
%define for that plugin at the top of the specfile.
You can also pass the plugin as argument to rpmbuild,
for example:
rpmbuild -ba --without rrdtool
or:
rpmbuild -ba --with rrdcached

11 years agoQuote arguments
Ruben Kerkhof [Sun, 18 Nov 2012 10:44:51 +0000 (11:44 +0100)]
Quote arguments

11 years agoNo need to edit collectd.conf anymore.
Ruben Kerkhof [Sun, 18 Nov 2012 09:14:29 +0000 (10:14 +0100)]
No need to edit collectd.conf anymore.

This was fixed by in commit 25fa4ad

11 years agoFollow Fedora Packaging Guidelines in java subpackage
Ruben Kerkhof [Sun, 18 Nov 2012 09:03:17 +0000 (10:03 +0100)]
Follow Fedora Packaging Guidelines in java subpackage

11 years agoCleanup redhat specfile
Ruben Kerkhof [Sat, 17 Nov 2012 14:39:29 +0000 (15:39 +0100)]
Cleanup redhat specfile

Fixed a few rpmlint warnings
Updated (mostly) to Fedora Packaging Guidelines

11 years agoRedHat RPM spec: update for 5.1 + improvements
Marc Fournier [Fri, 16 Nov 2012 15:06:18 +0000 (16:06 +0100)]
RedHat RPM spec: update for 5.1 + improvements

  * Enabled all buildable plugins based on libraries available on EL6 +
    EPEL
  * All plugins requiring external libraries are now shipped in seperate
    packages.
  * No longer treat Java plugin as an exception, correctly set
    $JAVA_HOME during the build process + ensure build deps are installed.
  * Dropped per-plugin configuration files, as they tend to diverge from
    upstream defaults.
  * Moved perl stuff to /usr/share/perl5/
  * Don't alter Interval and ReadThreads by default, let the user change
    this himself.
  * Drop collection.cgi from main package, as it's been obsoleted by
    collection3
  * Moved contrib/ to its own package, to avoid cluttering the main
    package with non-essential stuff.
  * Replaced BuildPrereq by BuildRequires

11 years agoRedHat initscript: small improvements
Marc Fournier [Fri, 16 Nov 2012 15:03:41 +0000 (16:03 +0100)]
RedHat initscript: small improvements

  * checks configuration before (re)starting, based on debian's
    initscript
  * use /etc/sysconfig instdead of /etc/default
  * include optional $ARGS in arguments passed to collectd.

11 years agocollectd.conf(5): Add the per-plugin interval to the synopsis.
Florian Forster [Sat, 17 Nov 2012 23:24:09 +0000 (00:24 +0100)]
collectd.conf(5): Add the per-plugin interval to the synopsis.

11 years agoFix java detection as unprivileged user. collectd-5.2.0
Ruben Kerkhof [Sat, 17 Nov 2012 17:19:58 +0000 (18:19 +0100)]
Fix java detection as unprivileged user.

If you have an inaccessible directory inside
JAVA_HOME, find returns an error and the test fails.

I found this on Fedora, where /usr/lib64/audit is only
readable by root, and my JAVA_HOME was set to /usr

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoFix building of java binding
Ruben Kerkhof [Sat, 17 Nov 2012 17:43:52 +0000 (18:43 +0100)]
Fix building of java binding

Caused by d327beed4d1541d883c4823485b381d1dff79039

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/libcollectdclient/Makefile.am: Fix typo.
Florian Forster [Sat, 17 Nov 2012 12:43:32 +0000 (13:43 +0100)]
src/libcollectdclient/Makefile.am: Fix typo.

11 years agosrc/libcollectdclient/Makefile.am: Add "collectd/network.h".
Florian Forster [Sat, 17 Nov 2012 12:25:27 +0000 (13:25 +0100)]
src/libcollectdclient/Makefile.am: Add "collectd/network.h".

11 years agoBump version to 5.2.0; Update ChangeLog.
Florian Forster [Sat, 17 Nov 2012 12:12:42 +0000 (13:12 +0100)]
Bump version to 5.2.0; Update ChangeLog.

11 years agosrc/libcollectdclient/network.c: Fix the build on FreeBSD.
Ed Schouten [Sat, 17 Nov 2012 09:47:07 +0000 (10:47 +0100)]
src/libcollectdclient/network.c: Fix the build on FreeBSD.

On FreeBSD, we have to include <netinet/in.h> to get IN_MULTICAST(). We
don't need to include anything extra, as according to POSIX,
<netinet/in.h> also exposes htonl(). There is no need to include
<arpa/inet.h>.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/libcollectdclient/network_buffer.c: Fix gcrypt build on FreeBSD.
Ed Schouten [Sat, 17 Nov 2012 09:44:48 +0000 (10:44 +0100)]
src/libcollectdclient/network_buffer.c: Fix gcrypt build on FreeBSD.

As with src/network.c, we need to ensure that we define
GCRYPT_NO_DEPRECATED on FreeBSD to get rid of the compiler warnings
emitted by the header file.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoMerge branch 'collectd-5.1'
Florian Forster [Sat, 17 Nov 2012 11:41:34 +0000 (12:41 +0100)]
Merge branch 'collectd-5.1'

11 years agoMerge remote-tracking branch 'origin/master'
Florian Forster [Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)]
Merge branch 'collectd-5.0' into collectd-5.1

11 years agoMerge branch 'collectd-4.10' into collectd-5.0 collectd-5.0
Florian Forster [Sat, 17 Nov 2012 11:41:00 +0000 (12:41 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

11 years agofixed paths in example configuration file
Marc Fournier [Fri, 16 Nov 2012 11:12:19 +0000 (12:12 +0100)]
fixed paths in example configuration file

These paths previously got expanded to:
  #BaseDir "/usr/var/lib/collectd"
instead of:
  #BaseDir "/var/lib/collectd"

And on systems which put libs in /usr/lib64:
  #PluginDir   "/usr/lib/collectd"
instead of:
  #PluginDir   "/usr/lib64/collectd"

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agolcc_features.h: Relicense under the MIT license.
Sebastian Harl [Sat, 17 Nov 2012 09:32:25 +0000 (10:32 +0100)]
lcc_features.h: Relicense under the MIT license.

11 years agosrc/libcollectdclient/network_buffer.c: Copy gcrypt import magic from the network...
Florian Forster [Sat, 17 Nov 2012 09:28:46 +0000 (10:28 +0100)]
src/libcollectdclient/network_buffer.c: Copy gcrypt import magic from the network plugin.

11 years agolibcollectdclient: Update to the high-resolution time format.
Florian Forster [Sat, 17 Nov 2012 09:23:39 +0000 (10:23 +0100)]
libcollectdclient: Update to the high-resolution time format.

11 years agoMerge branch 'sr/pf'
Florian Forster [Sat, 17 Nov 2012 08:42:55 +0000 (09:42 +0100)]
Merge branch 'sr/pf'

11 years agoMerge branch 'sh/postgresql-writer'
Florian Forster [Sat, 17 Nov 2012 08:39:33 +0000 (09:39 +0100)]
Merge branch 'sh/postgresql-writer'

Conflicts:
src/collectd.conf.pod
src/postgresql.c

11 years agoMerge branch 'sh/postgres-queries'
Florian Forster [Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)]
Merge branch 'sh/postgres-queries'

11 years agoMerge branch 'libvirt-interfacenumber'
Florian Forster [Sat, 17 Nov 2012 08:11:52 +0000 (09:11 +0100)]
Merge branch 'libvirt-interfacenumber'

11 years agoGenericJMXConfConnection: Automatically determine the host name.
Florian Forster [Sat, 17 Nov 2012 07:55:29 +0000 (08:55 +0100)]
GenericJMXConfConnection: Automatically determine the host name.

Fixes Github issue #182.

11 years agolibcollectdclient: Relicense under the MIT license.
Florian Forster [Sat, 17 Nov 2012 07:42:38 +0000 (08:42 +0100)]
libcollectdclient: Relicense under the MIT license.

11 years agoMerge branch 'ff/netlib'
Florian Forster [Sat, 17 Nov 2012 07:25:01 +0000 (08:25 +0100)]
Merge branch 'ff/netlib'

Conflicts:
src/collectdctl.c
src/libcollectdclient/client.c
src/libcollectdclient/collectd/client.h

11 years agosrc/network.c: Fix the build on FreeBSD.
Ed Schouten [Fri, 16 Nov 2012 20:58:46 +0000 (21:58 +0100)]
src/network.c: Fix the build on FreeBSD.

<gcrypt.h> accepts a definition called GCRYPT_NO_DEPRECATED to disable
deprecated functionality. Unfortunately, this definition is not
sufficient to suppress all warnings. However, FreeBSD's version of
libgcrypt has been fixed to properly remove all deprecated features.

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agosrc/plugin.c: Replace the last use of "interval_g" in this file.
Florian Forster [Fri, 16 Nov 2012 07:12:15 +0000 (08:12 +0100)]
src/plugin.c: Replace the last use of "interval_g" in this file.

11 years agoMerge branch 'sh/plugin_interval'
Florian Forster [Fri, 16 Nov 2012 06:53:27 +0000 (07:53 +0100)]
Merge branch 'sh/plugin_interval'

Conflicts:
src/amqp.c
src/exec.c
src/memcached.c
src/unixsock.c