Florian Forster [Thu, 8 Apr 2010 20:38:11 +0000 (22:38 +0200)]
Build system: Make it possible to (conditionally) build the protobuf stuff.
The dependency for the module is still missing, but I don't know how to
specify that from the top of my head.
Florian Forster [Thu, 8 Apr 2010 19:52:56 +0000 (21:52 +0200)]
src/Makefile.am: Order the plugins alphabetically.
And add "pinba.proto" to the distribution.
Florian Forster [Thu, 8 Apr 2010 19:50:21 +0000 (21:50 +0200)]
Build system: Check for protoc-c and enable the Pinba plugin if it is found.
Phoenix Kayo [Thu, 8 Apr 2010 07:44:49 +0000 (13:44 +0600)]
Writing autotools rules for pinba.
Phoenix Kayo [Thu, 8 Apr 2010 06:35:09 +0000 (12:35 +0600)]
Add pinba plugin.
Florian Forster [Wed, 7 Apr 2010 09:55:24 +0000 (11:55 +0200)]
Merge branch 'collectd-4.9'
Florian Forster [Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 7 Apr 2010 09:53:32 +0000 (11:53 +0200)]
network plugin: Fix a severe memory leak.
A couple of bytes were leaked with every encrypted packet received.
Florian Forster [Wed, 7 Apr 2010 09:41:41 +0000 (11:41 +0200)]
rrdtool plugin: Correctly free the cache when shutting down.
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".
Florian Forster [Mon, 5 Apr 2010 14:32:19 +0000 (16:32 +0200)]
network plugin: Print a warning when setting the interface on a unicast socket is not possible.
Florian Forster [Mon, 5 Apr 2010 14:22:30 +0000 (16:22 +0200)]
Build system: Check for the "if_indextoname" function.
Use this information rather than hard-coding "if Linux …"
Florian Forster [Mon, 5 Apr 2010 14:20:34 +0000 (16:20 +0200)]
Build system: Check for "struct ip_mreqn".
Use this rather than hard-coding "if Linux …"
Max Henkel [Fri, 2 Apr 2010 10:41:11 +0000 (12:41 +0200)]
network plugin: Interface option moved to Server/Listen block
Hello list!
On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
[...]
> On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
[...]
> > @@ -2842,6 +2929,8 @@ static int network_config (oconfig_item_t *ci) /* {{{ */
> > network_config_add_server (child);
> > else if (strcasecmp ("TimeToLive", child->key) == 0)
> > network_config_set_ttl (child);
> > + else if (strcasecmp ("Interface", child->key) == 0)
> > + network_config_set_interface (child);
> > else if (strcasecmp ("MaxPacketSize", child->key) == 0)
> > network_config_set_buffer_size (child);
> > else if (strcasecmp ("Forward", child->key) == 0)
>
> Starting with the signing and encryption option, we have <Server> and
> <Listen> blocks that take socket specific options. It'd be kind of
> inconsistent with the "TimeToLive" and other options, but maybe adding
> this to those blocks would be even better. It would enable to forward
> data from one multicast group on interface-0 to the *same* multicast
> group on interface-1, which I guess could be useful. But maybe it's an
> academic case, I dunno.. Thoughts, anyone?
[...]
This patch provides the configuration possibility inside the
Server/Listen-block, but I'm unsure if the "int interface" is
located properly inside the sockent_t.
Best regards,
Max
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Max Henkel [Fri, 2 Apr 2010 10:40:01 +0000 (12:40 +0200)]
network plugin: Bind to device for unicast
Hello list!
On Tue, Mar 09, 2010 at 06:17:35PM +0100, Florian Forster wrote:
[...]
> On Fri, Feb 26, 2010 at 12:49:02PM +0100, Max Henkel wrote:
[...]
> > + if (! IN_MULTICAST (ntohl (addr->sin_addr.s_addr)))
> > + return (0);
>
> Doesn't it make sense to be able to set the interface in unicast mode,
> too? For example if the host has multiple default gateways. The
> socket(7) option "SO_BINDTODEVICE" could be used for this I guess.
[...]
Thus this patch binds the socket to a specific interface for unicast
traffic, too. But, as Sebastian already mentioned, the behaviour is
Linux specific.
Best regards,
Max
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Max Henkel [Fri, 2 Apr 2010 10:39:19 +0000 (12:39 +0200)]
network plugin: Added Interface option
Hello list!
Again I'm providing an interface option for the network plugin for
the manual selection of an incoming or outgoing interface,
incorporating the changes proposed by Florian and Sebastian.
Please look through it and feedback or suggest new changes! :-)
Best regards,
Max
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 5 Apr 2010 12:10:44 +0000 (14:10 +0200)]
Merge branch 'ff/modbus'
Florian Forster [Mon, 5 Apr 2010 12:09:39 +0000 (14:09 +0200)]
README: Fix a typo.
Florian Forster [Mon, 5 Apr 2010 12:09:06 +0000 (14:09 +0200)]
README: Add information about the modbus plugin.
Florian Forster [Mon, 5 Apr 2010 12:04:18 +0000 (14:04 +0200)]
Merge branch 'schmurfy/re_invert'
Florian Forster [Mon, 5 Apr 2010 12:02:59 +0000 (14:02 +0200)]
collectd.conf(5): Document the new "Invert" option …
… of the Regex match.
Florian Forster [Mon, 5 Apr 2010 11:56:21 +0000 (13:56 +0200)]
Regex match: Whitespace fixes.
Schmurfy [Wed, 31 Mar 2010 21:41:40 +0000 (23:41 +0200)]
now using cf_util_get_boolean
Florian Forster [Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Sebastian Harl [Tue, 30 Mar 2010 21:01:26 +0000 (23:01 +0200)]
postgresql plugin: Relicensed to (2-clause) BSD license.
All (most?) of PostgreSQL is licensed under a BSD license …
Florian, the only other copyright holder, agreed with this.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 31 Mar 2010 07:06:13 +0000 (09:06 +0200)]
collectd.conf.in: Change the basename of the Perl plugin to "Collectd::Plugins".
Florian Forster [Wed, 31 Mar 2010 07:01:05 +0000 (09:01 +0200)]
collectd-perl(5): Fix the synopsis.
I think this is a left-over from a switch from "Collectd::Plugin" to
"Collectd::Plugins". Thanks to Denis Yagofarov for reporting the bug and
Michael Shigorin for relaying it to me.
Sebastian Harl [Tue, 30 Mar 2010 20:55:06 +0000 (22:55 +0200)]
target_scale: Fixed a `break strict-aliasing rules' compiler warning.
… identified by GCC 4.4.3 using -O3.
Sebastian Harl [Tue, 30 Mar 2010 20:15:56 +0000 (22:15 +0200)]
configure: In the summary, say which plugins have been disabled by the user.
Sebastian Harl [Tue, 30 Mar 2010 20:09:55 +0000 (22:09 +0200)]
postgresql plugin: Let the read callback fail if all queries failed.
Sebastian Harl [Tue, 30 Mar 2010 19:59:36 +0000 (21:59 +0200)]
csv plugin: Use the value list's interval when outputting to STDOUT.
Sebastian Harl [Tue, 30 Mar 2010 19:55:13 +0000 (21:55 +0200)]
utils_db_query: Added support for custom plugin intervals.
The interval is specified when calling udb_query_prepare_result(). A value
less than or equal to zero may be used to let udb use the default
(interval_g).
The dbi, oracle, and postgresql plugins have been updated accordingly.
Sebastian Harl [Tue, 30 Mar 2010 19:27:55 +0000 (21:27 +0200)]
utils_db_query: Introduced the query & result preparation areas.
These objects are used to store the temporary data needed during execution of
a query, which was previously stored in the query object itself. This allows
the query object to be used read-only, making it possible to use it from
multiple threads in parallel.
The dbi, oracle and postgresql plugins have been updated to use that
(mandatory) new feature.
Schmurfy [Sun, 28 Mar 2010 16:03:09 +0000 (18:03 +0200)]
added an "Invert" option for regex
Florian Forster [Sat, 27 Mar 2010 14:01:35 +0000 (15:01 +0100)]
modbus plugin: Downgrade to use the libmodbus 1.2.5 API.
The API of the library changes every other month, so be conservative and
use the "stable" version, released in May 2008, and hope *that* API is
somewhat stable.
Sebastian Harl [Fri, 26 Mar 2010 20:50:42 +0000 (21:50 +0100)]
postgresql plugin: Don't abort read(), if a query's version doesn't match.
There is no reason to skip unrelated queries because of that.
Sebastian Harl [Fri, 26 Mar 2010 20:30:17 +0000 (21:30 +0100)]
postgresql plugin: Use the "right" `interval' when passing a param to a query.
… i.e., use the database specific interval, if configured.
Sebastian Harl [Fri, 26 Mar 2010 19:11:32 +0000 (20:11 +0100)]
postgresql plugin: Added the ``Interval'' config option.
This option may be used to specify the read interval with which to query a
database.
Sebastian Harl [Fri, 26 Mar 2010 12:11:50 +0000 (13:11 +0100)]
configure, src/Makefile: Check for nanosleep() in libposix4 as well.
On, e.g., Solaris 2.6, nanosleep() is only available from that library.
Thanks to Vincent McIntyre for reporting this and providing an initial patch.
Sebastian Harl [Thu, 25 Mar 2010 18:11:08 +0000 (19:11 +0100)]
postgresql plugin: Use the "complex read" mechanism.
This way, multiple databases are queried in parallel (depending on the number
of read threads).
Sebastian Harl [Thu, 25 Mar 2010 17:49:48 +0000 (18:49 +0100)]
postgresql plugin: Connect to the database in the read function.
… rather than the init function. This way, we don't need access to some global
list of databases in the init function and it's done in preparation to using
the "complex read" system.
Florian Forster [Thu, 25 Mar 2010 07:09:57 +0000 (08:09 +0100)]
README: Fix typo.
Florian Forster [Thu, 25 Mar 2010 06:57:58 +0000 (07:57 +0100)]
README: Fix typo.
Sebastian Harl [Wed, 24 Mar 2010 22:31:59 +0000 (23:31 +0100)]
plugin: Introduced a concept of ``read groups''.
Using a new parameter added to plugin_register_complex_read(), it's now
possible to specify a group name for the registered callback. This name may
later be used to unregister *all* callbacks belonging to that group using the
newly added function plugin_unregister_read_group().
This might come in handy for plugins that register multiple read callbacks but
do not want to keep track of all of them in order to be able to unregister
them.
Sebastian Harl [Wed, 24 Mar 2010 22:08:34 +0000 (23:08 +0100)]
utils_llist: Added `llist_search_custom()'.
This function may be used for lookups using a custom compare function, i.e.
lookups that are not necessarily based on the name of the registered list
entry but some information specific to the used data-type.
Florian Forster [Wed, 24 Mar 2010 16:44:41 +0000 (17:44 +0100)]
src/utils_format_json.c: Use a format string to add strings to the buffer.
While I hope that DS names can be trusted, I'm feeling more comfortable this
way nonetheless.
Chris Buben [Wed, 24 Mar 2010 03:53:31 +0000 (20:53 -0700)]
utils_format_json: include ds names and types in json output.
Make it easier for external systems (i.e. those without visibility into
types.db) to interpret collectd json data.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 24 Mar 2010 16:38:58 +0000 (17:38 +0100)]
src/utils_format_json.c: Convert all data source types to rates except GAUGE.
This is basically the same fix as previously done for the write_http plugin.
Chris Buben [Wed, 24 Mar 2010 03:53:30 +0000 (20:53 -0700)]
write_http: make StoreRates work for JSON format, too.
StoreRates for write_http was inconsistent in that it only functioned
for WH_FORMAT_COMMAND. Extend StoreRates so that it works when using
WH_FORMAT_JSON, too.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 24 Mar 2010 16:32:53 +0000 (17:32 +0100)]
write_http plugin: Fix the store rates option.
Convert all data source types to rates except GAUGE. Also, fixes some
indentation.
Florian Forster [Wed, 24 Mar 2010 15:58:36 +0000 (16:58 +0100)]
memcachec plugin: Add the "ExcludeRegex" config option.
Florian Forster [Wed, 24 Mar 2010 15:58:21 +0000 (16:58 +0100)]
curl plugin: Add the "ExcludeRegex" config option.
Peter Warasin [Tue, 23 Mar 2010 20:55:54 +0000 (21:55 +0100)]
Introduces ExcludeRegexp to the tail plugin
Hi Florian
Florian Forster wrote:
> On Fri, Mar 19, 2010 at 06:13:14PM +0100, Peter Warasin wrote:
>> I'm searching for something like "ExcludeRegExp".
>
> no, something like that doesn't exist yet. I like the idea though, so
> I've added it to the [[Roadmap]] wiki page.
Attached is a patch which implements this.
The patch is against 4.9.1
Please tell me if you want me to rebase it to current svn
kind regards,
peter
--
:: e n d i a n
:: open source - open minds
:: peter warasin
:: http://www.endian.com :: peter@endian.com
Adds ExcludeRegex to the tail-match plugin
With this keyword it is possible to exclude a line from a match.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 24 Mar 2010 15:37:53 +0000 (16:37 +0100)]
snmp plugin: Fix a format string.
Florian Forster [Wed, 24 Mar 2010 14:43:42 +0000 (15:43 +0100)]
modbus plugin: Set the interval when dispatching values.
Florian Forster [Wed, 24 Mar 2010 13:07:48 +0000 (14:07 +0100)]
collectd.conf(5): Improve the synopsis for the "modbus" plugin.
Florian Forster [Wed, 24 Mar 2010 13:00:56 +0000 (14:00 +0100)]
collectd.conf(5): Add documentation for the "modbus" plugin.
Florian Forster [Wed, 24 Mar 2010 11:09:48 +0000 (12:09 +0100)]
modbus plugin: Add some folding markers.
Florian Forster [Wed, 24 Mar 2010 11:09:33 +0000 (12:09 +0100)]
modbus plugin: Implement dispatching of values.
Florian Forster [Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)]
Merge branch 'master' into ff/modbus
Florian Forster [Mon, 22 Mar 2010 18:29:13 +0000 (19:29 +0100)]
Merge branch 'fs/openvpn'
Conflicts:
src/collectd.conf.pod
src/openvpn.c
Florian Forster [Mon, 22 Mar 2010 18:27:33 +0000 (19:27 +0100)]
Merge branch 'collectd-4.9'
Florian Forster [Mon, 22 Mar 2010 18:22:02 +0000 (19:22 +0100)]
openvpn plugin: Fix a copy'n'paste error in the "new naming schema".
Florian Forster [Mon, 22 Mar 2010 18:20:25 +0000 (19:20 +0100)]
collectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.
Florian Forster [Mon, 22 Mar 2010 18:26:30 +0000 (19:26 +0100)]
collectd.conf(5): Document the "Collect{IndividualUsers,UserCount}" options of the OpenVPN plugin.
Florian Forster [Mon, 22 Mar 2010 18:08:04 +0000 (19:08 +0100)]
openvpn plugin: Rename the "OnlyAggregateUsers" option to "CollectIndividualUsers".
The semantic is inverted: When true (default) statistics for individual
users will be collected.
The "AggregateUsers" is now named "CollectUserCount" and a new name for
"Compression", "CollectCompression", has been added. This makes the names
of the config options consistent with one another.
The module global configuration variables have been changed to _Bool
while I was at it.
Florian Forster [Mon, 22 Mar 2010 17:42:29 +0000 (18:42 +0100)]
openvpn plugin: Added copyright notice for Fabian Schuh.
Florian Forster [Mon, 22 Mar 2010 17:42:09 +0000 (18:42 +0100)]
src/openvpn.c: Re-indent the entire file.
Fabian Schuh [Fri, 19 Mar 2010 12:53:30 +0000 (13:53 +0100)]
Bugfix that made collectd inflooping if no openvpn connection
Fabian Schuh [Fri, 19 Mar 2010 09:07:50 +0000 (10:07 +0100)]
Name changes - removed transfer statistics (doesn't make sense here)
Fabian Schuh [Thu, 18 Mar 2010 13:41:34 +0000 (14:41 +0100)]
Added Users Counter
Fabian Schuh [Thu, 18 Mar 2010 11:44:20 +0000 (12:44 +0100)]
fixed typo
Fabian Schuh [Thu, 18 Mar 2010 10:03:54 +0000 (11:03 +0100)]
Bugfix with multiple files
Fabian Schuh [Thu, 18 Mar 2010 09:50:15 +0000 (10:50 +0100)]
[openvpn] new feature 'SumOverAllUsers'
Florian Forster [Wed, 17 Mar 2010 18:12:53 +0000 (19:12 +0100)]
netapp plugin: Fix a syntax error in an error message.
Thanks to facade from IRC for the hint.
Florian Forster [Wed, 17 Mar 2010 17:39:37 +0000 (18:39 +0100)]
modbus plugin: Actually get into a working state.
Florian Forster [Wed, 17 Mar 2010 17:36:05 +0000 (18:36 +0100)]
Build system: Add the "modbus" plugin.
Florian Forster [Wed, 17 Mar 2010 17:35:41 +0000 (18:35 +0100)]
configure.in: Add checks for libmodbus.
Florian Forster [Wed, 17 Mar 2010 12:45:36 +0000 (13:45 +0100)]
Merge branch 'master' into ff/modbus
Florian Forster [Mon, 15 Mar 2010 21:43:05 +0000 (22:43 +0100)]
Merge branch 'cstenac'
Florian Forster [Mon, 15 Mar 2010 21:43:00 +0000 (22:43 +0100)]
Merge branch 'collectd-4.9'
Florian Forster [Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/exec.c
Florian Forster [Mon, 15 Mar 2010 21:03:14 +0000 (22:03 +0100)]
Exec plugin: Update copyright header.
Florian Forster [Mon, 15 Mar 2010 21:37:56 +0000 (22:37 +0100)]
processes plugin: Fix a couple of hard-coded array sizes.
Since I was picky when accepting Clément's patch, I felt like I owed it
to clean up the entire file ;)
Florian Forster [Mon, 15 Mar 2010 21:33:12 +0000 (22:33 +0100)]
processes plugin: Update copyright and author information.
Florian Forster [Mon, 15 Mar 2010 21:09:46 +0000 (22:09 +0100)]
collectd.conf(5): Document the new "PrintSeverity" option.
Florian Forster [Mon, 15 Mar 2010 21:09:08 +0000 (22:09 +0100)]
logfile plugin: Rename the "PrintLevel" option to "PrintSeverity".
Clément Stenac [Sun, 14 Mar 2010 08:25:42 +0000 (09:25 +0100)]
Impove level print
Clément Stenac [Sun, 14 Mar 2010 08:14:11 +0000 (09:14 +0100)]
Misc fixes, thanks to octo for pointing them out
Clément Stenac [Sun, 14 Mar 2010 07:56:55 +0000 (08:56 +0100)]
Add missing declarations for anonymous and code
Florian Forster [Wed, 3 Mar 2010 14:44:11 +0000 (15:44 +0100)]
configfile: cf_read_dir: Don't abort reading a directory when reading one file fails.
Florian Forster [Wed, 10 Mar 2010 17:38:58 +0000 (18:38 +0100)]
Modbus plugin: Started working on a "Modbus-TCP" plugin for collectd.
Florian Forster [Wed, 10 Mar 2010 17:37:47 +0000 (18:37 +0100)]
src/configfile.c: Fix a minor typo.
Florian Forster [Wed, 10 Mar 2010 17:37:32 +0000 (18:37 +0100)]
src/configfile.[ch]: Add "cf_util_get_int".
Helper function to parse an "int".
Florian Forster [Wed, 10 Mar 2010 16:20:29 +0000 (17:20 +0100)]
src/configfile.[ch]: Implement "cf_util_get_string_buffer".
A function to parse a config node into a char buffer of limited size.
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Processes plugin: Fix a minor typo.
Florian Forster [Tue, 9 Mar 2010 17:51:08 +0000 (18:51 +0100)]
Exec plugin: Add a missing folding marker.
Florian Forster [Tue, 9 Mar 2010 17:50:55 +0000 (18:50 +0100)]
Exec plugin: Set the "noreturn" attribute on the "exec_child" function.
Florian Forster [Tue, 9 Mar 2010 17:50:32 +0000 (18:50 +0100)]
Exec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.