Chad Malfait [Sun, 7 Apr 2013 01:32:27 +0000 (19:32 -0600)]
added the use of df_complex and changed fprintf to ERROR for error
messages. Also changed variable names to follow recommended standard
from the website.
Chad Malfait [Sun, 7 Apr 2013 00:54:11 +0000 (18:54 -0600)]
changed LIBADD to reference variable BUILD_WTH_LIBLVM2APP_LIBS
Chad Malfait [Sat, 6 Apr 2013 20:44:51 +0000 (14:44 -0600)]
Set default size from GB to bytes.
Chad Malfait [Sat, 6 Apr 2013 16:53:32 +0000 (10:53 -0600)]
removed unused var plugin_volume
Chad Malfait [Sat, 6 Apr 2013 04:56:29 +0000 (22:56 -0600)]
Added configuration for autotools
Chad Malfait [Sat, 6 Apr 2013 04:50:30 +0000 (22:50 -0600)]
initial commit of volume.c
Florian Forster [Fri, 5 Apr 2013 05:31:35 +0000 (07:31 +0200)]
configure.in: Check for protobuf-c.h.
Thanks to Yves Mettier pointing this out in #269 and for providing an
initial patch.
Florian Forster [Sun, 24 Mar 2013 13:21:27 +0000 (14:21 +0100)]
rrdtool plugin: Use cdrand_range() for the random variation.
Florian Forster [Sun, 24 Mar 2013 13:15:16 +0000 (14:15 +0100)]
src/utils_random.[ch]: Provide thread-safe random numbers.
Florian Forster [Sat, 23 Mar 2013 17:07:03 +0000 (18:07 +0100)]
write_mongodb plugin: Add authentication options.
Fixes Github issue #282.
Greg Mason [Thu, 14 Mar 2013 19:21:33 +0000 (15:21 -0400)]
Increase MAX_NUMDISKS
On large systems (particularly ZFS systems using large JBODs), it's
quite possible to have more than 256 disks.
Signed-off-by: Florian Forster <octo@collectd.org>
Pierre-Yves Ritschard [Thu, 7 Mar 2013 08:18:04 +0000 (09:18 +0100)]
respect riemann's terminology
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Mon, 18 Mar 2013 22:17:16 +0000 (23:17 +0100)]
Get rid of a compiler warning with gcc 4.6.3
...a futile warning that nevertheless kills the build thanks
to -Werror: "variable 'status' set but not used"
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Thu, 21 Mar 2013 21:19:48 +0000 (22:19 +0100)]
curl_xml plugin: Fixed typo in documentation
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 23 Mar 2013 09:13:02 +0000 (10:13 +0100)]
Merge branch 'collectd-5.2'
Conflicts:
configure.in
Florian Forster [Sat, 23 Mar 2013 09:01:19 +0000 (10:01 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sat, 23 Mar 2013 08:54:39 +0000 (09:54 +0100)]
Merge branch 'kn/snort'
Florian Forster [Sat, 23 Mar 2013 08:53:28 +0000 (09:53 +0100)]
src/plugin.c: Assert that "data_sets" is non-NULL.
Otherwise we might run into an assertion in the AVL tree. This can be
triggered e.g. when calling plugin_get_ds() from within a config
callback.
Florian Forster [Sat, 23 Mar 2013 08:27:24 +0000 (09:27 +0100)]
tail_csv plugin: Implement the "TimeFrom" option.
Florian Forster [Sat, 23 Mar 2013 07:57:43 +0000 (08:57 +0100)]
tail_csv plugin: Rename the "Index" option to "ValueFrom".
Florian Forster [Sat, 23 Mar 2013 07:47:02 +0000 (08:47 +0100)]
tail_csv plugin: Some bug fixes.
* Query types in the init-phase rather than the config-phase. The
types.db is not guaranteed to be available at that time.
* Make sure the "Instance" option in the <File /> blocks is optional.
Florian Forster [Fri, 22 Mar 2013 22:05:08 +0000 (23:05 +0100)]
Merge branch 'jw/libvirt'
Florian Forster [Fri, 22 Mar 2013 21:57:43 +0000 (22:57 +0100)]
tail_csv plugin: Rename "Instance" blocks to "File".
This way the syntax of tail_csv's configuration is closer to that of the
csv plugin.
Florian Forster [Fri, 22 Mar 2013 21:21:57 +0000 (22:21 +0100)]
tail_csv plugin: Rename the "snort" plugin to "tail_csv".
It's actually much more generic than just Snort, so give it an
appropriately generic name.
Florian Forster [Fri, 22 Mar 2013 20:55:02 +0000 (21:55 +0100)]
configure.in: Quote AC_LANG_PROGRAM and remove AC_INCLUDES_DEFAULT.
The latter isn't expanded anymore when quoted. There's no easy way
around this :\
Johan Wirén [Mon, 18 Mar 2013 22:55:39 +0000 (23:55 +0100)]
Added instance type "total"
Johan Wirén [Mon, 18 Mar 2013 21:56:55 +0000 (22:56 +0100)]
Reports memory allocation in bytes, not kilobytes.
Johan Wirén [Mon, 18 Mar 2013 21:49:32 +0000 (22:49 +0100)]
Applied the suggested changes.
Florian Forster [Sun, 17 Mar 2013 14:50:16 +0000 (15:50 +0100)]
uuid plugin: Improve parsing of the dmidecode output.
The entire business of dividing by sizeof(char) only made the code
unreadable, because by specification sizeof(char) evaluates to 1. The
defines were expanded and the parsing is now less sensitive to
formatting changes in the dmidecode output. Module global variables have
been moved to the top.
Fixes Github issue #267 in the process.
Florian Forster [Sat, 16 Mar 2013 15:31:50 +0000 (16:31 +0100)]
Merge remote branch 'origin/master'
Florian Forster [Sat, 16 Mar 2013 14:08:39 +0000 (15:08 +0100)]
curl_xml plugin: Change the "Namespace" config option …
… to expect two strings: prefix and URL separately. This way the parsing
is done in the config parser and we don't have to interpret special
characters in a string.
Dan Fandrich [Sat, 2 Mar 2013 17:13:27 +0000 (18:13 +0100)]
Fix automatic link flags with libgcrypt 1.5.0
AM_PATH_LIBGCRYPT from libgcrypt 1.5.0 sets the variables
LIBGCRYPT_CPPFLAGS and LIBGCRYPT_LIBS with their proper
values, not GCRYPT_CPPFLAGS and GCRYPT_LIBS.
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Wed, 6 Feb 2013 20:47:10 +0000 (21:47 +0100)]
curl_xml plugin: Added support for XML namespaces
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Wed, 6 Feb 2013 20:44:03 +0000 (21:44 +0100)]
curl_xml plugin: Allow XML element nodes to be selected for text
This is a pretty basic use case, namely to select text within an XML
element, instead of just attribute values.
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Mon, 4 Feb 2013 22:29:01 +0000 (23:29 +0100)]
curl* plugins: Added support for POST and arbitrary headers
These plugins can now be used for things like SOAP or XML-RPC calls.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 16 Mar 2013 12:44:01 +0000 (13:44 +0100)]
Merge branch 'collectd-5.2'
Conflicts:
src/plugin.c
Florian Forster [Sat, 16 Mar 2013 12:43:26 +0000 (13:43 +0100)]
Merge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sat, 16 Mar 2013 12:40:14 +0000 (13:40 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1
Conflicts:
src/curl_json.c
Dan Fandrich [Wed, 6 Feb 2013 22:35:04 +0000 (23:35 +0100)]
curl_xml plugin: Check for a curl_easy_perform() error first
The value of CURLINFO_RESPONSE_CODE isn't valid otherwise.
Also, use the symbolic name CURLE_OK in all plugins where
appropriate.
Change-Id: I17ae9c7eea393ee4641296b5484c93809a662dd9
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 6 Mar 2013 07:15:35 +0000 (08:15 +0100)]
snort plugin: Replace the mmap() code with the tail-code from collectd.
This makes following along a file more I/O friendly, I hope. Also, we
don't need to do quite as much buffer processing because lines are
already split for us. Also, in the unlikely case that Snort is writing
the stats file more often than collectd reads it, this will pick up all
intermediate values.
Florian Forster [Thu, 28 Feb 2013 11:21:18 +0000 (12:21 +0100)]
configure.in: Update for autoconf 2.68.
Florian Forster [Wed, 27 Feb 2013 07:37:42 +0000 (08:37 +0100)]
Merge branch 'ff/rrd-async'
Florian Forster [Wed, 27 Feb 2013 07:37:29 +0000 (08:37 +0100)]
collectd.conf(5): Improve documentation of CreateFilesAsync.
Tomas Doran [Tue, 26 Feb 2013 12:43:21 +0000 (12:43 +0000)]
Fix memory leaks when plugin gets no results
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 27 Feb 2013 07:18:21 +0000 (08:18 +0100)]
AUTHORS, README: Add Kris and the snort plugin.
Florian Forster [Wed, 27 Feb 2013 07:17:54 +0000 (08:17 +0100)]
collectd.conf(5): Add information about the snort plugin.
Florian Forster [Tue, 26 Feb 2013 06:42:21 +0000 (07:42 +0100)]
snort plugin: Free md->instance in snort_metric_definition_destroy().
Florian Forster [Mon, 25 Feb 2013 20:08:15 +0000 (21:08 +0100)]
rrdtool and rrdcached plugins: Don't update the file if ...
... it is being created asynchronously.
Florian Forster [Sun, 24 Feb 2013 09:41:06 +0000 (10:41 +0100)]
src/plugin.c: Assure rf->rf_next_read is initialized.
Otherwise read callbacks will be called twice on startup, causing all
sorts of trouble.
Florian Forster [Sun, 24 Feb 2013 09:33:51 +0000 (10:33 +0100)]
src/utils_rrdcreate.c: Lock files to be created.
This works around an issue where RRDtool crashes due to two threads
trying to create the same file at the same time. This shouldn't happen
in normal operation, but an attacker could cause this, e.g. with
specially crafted network packets.
Florian Forster [Sat, 23 Feb 2013 12:16:20 +0000 (13:16 +0100)]
src/utils_rrdcreate.c: Add folding markers.
Florian Forster [Sat, 23 Feb 2013 12:13:40 +0000 (13:13 +0100)]
src/utils_rrdcreate.c: Free allocated memory in all error handling cases.
Florian Forster [Sat, 23 Feb 2013 12:10:40 +0000 (13:10 +0100)]
rrdtool, rrdcached plugin: Whitespace fix.
Florian Forster [Sat, 23 Feb 2013 11:28:39 +0000 (12:28 +0100)]
src/utils_rrdcreate.[ch]: Implement the srrd_create_async() function.
This new functionality, which is also exported by the rrdtool and
rrdcached plguins, allows to create new RRD files in the background.
This avoid blocking write threads on the RRD creation, when hundreds of
files need to be created.
See also Github issues #243 and #244.
Johan Wirén [Wed, 6 Feb 2013 22:37:00 +0000 (23:37 +0100)]
libvirt: Added support for memory allocation
Florian Forster [Thu, 21 Feb 2013 09:35:59 +0000 (10:35 +0100)]
exec plugin: Fix a copy'n'paste mistake in a comment.
Thanks to Robert Riches Jr for the hint.
Dave Cottlehuber [Mon, 18 Feb 2013 12:31:57 +0000 (13:31 +0100)]
Add upstart configuration file for Ubuntu, Debian and RedHat distros
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 20 Feb 2013 13:40:46 +0000 (14:40 +0100)]
Merge branch 'mf/redhat' into collectd-5.2
Fixes Github issue #220.
Florian Forster [Wed, 20 Feb 2013 13:36:15 +0000 (14:36 +0100)]
snort plugin: Implement the "Instance" config option.
Florian Forster [Wed, 20 Feb 2013 08:31:12 +0000 (09:31 +0100)]
snort plugin: Assert that the configured "type" has only one data source.
Also uses the utility function from configfile.h to read the metric
definition's name.
Florian Forster [Wed, 20 Feb 2013 08:14:15 +0000 (09:14 +0100)]
snort plugin: Split the snort_read() function.
snort_read() handles the file opening / mmap part of the process.
snort_read_buffer() parses the buffer, splits the last line and calls
the submit function. This way cleaning up the FD and memory mapping is
easier in case of an error when parsing the file.
Florian Forster [Wed, 20 Feb 2013 08:06:39 +0000 (09:06 +0100)]
snort plugin: Improve error handling.
This prevents file descriptors and memory from leaking if something goes
wrong, e.g. the last line in the file is a comment.
Florian Forster [Wed, 20 Feb 2013 07:54:46 +0000 (08:54 +0100)]
snort plugin: Replace strsep() (a BSD extension).
Florian Forster [Wed, 20 Feb 2013 07:47:51 +0000 (08:47 +0100)]
snort plugin: Add a bounady check when reading from the metrics array.
Also renamed "count" to "metrics_num" to make it clear that the two
relate to one another.
Florian Forster [Wed, 20 Feb 2013 07:36:46 +0000 (08:36 +0100)]
curl_json plugin: Call yajl_complete_parse() / yajl_parse_complete() only once.
The cURL callback may be called several times, so we need to call the
complete() function after perform() returns.
Kris Nielander [Tue, 19 Feb 2013 22:36:14 +0000 (23:36 +0100)]
Updated configuration directives.
--
Kris Nielander [Mon, 18 Feb 2013 22:17:42 +0000 (23:17 +0100)]
Requested changes committed.
Kris Nielander [Thu, 14 Feb 2013 21:45:07 +0000 (22:45 +0100)]
Requested changes applied.
--
Kris Nielander [Sun, 10 Feb 2013 13:41:06 +0000 (14:41 +0100)]
snort plugin added
Florian Forster [Wed, 6 Feb 2013 19:21:06 +0000 (20:21 +0100)]
src/plugin.c: Use cdtime_t to calculate the sleep intervals.
Since it's easier to do calculations with cdtime_t than struct timespec,
the code becomes easier to read and maintain.
Dan Fandrich [Mon, 4 Feb 2013 22:27:26 +0000 (23:27 +0100)]
Add protection from infinite redirect loops to curl-using plugins
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Mon, 4 Feb 2013 22:59:41 +0000 (23:59 +0100)]
Fix a NULL pointer dereference during shutdown
Signed-off-by: Florian Forster <octo@collectd.org>
Dan Fandrich [Mon, 4 Feb 2013 23:02:17 +0000 (00:02 +0100)]
curl_xml plugin: Fix potential dereference of NULL pointer.
I managed to get collectd to segfault in a couple of places while
playing with it a bit. The first is in the curl_xml module when the
XPATH expression doesn't quite match the input. The crash occurs on line
407 when instance_node->nodeTab[0] is dereferenced. At this point, all
members of instance_node are 0, so dereferencing the array isn't a good
idea. This patch fixes the problem, although I'm not sure if this
particular case actually deserves its own error message.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sun, 3 Feb 2013 22:04:17 +0000 (23:04 +0100)]
src/plugin.c: Initialize "next_read" field of read callbacks.
Fixes Github issue #230.
Florian Forster [Sun, 3 Feb 2013 12:10:35 +0000 (13:10 +0100)]
src/Makefile.am: Only add path to lcc_features.h to binaries linked against libcollectdclient.
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:40:21 +0000 (11:40 +0100)]
src/Makefile.am: Fix compilation of the riemann.proto file.
Florian Forster [Sun, 3 Feb 2013 10:39:50 +0000 (11:39 +0100)]
Merge branch 'collectd-5.2'
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 [Tue, 29 Jan 2013 09:40:24 +0000 (10:40 +0100)]
Merge remote-tracking branch 'github-tokkee/sh/netapp'
Florian Forster [Tue, 29 Jan 2013 09:24:52 +0000 (10:24 +0100)]
Merge remote-tracking branch 'github-tokkee/sh/postgresql'
Florian Forster [Tue, 29 Jan 2013 09:22:41 +0000 (10:22 +0100)]
write_graphite plugin: Change <Carbon> blocks to <Node> blocks.
Many other write plugins, e.g. write_{mongodb,redis,riemann} use the
<Node "name"> syntax. This adds code to handle this syntax as well.
While the documentation doesn't mention it, the old <Carbon> syntax
(without a name) is still supported for backwards compatibility.
Sebastian Harl [Thu, 8 Mar 2012 21:07:23 +0000 (22:07 +0100)]
postgresql plugin: If a query fails, try to reconnect immediately.
Else, we would unnecessarily skip one iteration even when being able to
reconnect right away.
Sebastian Harl [Thu, 8 Mar 2012 20:53:24 +0000 (21:53 +0100)]
postgresql plugin: Don't do any SQL query when checking the connection.
First of all, this is not needed -- PQstatus() will correctly determine a
failed connection without that. Secondly, the "SELECT 42" that was used before
does not work, e.g. when querying PgBouncer (thanks to renchap for reporting
this on IRC!).
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.