Dan Fandrich [Sat, 2 Feb 2013 00:26:43 +0000 (01:26 +0100)]
Allow out-of-tree builds
The generated header file lcc_features.h and collectd.h cause problems
otherwise.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 3 Feb 2013 10:36:48 +0000 (11:36 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sun, 3 Feb 2013 10:36:37 +0000 (11:36 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1
Conflicts:
src/curl_json.c
Dan Fandrich [Sat, 2 Feb 2013 00:19:48 +0000 (01:19 +0100)]
curl's numeric options are always at minimum long, never int
This can affect portability to some architectures.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 3 Feb 2013 09:46:06 +0000 (10:46 +0100)]
postgresql plugin: Fix cast (was breaking aliasing rules).
postgresql.c: In function 'c_psql_flush':
postgresql.c:974: warning: dereferencing type-punned pointer will break strict-aliasing rules
Florian Forster [Sun, 3 Feb 2013 09:43:59 +0000 (10:43 +0100)]
pf plugin: Fix checking for <net/pfvar.h>.
The header is not self-contained, so we need to include appropriate
headers in the configure check as well.
Florian Forster [Fri, 1 Feb 2013 10:48:31 +0000 (11:48 +0100)]
pf plugin: Define {F,S}CNT_NAMES.
Apparently they are only defined in the pfctl sources, not in the
system's header files for some reason.
Florian Forster [Fri, 1 Feb 2013 10:47:29 +0000 (11:47 +0100)]
pf plugin: Fix a typo.
s/status/state/g
Florian Forster [Thu, 31 Jan 2013 20:08:25 +0000 (21:08 +0100)]
cpu plugin: Remove broken debug message.
The message was uninformative and did cast a pointer to an int,
resulting in a compile error.
Florian Forster [Thu, 31 Jan 2013 20:07:45 +0000 (21:07 +0100)]
Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
Florian Forster [Thu, 31 Jan 2013 20:07:05 +0000 (21:07 +0100)]
ChangeLog: Fix typo.
Sebastian Harl [Thu, 31 Jan 2013 07:59:24 +0000 (08:59 +0100)]
ChangeLog: Fixed version number for 5.2.1 ;-)
Florian Forster [Tue, 29 Jan 2013 10:04:36 +0000 (11:04 +0100)]
src/utils_tail.c: Remove multiple newlines at EOL.
Florian Forster [Sun, 27 Jan 2013 13:37:29 +0000 (14:37 +0100)]
Updated ChangeLog.
Florian Forster [Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)]
Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
Florian Forster [Sun, 27 Jan 2013 13:24:31 +0000 (14:24 +0100)]
Bumped version to 5.2.1; Updated ChangeLog.
Florian Forster [Fri, 25 Jan 2013 22:05:30 +0000 (23:05 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2
Conflicts:
ChangeLog
src/write_graphite.c
version-gen.sh
Florian Forster [Fri, 25 Jan 2013 22:04:03 +0000 (23:04 +0100)]
Bumped version to 5.1.2; Updated ChangeLog.
Yves Mettier [Thu, 15 Nov 2012 13:14:59 +0000 (14:14 +0100)]
Added "tar-pax" (bugfix for long filenames with make distcheck)
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 25 Jan 2013 13:48:29 +0000 (14:48 +0100)]
src/Makefile.am: Fix "make distcheck".
protoc-c has a weird handling of files not in the CWD: They have to be
specified with the "-I" option _and_ you need to specify the full path
to the file.
Yves Mettier [Tue, 20 Nov 2012 17:13:39 +0000 (18:13 +0100)]
bugfix ("cannot find collectd.h") for branch master (and 5.2)
Signed-off-by: Florian Forster <octo@collectd.org>
Yves Mettier [Wed, 14 Nov 2012 15:42:04 +0000 (16:42 +0100)]
make distcheck : perllocal.pod was missing. Fixed
Signed-off-by: Florian Forster <octo@collectd.org>
Yves Mettier [Wed, 14 Nov 2012 14:45:07 +0000 (15:45 +0100)]
Fix make distcheck (against release 5.1.1)
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 25 Jan 2013 07:47:15 +0000 (08:47 +0100)]
logfile plugin: Make "do_close" a boolean.
Nathan Huff [Thu, 24 Jan 2013 16:10:02 +0000 (10:10 -0600)]
If the file isn't closed such as when logging to stdout or stderr the file must be flushed for it to get out of the IO buffers right away.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Wed, 23 Jan 2013 08:26:48 +0000 (09:26 +0100)]
postgresql plugin: Don't access realloc'ed memory.
D'oh! This is the most stupidest bug: all database connection objects are
stored in a plugin-global array and a pointer to each object was passed around
to the worker functions. This array used to be an array of objects (rather
than pointers) and was realloc'ed every time a new connection was added. Now,
the realloc caused the old pointer to not be valid any more, thus, any but the
last database connection were later accessing memory out of range. This caused
the plugin to segfault if more than one database connection was used.
Thanks to Greg Swift for reporting this!
Fixes Github issue #238.
Ed Schouten [Fri, 18 Jan 2013 11:01:48 +0000 (12:01 +0100)]
src/utils_dns.c: Improve ordering of includes.
sys, followed by net, followed by netinet, followed by arpa
that should be the most logical order
Signed-off-by: Florian Forster <octo@collectd.org>
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.
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.
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!
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
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.
Florian Forster [Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Mon, 14 Jan 2013 09:53:13 +0000 (10:53 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1
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().
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>
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.
Florian Forster [Thu, 13 Dec 2012 08:55:04 +0000 (09:55 +0100)]
src/types.db: Remove the maximum value from "timeleft".
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.
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
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>
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>
Sebastian Harl [Thu, 29 Nov 2012 08:01:37 +0000 (09:01 +0100)]
postgresql plugin: Fixed a memory leak occurring on every (successful) write.
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!
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>
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
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.
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>
Sebastian Harl [Tue, 20 Nov 2012 12:13:01 +0000 (13:13 +0100)]
collectd.conf: Added example PostgreSQL writer configuration.
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.
Sebastian Harl [Tue, 20 Nov 2012 11:41:27 +0000 (12:41 +0100)]
README: Added 'pf' and 'aggregation' plugins.
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>
Florian Forster [Mon, 19 Nov 2012 15:29:24 +0000 (16:29 +0100)]
collectd-tg(1): Add manpage.
Florian Forster [Sat, 17 Nov 2012 23:24:09 +0000 (00:24 +0100)]
collectd.conf(5): Add the per-plugin interval to the synopsis.
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>
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>
Florian Forster [Sat, 17 Nov 2012 12:43:32 +0000 (13:43 +0100)]
src/libcollectdclient/Makefile.am: Fix typo.
Florian Forster [Sat, 17 Nov 2012 12:25:27 +0000 (13:25 +0100)]
src/libcollectdclient/Makefile.am: Add "collectd/network.h".
Florian Forster [Sat, 17 Nov 2012 12:12:42 +0000 (13:12 +0100)]
Bump version to 5.2.0; Update ChangeLog.
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>
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>
Florian Forster [Sat, 17 Nov 2012 11:41:34 +0000 (12:41 +0100)]
Merge branch 'collectd-5.1'
Florian Forster [Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'
Florian Forster [Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)]
Merge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sat, 17 Nov 2012 11:41:00 +0000 (12:41 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0
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>
Sebastian Harl [Sat, 17 Nov 2012 09:32:25 +0000 (10:32 +0100)]
lcc_features.h: Relicense under the MIT license.
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.
Florian Forster [Sat, 17 Nov 2012 09:23:39 +0000 (10:23 +0100)]
libcollectdclient: Update to the high-resolution time format.
Florian Forster [Sat, 17 Nov 2012 08:42:55 +0000 (09:42 +0100)]
Merge branch 'sr/pf'
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
Florian Forster [Sat, 17 Nov 2012 08:28:39 +0000 (09:28 +0100)]
Merge branch 'sh/postgres-queries'
Florian Forster [Sat, 17 Nov 2012 08:11:52 +0000 (09:11 +0100)]
Merge branch 'libvirt-interfacenumber'
Florian Forster [Sat, 17 Nov 2012 07:55:29 +0000 (08:55 +0100)]
GenericJMXConfConnection: Automatically determine the host name.
Fixes Github issue #182.
Florian Forster [Sat, 17 Nov 2012 07:42:38 +0000 (08:42 +0100)]
libcollectdclient: Relicense under the MIT license.
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
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>
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.
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
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.
Sebastian Harl [Thu, 15 Nov 2012 14:14:10 +0000 (15:14 +0100)]
utils_time: cdtime_to_iso8601(): Include timezone information as well.
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.
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.
Sebastian Harl [Thu, 15 Nov 2012 12:36:52 +0000 (13:36 +0100)]
collectd.conf(5): Documented the postgresql FLUSH support.
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.
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.
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.
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.
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.
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.
Sebastian Harl [Wed, 14 Nov 2012 18:58:25 +0000 (19:58 +0100)]
collectd.conf(5): Documented the postgresql <Database> 'Writer' option.
Sebastian Harl [Wed, 14 Nov 2012 18:51:41 +0000 (19:51 +0100)]
collectd.conf(5): Documented the "CommitInterval" option of 'postgresql'.
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.
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.
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.
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.
Sebastian Harl [Wed, 14 Nov 2012 18:19:05 +0000 (19:19 +0100)]
collectd-perl(5): Mention that $interval_g should not be used.
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().
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 ;-)
Sebastian Harl [Wed, 14 Nov 2012 18:00:25 +0000 (19:00 +0100)]
Collectd.pm: Use plugin_get_interval() rather than $interval_g.