Code

collectd.git
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 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 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
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

11 years agocollectd_insert.sql: Use timestamptz rather than timestamp.
Sebastian Harl [Thu, 15 Nov 2012 14:14:45 +0000 (15:14 +0100)]
collectd_insert.sql: Use timestamptz rather than timestamp.

Don't want to get messed-up values after daylight-savings changes.

11 years agoutils_time: cdtime_to_iso8601(): Include timezone information as well.
Sebastian Harl [Thu, 15 Nov 2012 14:14:10 +0000 (15:14 +0100)]
utils_time: cdtime_to_iso8601(): Include timezone information as well.

11 years agosrc/configfile.[ch]: Implement the cf_get_default_interval() function.
Florian Forster [Thu, 15 Nov 2012 12:55:04 +0000 (13:55 +0100)]
src/configfile.[ch]: Implement the cf_get_default_interval() function.

This should be able to replace "interval_g" in a global (i.e. non-plugin)
context, such as the interval in which timeouts are being checked.

The default value (10 seconds) is also configurable at compile time using
a define.

11 years agopostgresql plugin: Simplified transaction handling a bit.
Sebastian Harl [Thu, 15 Nov 2012 12:42:29 +0000 (13:42 +0100)]
postgresql plugin: Simplified transaction handling a bit.

Don't set any next commit time after committing a transaction but only when
starting a new transaction. This way, db->next_commit == 0 always means that
we're outside of a transaction. Also, this removes the need to restart a
transaction right away. Rather, the write callback will take care of that the
next time it gets any data.

11 years agocollectd.conf(5): Documented the postgresql FLUSH support.
Sebastian Harl [Thu, 15 Nov 2012 12:36:52 +0000 (13:36 +0100)]
collectd.conf(5): Documented the postgresql FLUSH support.

11 years agopostgresql plugin: Added support for "flushing" data.
Sebastian Harl [Thu, 15 Nov 2012 12:29:20 +0000 (13:29 +0100)]
postgresql plugin: Added support for "flushing" data.

This may be used to commit a PostgreSQL writer's transaction. Two different
types of flush callbacks are registered:

 - postgresql: Flush *all* databases.
 - postgresql-<database>: Flush the database named '<database>' only.

11 years agopostgresql plugin: Fixed unregistering of write callbacks.
Sebastian Harl [Thu, 15 Nov 2012 09:04:46 +0000 (10:04 +0100)]
postgresql plugin: Fixed unregistering of write callbacks.

Rather than unregistering some callback for each writer for each database,
unregister the single callback for each database only.

11 years agopostgresql plugin: Unregister all writers on shutdown.
Sebastian Harl [Thu, 15 Nov 2012 06:43:02 +0000 (07:43 +0100)]
postgresql plugin: Unregister all writers on shutdown.

This will make sure that all pending transactions will be committed. Else, the
open transactions would be rolled back by the PostgreSQL backend when closing
the connection.

In order to do so, all database connections are now stored in a plugin-global
array (this will also make further changes possible). Also, a ref-count has
been added to the database object in order to support "deleting" an object
twice when having it in use by a connection doing queries and writes.

12 years agopostgresql plugin: Commit a transaction before shutting down a connection.
Sebastian Harl [Wed, 14 Nov 2012 20:11:36 +0000 (21:11 +0100)]
postgresql plugin: Commit a transaction before shutting down a connection.

Also, make sure to acquire the database lock before that in order to wait for,
for example, outstanding writers.

12 years agopostgresql plugin: Don't try to restart a failed transaction when there's none.
Sebastian Harl [Wed, 14 Nov 2012 20:08:42 +0000 (21:08 +0100)]
postgresql plugin: Don't try to restart a failed transaction when there's none.

12 years agopostgresql plugin: Restart a writer transaction if the writer's query failed.
Sebastian Harl [Wed, 14 Nov 2012 19:05:33 +0000 (20:05 +0100)]
postgresql plugin: Restart a writer transaction if the writer's query failed.

The failed query inside the transaction causes the transaction to be aborted
and all subsequent queries to fail as well.

12 years agocollectd.conf(5): Documented the postgresql <Database> 'Writer' option.
Sebastian Harl [Wed, 14 Nov 2012 18:58:25 +0000 (19:58 +0100)]
collectd.conf(5): Documented the postgresql <Database> 'Writer' option.

12 years agocollectd.conf(5): Documented the "CommitInterval" option of 'postgresql'.
Sebastian Harl [Wed, 14 Nov 2012 18:51:41 +0000 (19:51 +0100)]
collectd.conf(5): Documented the "CommitInterval" option of 'postgresql'.

12 years agocollectd_insert.sql: Let values_update_childs() return table names.
Sebastian Harl [Wed, 14 Nov 2012 18:36:00 +0000 (19:36 +0100)]
collectd_insert.sql: Let values_update_childs() return table names.

The function will now return a set of the names of child tables that have been
created.

12 years agocollectd_insert.sql: Added view 'collectd'.
Sebastian Harl [Thu, 25 Oct 2012 10:37:02 +0000 (12:37 +0200)]
collectd_insert.sql: Added view 'collectd'.

This view provides a join of the 'identifiers' and 'values' tables plus an
additional column with the serialized collectd identifier.

12 years agopostgresql plugin: Added 'CommitInterval' config option.
Sebastian Harl [Thu, 25 Oct 2012 09:00:09 +0000 (11:00 +0200)]
postgresql plugin: Added 'CommitInterval' config option.

If specified, this option causes a writer to put several updates into a single
transaction. This transaction will last for the specified amount of time (in
seconds). By default, each update would be executed in a separate transaction
causing quite some overhead.

12 years agocollectd-perl(5): Don't actually use $interval_g in any examples.
Sebastian Harl [Wed, 14 Nov 2012 18:19:54 +0000 (19:19 +0100)]
collectd-perl(5): Don't actually use $interval_g in any examples.

12 years agocollectd-perl(5): Mention that $interval_g should not be used.
Sebastian Harl [Wed, 14 Nov 2012 18:19:05 +0000 (19:19 +0100)]
collectd-perl(5): Mention that $interval_g should not be used.

12 years agoperl plugin: Emit a warning when accessing $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 18:08:30 +0000 (19:08 +0100)]
perl plugin: Emit a warning when accessing $interval_g.

Rather, point to plugin_get_interval().

12 years agoperl plugin: Simplified $interval_g implementation.
Sebastian Harl [Wed, 14 Nov 2012 18:05:10 +0000 (19:05 +0100)]
perl plugin: Simplified $interval_g implementation.

Don't pass any pointers to interval_g around just in order to later
dereference them. There's just no reason to do so ;-)

12 years agoCollectd.pm: Use plugin_get_interval() rather than $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 18:00:25 +0000 (19:00 +0100)]
Collectd.pm: Use plugin_get_interval() rather than $interval_g.

12 years agoCollectd::Plugins::OpenVZ: Use plugin_get_interval() rather than $interval_g.
Sebastian Harl [Wed, 14 Nov 2012 17:58:01 +0000 (18:58 +0100)]
Collectd::Plugins::OpenVZ: Use plugin_get_interval() rather than $interval_g.

12 years agoperl plugin: Export plugin_get_interval() to Perl plugins.
Sebastian Harl [Wed, 14 Nov 2012 17:55:43 +0000 (18:55 +0100)]
perl plugin: Export plugin_get_interval() to Perl plugins.

12 years agosrc/plugin.c: Report an error if ctx.interval is not set.
Florian Forster [Wed, 14 Nov 2012 12:07:47 +0000 (13:07 +0100)]
src/plugin.c: Report an error if ctx.interval is not set.

12 years agorrdtool plugin: Remove warnings.
Florian Forster [Wed, 14 Nov 2012 09:33:29 +0000 (10:33 +0100)]
rrdtool plugin: Remove warnings.

They made sense when all data was collected at the same interval. This
has not been true for a while now and these warnings don't make any sense
anymore.

We could transform them into a per-VL check and use complaints to notify
the user, but I don't think it's worth it. There is an "I told you so"
in the manpage in big bold letters ...

12 years agosrc/plugin.c: Don't regularly check for read plugins.
Florian Forster [Tue, 13 Nov 2012 18:14:56 +0000 (19:14 +0100)]
src/plugin.c: Don't regularly check for read plugins.

Rather, let plugin_insert_read() wake up all the read threads.
This removes another usage of interval_g.

12 years agoMerge branch 'collectd-5.1'
Florian Forster [Mon, 12 Nov 2012 07:28:16 +0000 (08:28 +0100)]
Merge branch 'collectd-5.1'

12 years agoBump version to 5.1.1; Update ChangeLog. collectd-5.1.1
Florian Forster [Sun, 11 Nov 2012 11:56:53 +0000 (12:56 +0100)]
Bump version to 5.1.1; Update ChangeLog.

12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100)]
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
ChangeLog
version-gen.sh

12 years agoBump version to 5.0.5; Update ChangeLog. collectd-5.0.5
Florian Forster [Sun, 11 Nov 2012 11:30:56 +0000 (12:30 +0100)]
Bump version to 5.0.5; Update ChangeLog.

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

Conflicts:
ChangeLog
src/pyvalues.c
version-gen.sh

12 years agoUpdate version-gen.sh. collectd-4.10.8
Florian Forster [Sun, 11 Nov 2012 10:39:43 +0000 (11:39 +0100)]
Update version-gen.sh.

12 years agoBump version to 4.10.8; Update ChangeLog.
Florian Forster [Sun, 11 Nov 2012 10:32:55 +0000 (11:32 +0100)]
Bump version to 4.10.8; Update ChangeLog.

12 years agoping plugin: Don't abort the "ping_thread" when ping_send() fails.
Florian Forster [Sun, 11 Nov 2012 09:57:55 +0000 (10:57 +0100)]
ping plugin: Don't abort the "ping_thread" when ping_send() fails.

This may happen when the network is down. If the thread fails, the read
callback will indicate an error and the exponential back-off will start.
This is not optimal for this scenario, since you usually want to have
ping stats from right when the network is back up.

Fixes Github issue #171.

12 years agoping plugin: Refactor "ping_thread": Move iteration over hosts into a function.
Florian Forster [Sun, 11 Nov 2012 09:56:00 +0000 (10:56 +0100)]
ping plugin: Refactor "ping_thread": Move iteration over hosts into a function.

12 years agodisk plugin: Add the "UseBSDName" option for Mac OS X.
Florian Forster [Wed, 12 Sep 2012 08:31:00 +0000 (10:31 +0200)]
disk plugin: Add the "UseBSDName" option for Mac OS X.

This new option will use the "BSD Name" rather than major / minor numbers of
the device when reporting statistics.

See also Github issue #72.

12 years agoaggregation plugin: Improve two error messages.
Florian Forster [Sun, 11 Nov 2012 08:20:58 +0000 (09:20 +0100)]
aggregation plugin: Improve two error messages.

12 years agoMerge branch 'ff/aggregate'
Florian Forster [Sun, 11 Nov 2012 07:58:18 +0000 (08:58 +0100)]
Merge branch 'ff/aggregate'

Conflicts:
src/Makefile.am

12 years agoaggregation plugin: Handle the initial EAGAIN return value of rate_to_value().
Florian Forster [Sat, 10 Nov 2012 20:43:08 +0000 (21:43 +0100)]
aggregation plugin: Handle the initial EAGAIN return value of rate_to_value().

This avoids an annoying and confusing warning.

12 years agoaggregation plugin: Handle a start-up condition gracefully.
Florian Forster [Sat, 10 Nov 2012 20:40:20 +0000 (21:40 +0100)]
aggregation plugin: Handle a start-up condition gracefully.

The resulting error message would confuse and annoy users.

12 years agoaggregation plugin: Implement the "GroupBy" option.
Florian Forster [Sat, 10 Nov 2012 20:36:17 +0000 (21:36 +0100)]
aggregation plugin: Implement the "GroupBy" option.

This new configuration format has two benefits:
1) It is easier to understand by users, because they don't have to know
   about two types of wildcards.
2) In the future matching of Host, Plugin, Type, ... may support regular
   expressions. In that case, this configuration syntax doesn't need to
   be adapted.

12 years ago1) Cleans up one configure.ac error AC_LINK_IFELSE requires AC_LANG_PROGRAM (or somet...
Brian Aker [Fri, 26 Oct 2012 06:02:15 +0000 (02:02 -0400)]
1) Cleans up one configure.ac error AC_LINK_IFELSE requires AC_LANG_PROGRAM (or something similar) to get the setup right.
2) Fix for maintaier-clean so that you can run the autoreconf build script multiple times.
3) Clean up the generated man pages when running cleanup.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agorrdcached plugin: Fix syntax and type errors.
Florian Forster [Sat, 10 Nov 2012 09:17:34 +0000 (10:17 +0100)]
rrdcached plugin: Fix syntax and type errors.

12 years agorrdcached plugin: Implement the "XFF" option.
Florian Forster [Sat, 10 Nov 2012 09:08:35 +0000 (10:08 +0100)]
rrdcached plugin: Implement the "XFF" option.

12 years agorrdcached plugin: Implement the "RRATimespan" option.
Florian Forster [Sat, 10 Nov 2012 08:51:24 +0000 (09:51 +0100)]
rrdcached plugin: Implement the "RRATimespan" option.

12 years agorrdcached plugin: Implement the "StepSize", "HeartBeat" and "RRARows" options.
Florian Forster [Sat, 10 Nov 2012 08:50:22 +0000 (09:50 +0100)]
rrdcached plugin: Implement the "StepSize", "HeartBeat" and "RRARows" options.

12 years agorrdcached plugin: Refactor the configuration handling.
Florian Forster [Sat, 10 Nov 2012 08:23:41 +0000 (09:23 +0100)]
rrdcached plugin: Refactor the configuration handling.

Remove a custom string handling function that's only used in one place and use
the functions provided by "configfile.h".

12 years agoMerge remote-tracking branch 'github-tokkee/sh/empty-config'
Florian Forster [Sat, 10 Nov 2012 08:05:54 +0000 (09:05 +0100)]
Merge remote-tracking branch 'github-tokkee/sh/empty-config'

12 years agocollectd-python.conf(5): fix register_* argument description
Idan Kamara [Wed, 24 Oct 2012 09:31:48 +0000 (11:31 +0200)]
collectd-python.conf(5): fix register_* argument description

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): change phrasing of function descriptions
Idan Kamara [Wed, 24 Oct 2012 09:30:28 +0000 (11:30 +0200)]
collectd-python.conf(5): change phrasing of function descriptions

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): change phrasing of minimum required version
Idan Kamara [Wed, 24 Oct 2012 09:29:03 +0000 (11:29 +0200)]
collectd-python.conf(5): change phrasing of minimum required version

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): fix trivial spelling mistakes
Idan Kamara [Wed, 24 Oct 2012 08:53:58 +0000 (10:53 +0200)]
collectd-python.conf(5): fix trivial spelling mistakes

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): capitalize Python
Idan Kamara [Wed, 24 Oct 2012 08:49:17 +0000 (10:49 +0200)]
collectd-python.conf(5): capitalize Python

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollection3: Remove duplicate definition of contains_invalid_chars().
Florian Forster [Sat, 10 Nov 2012 07:58:00 +0000 (08:58 +0100)]
collection3: Remove duplicate definition of contains_invalid_chars().

Thanks to Jonathan Amiez for pointing this out!

Fixes Github issue #160.

12 years agopf plugin: Include "common.h".
Florian Forster [Thu, 8 Nov 2012 10:52:39 +0000 (11:52 +0100)]
pf plugin: Include "common.h".

12 years agocollectd.conf(5): Documented the postgresql "by_table" queries.
Sebastian Harl [Fri, 26 Oct 2012 08:30:54 +0000 (10:30 +0200)]
collectd.conf(5): Documented the postgresql "by_table" queries.

12 years agopostgresql_default.conf: Added _by_table variants for all table-related qries.
Sebastian Harl [Fri, 26 Oct 2012 08:25:45 +0000 (10:25 +0200)]
postgresql_default.conf: Added _by_table variants for all table-related qries.

These queries use the 'schemaname' and 'relname' columns to construct the type
instance.

12 years agooconfig: Allow empty statement lists (in blocks and files).
Sebastian Harl [Thu, 25 Oct 2012 09:32:38 +0000 (11:32 +0200)]
oconfig: Allow empty statement lists (in blocks and files).

This allows to use empty blocks (which is useful during development and
testing) and empty files (which may happen when including config directories,
cf. Debian #592881).

In order not to generate a shift/reduce error, rather than allowing a
'statement_list' to be empty, this has been implemented by explicitly allowing
empty blocks and an empty 'entire_file'.

12 years agopostgresql plugin: Fixed config key check for <Writer> block.
Sebastian Harl [Wed, 24 Oct 2012 16:33:28 +0000 (18:33 +0200)]
postgresql plugin: Fixed config key check for <Writer> block.

A missing "else" caused incorrect “Ignoring unknown config key "Statement"”
warning messages.

12 years agonetwork.c: call gcry_check_version() as required by library.
Chris Lundquist [Fri, 12 Oct 2012 10:15:13 +0000 (03:15 -0700)]
network.c: call gcry_check_version() as required by library.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10
Florian Forster [Sat, 20 Oct 2012 06:57:02 +0000 (08:57 +0200)]
Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10

12 years agoChange the libnetlink function used to query link statistics to match iproute2's...
KIvosak [Sat, 13 Oct 2012 10:50:40 +0000 (12:50 +0200)]
Change the libnetlink function used to query link statistics to match iproute2's behavior and thus not trip on the kernel's new parsing of optional attributes for RTM_GETLINK.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agopostgresql plugin: Added support for using the db instance as query parameter.
Sebastian Harl [Thu, 18 Oct 2012 11:13:58 +0000 (13:13 +0200)]
postgresql plugin: Added support for using the db instance as query parameter.

12 years agocollectd.conf(5): Documented the <Database> "Instance" option of postgresql.
Sebastian Harl [Thu, 18 Oct 2012 11:10:49 +0000 (13:10 +0200)]
collectd.conf(5): Documented the <Database> "Instance" option of postgresql.

12 years agopostgresql plugin: Added "Instance" option to <Database> config block.
Sebastian Harl [Thu, 18 Oct 2012 11:06:37 +0000 (13:06 +0200)]
postgresql plugin: Added "Instance" option to <Database> config block.

This option may be used to specify the plugin instance that should be used
instead of the database name. This allows to query multiple databases of the
same name on the same host (e.g. when running multiple database server
versions in parallel).

This fixes GH #161 suggested by Bryan Varner.

12 years agoMerge branch 'collectd-5.1'
Florian Forster [Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)]
Merge branch 'collectd-5.1'

12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Thu, 18 Oct 2012 10:43:30 +0000 (12:43 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/utils_db_query.c
src/utils_db_query.h

12 years agodisk plugin: Multiply the average read/write latency with the interval.
Florian Forster [Wed, 17 Oct 2012 14:08:07 +0000 (16:08 +0200)]
disk plugin: Multiply the average read/write latency with the interval.

The counter/derive will later be divided by the interval, resulting in too
small rates (for interval > 1.0).

Should fix issue #150. Thanks to Manuel Sanmartin for identifying this problem!

12 years agoUse plugin_thread_create() rather than pthread_create() in all plugins.
Sebastian Harl [Sun, 14 Oct 2012 15:52:39 +0000 (17:52 +0200)]
Use plugin_thread_create() rather than pthread_create() in all plugins.

This function copies the plugin context from the calling thread to the new
thread. While this might not strictly be necessary in most/many cases, this
will make sure that any code within a plugin uses the same context
information, thus avoiding possible problems in the future.

12 years agopython: Fix memory leaks.
Sven Trenkel [Sun, 14 Oct 2012 15:12:45 +0000 (15:12 +0000)]
python: Fix memory leaks.

12 years agoplugin: Don't switch plugin context in 'write', 'notification' and 'log'.
Sebastian Harl [Sun, 14 Oct 2012 14:53:57 +0000 (16:53 +0200)]
plugin: Don't switch plugin context in 'write', 'notification' and 'log'.

Rather, keep the context (i.e. interval) information of the calling (read)
plugin. This allows the write, notify and log callbacks to access the correct
interval settings appropriate for the current data-set.