Florian Forster [Mon, 12 Nov 2012 07:28:16 +0000 (08:28 +0100)]
Merge branch 'collectd-5.1'
Florian Forster [Sun, 11 Nov 2012 11:56:53 +0000 (12:56 +0100)]
Bump version to 5.1.1; Update ChangeLog.
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
Florian Forster [Sun, 11 Nov 2012 11:30:56 +0000 (12:30 +0100)]
Bump version to 5.0.5; Update ChangeLog.
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
Florian Forster [Sun, 11 Nov 2012 10:39:43 +0000 (11:39 +0100)]
Update version-gen.sh.
Florian Forster [Sun, 11 Nov 2012 10:32:55 +0000 (11:32 +0100)]
Bump version to 4.10.8; Update ChangeLog.
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.
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.
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.
Florian Forster [Sun, 11 Nov 2012 08:20:58 +0000 (09:20 +0100)]
aggregation plugin: Improve two error messages.
Florian Forster [Sun, 11 Nov 2012 07:58:18 +0000 (08:58 +0100)]
Merge branch 'ff/aggregate'
Conflicts:
src/Makefile.am
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.
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.
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.
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>
Florian Forster [Sat, 10 Nov 2012 09:17:34 +0000 (10:17 +0100)]
rrdcached plugin: Fix syntax and type errors.
Florian Forster [Sat, 10 Nov 2012 09:08:35 +0000 (10:08 +0100)]
rrdcached plugin: Implement the "XFF" option.
Florian Forster [Sat, 10 Nov 2012 08:51:24 +0000 (09:51 +0100)]
rrdcached plugin: Implement the "RRATimespan" option.
Florian Forster [Sat, 10 Nov 2012 08:50:22 +0000 (09:50 +0100)]
rrdcached plugin: Implement the "StepSize", "HeartBeat" and "RRARows" options.
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".
Florian Forster [Sat, 10 Nov 2012 08:05:54 +0000 (09:05 +0100)]
Merge remote-tracking branch 'github-tokkee/sh/empty-config'
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>
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>
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>
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>
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>
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.
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'.
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>
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
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>
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.
Sebastian Harl [Thu, 18 Oct 2012 11:10:49 +0000 (13:10 +0200)]
collectd.conf(5): Documented the <Database> "Instance" option of postgresql.
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.
Florian Forster [Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)]
Merge branch '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
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
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!
Sven Trenkel [Sun, 14 Oct 2012 15:12:45 +0000 (15:12 +0000)]
python: Fix memory leaks.
Florian Forster [Fri, 12 Oct 2012 06:16:17 +0000 (08:16 +0200)]
src/utils_format_graphite.[ch]: Add the "store_rates" option.
This functionality must have been lost in the refactoring that added
Graphite support to the AMQP plugin.
Chris Lundquist [Thu, 11 Oct 2012 00:04:26 +0000 (17:04 -0700)]
network.c: workaround for broken OSX compilers issuing false warnings
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 11 Oct 2012 20:04:03 +0000 (22:04 +0200)]
Merge branch 'collectd-5.1'
Florian Forster [Thu, 11 Oct 2012 20:03:51 +0000 (22:03 +0200)]
Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1
Florian Forster [Thu, 11 Oct 2012 19:58:31 +0000 (21:58 +0200)]
Merge branch 'collectd-5.1'
Florian Forster [Thu, 11 Oct 2012 19:52:36 +0000 (21:52 +0200)]
src/utils_db_query.[ch]: Remove duplicate "const" modifier.
Florian Forster [Thu, 11 Oct 2012 08:22:53 +0000 (10:22 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1
Conflicts:
src/snmp.c
Florian Forster [Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/snmp.c
Florian Forster [Thu, 11 Oct 2012 08:01:44 +0000 (10:01 +0200)]
Merge branch 'ff/snmp' into collectd-4.10
Johan Kiviniemi [Mon, 8 Oct 2012 15:20:12 +0000 (18:20 +0300)]
src/ntpd.c: Write NAN if the peer was not reachable
Florian Forster [Mon, 8 Oct 2012 14:20:34 +0000 (16:20 +0200)]
src/utils_avltree.c: Fix an off-by-one error in c_avl_insert().
When inserting the first node in the tree, the size is not incremented.
This causes c_avl_size() to return one element too little.
Thanks to Yves Mettier for debugging this!
Yves Mettier [Mon, 8 Oct 2012 08:53:09 +0000 (10:53 +0200)]
Bugfix (mutex unlock instead of lock)
Florian Forster [Sun, 7 Oct 2012 07:42:28 +0000 (09:42 +0200)]
rc/utils_cache.c: Allocate most of the memory required by uc_get_names() at once.
strdup() will still require additional memory, but no more memory movement like
required when doing realloc() a lot.
This fixes Github issue #148.
Florian Forster [Fri, 5 Oct 2012 08:27:27 +0000 (10:27 +0200)]
ntpd plugin: Make some arguments 'const'.
Florian Forster [Fri, 5 Oct 2012 08:21:17 +0000 (10:21 +0200)]
ntpd plugin: Refactor the peer name generation.
Break it out of the main read-loop and put it into two functions: One for the
reference clocks and one for network hosts. The reference clock code will call
the network host code when the clock name is not available in the internal list
of reference clock names. This eliminates the (thread-unsafe) usage of
inet_ntoa(3).
Johan Kiviniemi [Thu, 4 Oct 2012 22:01:44 +0000 (01:01 +0300)]
Document ntpd IncludeUnitID and add to default config
Johan Kiviniemi [Thu, 4 Oct 2012 21:38:52 +0000 (00:38 +0300)]
src/ntpd.c: Add IncludeUnitID option for backwards compatibility
Johan Kiviniemi [Thu, 4 Oct 2012 21:24:19 +0000 (00:24 +0300)]
src/ntpd.c: Format refclock name and unit ID with %s-%u
Johan Kiviniemi [Thu, 4 Oct 2012 17:56:34 +0000 (20:56 +0300)]
src/ntpd.c: Add unit number to refclock name
There can be multiple instances of the same refclock with different unit
numbers. The unit number needs to be a part of the peer name, otherwise
the code will try to write the measurements from multiple peers to the
same RRD file.
Florian Forster [Thu, 4 Oct 2012 08:16:56 +0000 (10:16 +0200)]
Merge branch 'ym/utils_cache_bugfix'
Florian Forster [Thu, 4 Oct 2012 08:15:36 +0000 (10:15 +0200)]
src/utils_cache.c: Fix comment re defining LISTVAL_INCREASE.
Using the preprocessor flags (CPPFLAGS) is a tad more correct I think.
Florian Forster [Thu, 4 Oct 2012 05:57:25 +0000 (07:57 +0200)]
snmp plugin: Fix incorrect comparison in csnmp_oid_compare().
Yves Mettier [Wed, 3 Oct 2012 09:27:46 +0000 (11:27 +0200)]
the increment is defined as a constant (#define) and will not be a
variable. So its names becomes uppercase.
Florian Forster [Wed, 3 Oct 2012 06:32:20 +0000 (08:32 +0200)]
snmp plugin: Check the return value of csnmp_oid_suffix().
Also fix an issue where the complete OID is compared with only the suffix.
Thanks to Mark Juric to test the changes and point out these problems.
Issue: #131
Manuel Luis Sanmartín Rozada [Wed, 5 Sep 2012 11:24:03 +0000 (13:24 +0200)]
Add in swap plugin reserved, in and out values for AIX.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 2 Oct 2012 20:04:08 +0000 (22:04 +0200)]
Merge branch 'mlsr/uptime-aix'
Manuel Luis Sanmartin Rozada [Sun, 30 Sep 2012 12:47:38 +0000 (14:47 +0200)]
Add libperfstat in Makefile.am
Manuel Luis Sanmartín Rozada [Wed, 5 Sep 2012 12:01:40 +0000 (14:01 +0200)]
Add AIX support for uptime plugin.
Manuel Luis Sanmartin Rozada [Sun, 30 Sep 2012 12:06:02 +0000 (14:06 +0200)]
Fix typo in if and return
Manuel Luis Sanmartin Rozada [Sat, 29 Sep 2012 20:28:25 +0000 (22:28 +0200)]
Fix link with perfstat
Manuel Luis Sanmartín Rozada [Wed, 5 Sep 2012 11:48:03 +0000 (13:48 +0200)]
AIX suport in contextswitch plugin.
Manuel Luis Sanmartin Rozada [Sat, 29 Sep 2012 19:54:32 +0000 (21:54 +0200)]
sequence_number is only used in linux.
Generate a compilation error.
Signed-off-by: Florian Forster <octo@collectd.org>
Manuel Luis Sanmartin Rozada [Sat, 29 Sep 2012 19:45:33 +0000 (21:45 +0200)]
The commit
3bda88e8b425f43644e303e6957e38ae59c1bc83 change the shell from sh to bash.
To fix the configure script generation error: remove the echo whith \c used in sh.
Note: bash is not installed in AIX by default.
Signed-off-by: Florian Forster <octo@collectd.org>
hume-github [Thu, 27 Sep 2012 13:43:09 +0000 (10:43 -0300)]
ARG_MAX on Solaris is *very* large, 2 MB. Allocating that much on the
stack (local variable) overflows the thread stack and crashes the
process in weird and interesting ways.
"int i" is a useless variable and breaks the build with -Werror.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 2 Oct 2012 07:28:32 +0000 (09:28 +0200)]
snmp plugin: Fix iterating over tables without an instance configuration.
Also should fix incorrect handling of instance values; the first one would
be skipped.
Yves Mettier [Fri, 28 Sep 2012 09:51:22 +0000 (11:51 +0200)]
Performance improvment : uc_get_names now allocates memory by blocks and not element by element.
Florian Forster [Tue, 25 Sep 2012 10:32:50 +0000 (12:32 +0200)]
configure: Only set the Perl interpreter if the argument is a file.
This fixes Github issue #137.
Yves Mettier [Mon, 17 Sep 2012 13:46:24 +0000 (15:46 +0200)]
Fixed bugs that prevented to "make distcheck"
Fixes Github issue #132.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Mon, 19 Mar 2012 07:43:49 +0000 (08:43 +0100)]
processes plugin: Coding style and whitespace changes.
Florian Forster [Mon, 19 Mar 2012 07:43:22 +0000 (08:43 +0100)]
processes plugin: Use stack memory when reading the command line.
Also remove the call to the non-threadsafe strtok(3) call and fix the
size passed to sstrncpy().
Florian Forster [Sun, 18 Mar 2012 20:01:53 +0000 (21:01 +0100)]
processes plugin: Call ps_submit_fork_rate() from read_fork_rate().
This avoids the "return ULONG_MAX" hack to signal a problem.
Cosmin Ioiart [Wed, 7 Mar 2012 11:33:12 +0000 (12:33 +0100)]
Buffer and memory allocation related bug fixes and changes
Replaced "free" with "sfree" for memory deallocation.
Added memset(...) to initialized newly allocated memory
Removed buffer "termination".
Cosmin Ioiart [Tue, 6 Mar 2012 14:58:25 +0000 (15:58 +0100)]
Added support for the Solaris OS processes
Added support for process information on the Solaris OS. The information comes mainly from
/proc/PID/status, /proc/PID/psinfo , /proc/PID/usage and kstat
Added a few "solaris" specific process states as well
Florian Forster [Sun, 23 Sep 2012 10:22:37 +0000 (12:22 +0200)]
Merge branch 'collectd-5.1'
Florian Forster [Sun, 23 Sep 2012 10:22:27 +0000 (12:22 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sun, 23 Sep 2012 10:20:49 +0000 (12:20 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0
Conflicts:
src/utils_db_query.c
src/zfs_arc.c
hume-github [Tue, 18 Sep 2012 18:19:39 +0000 (15:19 -0300)]
Fix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
General logging additions for tracking down the problem.
Signed-off-by: Florian Forster <octo@collectd.org>
hume-github [Tue, 18 Sep 2012 18:12:25 +0000 (15:12 -0300)]
Multithreading fix: localize unneeded global variable
Florian Forster [Sun, 23 Sep 2012 10:00:43 +0000 (12:00 +0200)]
ethstat plugin: Initialize realloc'ated memory.
The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
segfault when cf_util_get_string() tries to free the "pointer".
Thanks to Mark T. Voelker for reporting and analyzing this bug!
This should fix Github issue #133.
Florian Forster [Sun, 23 Sep 2012 09:56:58 +0000 (11:56 +0200)]
ethstat plugin: Fix off-by-one error.
This hopefully fixes Github issue #135.
Florian Forster [Sun, 23 Sep 2012 09:50:57 +0000 (11:50 +0200)]
snmp plugin: Improve subtree matching.
Some MIBs use subtrees with an unusual OID naming schema. For example,
some network hardware encodes the MAC address in the last six parts of
the OID. Previously, the code only checked the last part of the OID
("sub-id") and assumed this was increasing. This assumption is not true
in such naming schemas and is not required by SNMP. This patch fixes
this behavior by comparing the entire "OID suffix".
This hopefully fixes Github issue #131.
Florian Forster [Sun, 23 Sep 2012 09:44:39 +0000 (11:44 +0200)]
snmp plugin: Expand tabs.
Florian Forster [Tue, 18 Sep 2012 06:40:00 +0000 (08:40 +0200)]
snmp plugin: Rename a couple of confusing variables.
"head" and "tail" are way better names, I hope.
Florian Forster [Tue, 18 Sep 2012 06:29:26 +0000 (08:29 +0200)]
snmp plugin: Improve some comments.
JonathanHuot [Thu, 13 Sep 2012 16:27:57 +0000 (18:27 +0200)]
libs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output only libvarnishapi as well
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Wed, 13 Jun 2012 12:33:05 +0000 (14:33 +0200)]
bindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.
Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
message explaining INSTALL_BASE and PREFIX may not be used both. However, I
don't know where the other definition comes from.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Wed, 13 Jun 2012 12:31:00 +0000 (14:31 +0200)]
configure: Don't add -liptc to the global LIBS setting.
AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
macro.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Fri, 18 May 2012 20:31:13 +0000 (22:31 +0200)]
configure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.
kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
hopefully make sure that we're save for a bit ;-)
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 13 Sep 2012 08:53:19 +0000 (10:53 +0200)]
curl_xml plugin: Mark read-only strings as const.
Fabien Wernli [Mon, 28 Nov 2011 09:46:18 +0000 (10:46 +0100)]
fix Host config being ignored
Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
Signed-off-by: Florian Forster <octo@collectd.org>