collectd.git
15 years agofreeswitch plugin: Added error checking on connecting to esl on _init
Leon de Rooij [Tue, 28 Apr 2009 09:08:54 +0000 (11:08 +0200)]
freeswitch plugin: Added error checking on connecting to esl on _init

15 years agofreeswitch plugin: Removed some more unnecessary cruft
Leon de Rooij [Tue, 28 Apr 2009 08:43:20 +0000 (10:43 +0200)]
freeswitch plugin: Removed some more unnecessary cruft

15 years agofreeswitch plugin: Fixed example config at top of freeswitch.c and removed some unnec...
Leon de Rooij [Tue, 28 Apr 2009 08:28:12 +0000 (10:28 +0200)]
freeswitch plugin: Fixed example config at top of freeswitch.c and removed some unneccesary debug lines

15 years agofreeswitch plugin: Modified -L option in Makefile.am for libesl for freeswitch plugin
Leon de Rooij [Fri, 24 Apr 2009 13:55:12 +0000 (15:55 +0200)]
freeswitch plugin: Modified -L option in Makefile.am for libesl for freeswitch plugin

15 years agofreeswitch plugin: Copied all esl libs in libesl and modified Makefile
Leon de Rooij [Fri, 24 Apr 2009 13:53:07 +0000 (15:53 +0200)]
freeswitch plugin: Copied all esl libs in libesl and modified Makefile

15 years agofreeswitch plugin: Removed some unnecessary DEBUG statements
Leon de Rooij [Fri, 24 Apr 2009 13:33:58 +0000 (15:33 +0200)]
freeswitch plugin: Removed some unnecessary DEBUG statements

15 years agofreeswitch plugin: Changed malloc and snprintf size to +3 instead of +2
Leon de Rooij [Fri, 24 Apr 2009 09:39:44 +0000 (11:39 +0200)]
freeswitch plugin: Changed malloc and snprintf size to +3 instead of +2

15 years agofreeswitch plugin: Cannot get the match to work yet
Leon de Rooij [Thu, 23 Apr 2009 22:29:07 +0000 (00:29 +0200)]
freeswitch plugin: Cannot get the match to work yet

15 years agofreeswitch plugin: Almost there \?
Leon de Rooij [Thu, 23 Apr 2009 20:49:38 +0000 (22:49 +0200)]
freeswitch plugin: Almost there \?

15 years agofreeswitch plugin: It compiles, if it also works, I'm going to eat my shoe
Leon de Rooij [Thu, 23 Apr 2009 15:34:25 +0000 (17:34 +0200)]
freeswitch plugin: It compiles, if it also works, I'm going to eat my shoe

15 years agofreeswitch plugin: Fixed port definition to use default values instead of segfault
Leon de Rooij [Wed, 22 Apr 2009 18:30:14 +0000 (20:30 +0200)]
freeswitch plugin: Fixed port definition to use default values instead of segfault

15 years agofreeswitch plugin: Commented the seperate thread for incoming messages, maybe use...
Leon de Rooij [Wed, 22 Apr 2009 17:17:13 +0000 (19:17 +0200)]
freeswitch plugin: Commented the seperate thread for incoming messages, maybe use it later

15 years agofreeswitch plugin: Removed usage of pthreads directly, but am using esl_thread_create...
Leon de Rooij [Wed, 22 Apr 2009 14:38:06 +0000 (16:38 +0200)]
freeswitch plugin: Removed usage of pthreads directly, but am using esl_thread_create_detached from esl lib now

15 years agofreeswitch plugin: Added initial pthread stuff
Leon de Rooij [Wed, 22 Apr 2009 13:40:58 +0000 (15:40 +0200)]
freeswitch plugin: Added initial pthread stuff

15 years agofreeswitch plugin: Made some changes in freeswitch.c, before using pthreads
Leon de Rooij [Wed, 22 Apr 2009 13:15:09 +0000 (15:15 +0200)]
freeswitch plugin: Made some changes in freeswitch.c, before using pthreads

15 years agofreeswitch plugin: Re-added esl header files and libesl.a, also aadded -L. to Makefil...
Leon de Rooij [Tue, 21 Apr 2009 12:56:58 +0000 (14:56 +0200)]
freeswitch plugin: Re-added esl header files and libesl.a, also aadded -L. to Makefile.am and added error detection for sock conn errors to esl in freeswitch.c

15 years agofreeswitch plugin: Removed esl header files from tree
Leon de Rooij [Tue, 21 Apr 2009 12:24:02 +0000 (14:24 +0200)]
freeswitch plugin: Removed esl header files from tree

15 years agofreeswitch plugin: Added -lesl to Makefile.am for freeswitch
Leon de Rooij [Tue, 21 Apr 2009 12:07:25 +0000 (14:07 +0200)]
freeswitch plugin: Added -lesl to Makefile.am for freeswitch

15 years agofreeswitch plugin: Added esl header files and modified freeswitch.c to use it
Leon de Rooij [Tue, 21 Apr 2009 11:52:43 +0000 (13:52 +0200)]
freeswitch plugin: Added esl header files and modified freeswitch.c to use it

15 years agofreeswitch plugin: Changed channels to fs_channels in freeswitch.c and tyeps.db
Leon de Rooij [Tue, 21 Apr 2009 11:37:06 +0000 (13:37 +0200)]
freeswitch plugin: Changed channels to fs_channels in freeswitch.c and tyeps.db

15 years agofreeswitch plugin: Added channels to types.db and modified freeswitch.c a bit to...
Leon de Rooij [Tue, 21 Apr 2009 11:03:55 +0000 (13:03 +0200)]
freeswitch plugin: Added channels to types.db and modified freeswitch.c a bit to send types

15 years agofreeswitch plugin: Created initial freeswitch.c module
Leon de Rooij [Tue, 21 Apr 2009 09:35:25 +0000 (11:35 +0200)]
freeswitch plugin: Created initial freeswitch.c module

15 years agofreeswitch plugin: Added BUILD_PLUGIN_FREESWITCH to src/Makefile.am
Leon de Rooij [Tue, 21 Apr 2009 09:34:19 +0000 (11:34 +0200)]
freeswitch plugin: Added BUILD_PLUGIN_FREESWITCH to src/Makefile.am

15 years agofreeswitch plugin: Added FreeSWITCH to AC_PLUGIN in configure.in
Leon de Rooij [Tue, 21 Apr 2009 09:33:03 +0000 (11:33 +0200)]
freeswitch plugin: Added FreeSWITCH to AC_PLUGIN in configure.in

15 years agoMerge branch 'collectd-4.7'
Florian Forster [Wed, 15 Jul 2009 09:11:12 +0000 (11:11 +0200)]
Merge branch 'collectd-4.7'

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 15 Jul 2009 09:10:19 +0000 (11:10 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:

src/memcached.c

15 years agosrc/configfile.c: Warn if an unexpected block is found.
Florian Forster [Wed, 15 Jul 2009 08:09:48 +0000 (10:09 +0200)]
src/configfile.c: Warn if an unexpected block is found.

If the `snmp' plugin isn't loaded (but a configuration exists), no
warning is printed because there are only blocks in the SNMP
configuration..

15 years agobuild.sh, version-gen.sh: Remove bashisms.
Florian Forster [Sun, 12 Jul 2009 09:03:07 +0000 (11:03 +0200)]
build.sh, version-gen.sh: Remove bashisms.

Thanks to Peter Bray for pointing them out.

15 years agosrc/collectd.conf.in: Fix a typo in tokyotyrant's sample config.
Florian Forster [Sat, 11 Jul 2009 12:59:55 +0000 (14:59 +0200)]
src/collectd.conf.in: Fix a typo in tokyotyrant's sample config.

15 years agoMerge branch 'ps/tokyotyrant'
Florian Forster [Sat, 11 Jul 2009 12:59:21 +0000 (14:59 +0200)]
Merge branch 'ps/tokyotyrant'

15 years agocollectd.conf(5): Improved markup of the tokyotyrant documentation.
Florian Forster [Sat, 11 Jul 2009 12:57:19 +0000 (14:57 +0200)]
collectd.conf(5): Improved markup of the tokyotyrant documentation.

15 years ago.gitignore: Update the file.
Florian Forster [Sat, 11 Jul 2009 12:32:25 +0000 (14:32 +0200)]
.gitignore: Update the file.

The pattern `Makefile.in' will match `src/Makefile.in' and others,
because the pattern does not contain a match.

`/configure' will only match the configure script in the base directory
due to special syntax.

`.libs/' matches only directories named `.libs', special syntax again.

For more information see the `gitignore(5)' manual page. The syntax used
corresponds to Git 1.6.

15 years agotokyotyrant plugin: Lookup service names (port names) and minor fixes.
Florian Forster [Wed, 8 Jul 2009 16:09:46 +0000 (18:09 +0200)]
tokyotyrant plugin: Lookup service names (port names) and minor fixes.

15 years agoBuild system: Improve detection of the tokyotyrant library.
Florian Forster [Wed, 8 Jul 2009 12:07:49 +0000 (14:07 +0200)]
Build system: Improve detection of the tokyotyrant library.

15 years agosrc/utils_cache.c: `ce' *is* written to in `c_avl_remove'.
Florian Forster [Wed, 8 Jul 2009 09:55:33 +0000 (11:55 +0200)]
src/utils_cache.c: `ce' *is* written to in `c_avl_remove'.

Therefore we should definitely free it.

15 years agosrc/collectd.conf.in: Fix a typo.
Matthew Sporleder [Wed, 8 Jul 2009 09:00:02 +0000 (11:00 +0200)]
src/collectd.conf.in: Fix a typo.

15 years agosrc/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.
Florian Forster [Wed, 8 Jul 2009 08:51:28 +0000 (10:51 +0200)]
src/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.

This may habe been a cause of the reported assertion failure, too.

15 years agosrc/utils_cache.c: Add a missing `continue'.
Paul Sadauskas [Wed, 8 Jul 2009 08:49:23 +0000 (10:49 +0200)]
src/utils_cache.c: Add a missing `continue'.

tokkee on IRC & I think we found a bug with utils_cache.c. The uc_check_timeout
function is missing a continue after the "uninteresting" service check, that
causes a key to be null.

This probably caused an assertion failure in cache_compare as reported by
Mariusz.

15 years agotokyotyrant plugin: Make DB handle `static'.
Florian Forster [Tue, 7 Jul 2009 17:11:57 +0000 (19:11 +0200)]
tokyotyrant plugin: Make DB handle `static'.

15 years ago.gitignore: Add some *.o files.
Paul Sadauskas [Tue, 7 Jul 2009 16:42:30 +0000 (18:42 +0200)]
.gitignore: Add some *.o files.

15 years agotokyotyrant plugin: Don't need to pass the db handle around, its global.
Paul Sadauskas [Mon, 6 Jul 2009 20:15:29 +0000 (14:15 -0600)]
tokyotyrant plugin: Don't need to pass the db handle around, its global.

15 years agotokyotyrant plugin: Only connect once.
Paul Sadauskas [Mon, 6 Jul 2009 20:02:46 +0000 (14:02 -0600)]
tokyotyrant plugin: Only connect once.

15 years agotokyotyrant plugin: Handle port config param as a string
Paul Sadauskas [Mon, 6 Jul 2009 19:50:49 +0000 (13:50 -0600)]
tokyotyrant plugin: Handle port config param as a string

15 years agoAdd some documentation for tokyotyrant to the collectd.conf manpage
Paul Sadauskas [Mon, 6 Jul 2009 18:22:22 +0000 (12:22 -0600)]
Add some documentation for tokyotyrant to the collectd.conf manpage

15 years agocpu plugin: Fix a typo.
Florian Forster [Mon, 6 Jul 2009 20:31:28 +0000 (22:31 +0200)]
cpu plugin: Fix a typo.

15 years agosrc/utils_threshold.c: Change the percentage code so it works with the DataSource...
Florian Forster [Mon, 6 Jul 2009 16:57:54 +0000 (18:57 +0200)]
src/utils_threshold.c: Change the percentage code so it works with the DataSource option.

The percentage code used to *always* check the first data source. With this
patch, the code honors the `DataSource' option again, checking only the
configured data sources if applicable.

15 years agocollectd.conf(5): Document the new `Percentage' option.
Florian Forster [Mon, 6 Jul 2009 16:24:20 +0000 (18:24 +0200)]
collectd.conf(5): Document the new `Percentage' option.

15 years agosrc/utils_threshold.c: Fix a typo.
Florian Forster [Mon, 6 Jul 2009 16:16:30 +0000 (18:16 +0200)]
src/utils_threshold.c: Fix a typo.

15 years agosrc/utils_threshold.c: Add a percent sign to the minimum value, too.
Florian Forster [Mon, 6 Jul 2009 16:15:47 +0000 (18:15 +0200)]
src/utils_threshold.c: Add a percent sign to the minimum value, too.

15 years agosrc/utils_threshold.c: Percentage support in thresholds
Andrés J. Díaz [Mon, 6 Jul 2009 15:53:03 +0000 (17:53 +0200)]
src/utils_threshold.c: Percentage support in thresholds

Hi all!

I attach a patch to add percentage support in thresholds, like this example:

<Threshold>
  <Type df>
   WarningMax 90
   Percentage true
 </Type>
</Threshold>

The percentage option works like collectd-nagios, that is, calculate the
percentage of the value of the first DS over the total. For df plugin,
for example,
calculate the percentage of the "used" DS.

Bugs and suggestions are welcome :)

Enjoy!

Regards,
  Andres

15 years agoUpdate README and add Paul to the AUTHORS file.
Florian Forster [Mon, 6 Jul 2009 14:51:55 +0000 (16:51 +0200)]
Update README and add Paul to the AUTHORS file.

15 years agoFix a bug with recording of port
Paul Sadauskas [Sat, 20 Jun 2009 21:38:28 +0000 (15:38 -0600)]
Fix a bug with recording of port

Port was getting written to plugin_instance as "1978.00000", because
apparently that's the value returned by the config.

15 years agoChanges suggested by Sebastian Harl.
Paul Sadauskas [Sat, 20 Jun 2009 20:50:36 +0000 (14:50 -0600)]
Changes suggested by Sebastian Harl.

 * Separate Host and Port in config, report Host as hostname, and Port as
plugin instance.
 * Submit before closing connection.
 * Else-case in config, in case of invalid config params.
 * Flounder around at using pkg-config in configure.in
 * Remove forward declarations.
 * Include plugin in config summary.

15 years agoPlugin for monitoring TokyoTyrant
Paul Sadauskas [Thu, 18 Jun 2009 19:39:11 +0000 (13:39 -0600)]
Plugin for monitoring TokyoTyrant

This plugin monitors the record count and file size of the configured
tokyocabinet server.

TokyoTyrant: http://tokyocabinet.sourceforge.net/tyrantdoc/

15 years agomemcached plugin: Pass `ai_hints' to `getaddrinfo'.
Amit Gupta [Mon, 6 Jul 2009 11:07:00 +0000 (13:07 +0200)]
memcached plugin: Pass `ai_hints' to `getaddrinfo'.

15 years agoMerge branch 'collectd-4.7'
Florian Forster [Mon, 6 Jul 2009 11:45:41 +0000 (13:45 +0200)]
Merge branch 'collectd-4.7'

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 6 Jul 2009 11:45:32 +0000 (13:45 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agobindings/java/Makefile.am: Fully support $DESTDIR.
Sebastian Harl [Mon, 22 Jun 2009 18:24:20 +0000 (20:24 +0200)]
bindings/java/Makefile.am: Fully support $DESTDIR.

15 years agosrc/Makefile: Link the ping plugin against libm.
Sebastian Harl [Sat, 6 Jun 2009 20:13:03 +0000 (22:13 +0200)]
src/Makefile: Link the ping plugin against libm.

The plugin now uses sqrt() which is provided by the math lib.

15 years agocollectd2html.pl: Added --recursive command line option.
Sebastian Harl [Mon, 22 Jun 2009 14:02:24 +0000 (16:02 +0200)]
collectd2html.pl: Added --recursive command line option.

This option may be used to recursively scan the specified directory for RRD
files. This way, the script works reasonably well with collectd 4.

Thanks to 'ABL <abl@xxx.lt>' for providing an initial patch in Debian bug
 #482185.

15 years agocollectd2html.pl: Allow for --imgformat to be passed to rrdtool.
Ivan Shmakov [Wed, 21 May 2008 10:40:04 +0000 (17:40 +0700)]
collectd2html.pl: Allow for --imgformat to be passed to rrdtool.

This was reported as Debian bug #482185.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
15 years agorrdcached plugin: Fix a typo.
Florian Forster [Wed, 1 Jul 2009 14:59:56 +0000 (16:59 +0200)]
rrdcached plugin: Fix a typo.

15 years agonetwork plugin: Cast data sources to their respective types.
Florian Forster [Wed, 1 Jul 2009 14:59:28 +0000 (16:59 +0200)]
network plugin: Cast data sources to their respective types.

15 years agoVarious plugins: Fix formatstring errors.
Florian Forster [Wed, 1 Jul 2009 14:58:52 +0000 (16:58 +0200)]
Various plugins: Fix formatstring errors.

15 years agoperl plugin: Improve handling of DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 14:56:56 +0000 (16:56 +0200)]
perl plugin: Improve handling of DERIVE and ABSOLUTE data source types.

15 years agojava plugin: Improve handling of DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 14:56:33 +0000 (16:56 +0200)]
java plugin: Improve handling of DERIVE and ABSOLUTE data source types.

15 years agocsv plugin: Improve handling of DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 14:55:38 +0000 (16:55 +0200)]
csv plugin: Improve handling of DERIVE and ABSOLUTE data source types.

15 years agocollectd-perl(5): Add the DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 14:10:26 +0000 (16:10 +0200)]
collectd-perl(5): Add the DERIVE and ABSOLUTE data source types.

15 years agogmond plugin: Add the DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 13:14:27 +0000 (15:14 +0200)]
gmond plugin: Add the DERIVE and ABSOLUTE data source types.

15 years agocouchdb plugin: Add the DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 12:54:55 +0000 (14:54 +0200)]
couchdb plugin: Add the DERIVE and ABSOLUTE data source types.

15 years agosrc/utils_cmd_putval.c: Use `parse_values'.
Florian Forster [Wed, 1 Jul 2009 12:54:13 +0000 (14:54 +0200)]
src/utils_cmd_putval.c: Use `parse_values'.

15 years agosnmp plugin: Use `parse_value' instead of using a separate function here.
Florian Forster [Wed, 1 Jul 2009 12:53:50 +0000 (14:53 +0200)]
snmp plugin: Use `parse_value' instead of using a separate function here.

15 years agosrc/plugin.c: Introduce the `DS_TYPE_TO_STRING' macro.
Florian Forster [Wed, 1 Jul 2009 09:18:52 +0000 (11:18 +0200)]
src/plugin.c: Introduce the `DS_TYPE_TO_STRING' macro.

15 years agosrc/common.c: Rewrite `parse_value'.
Florian Forster [Wed, 1 Jul 2009 12:50:24 +0000 (14:50 +0200)]
src/common.c: Rewrite `parse_value'.

15 years agosrc/utils_cache.c: Add the DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 09:01:58 +0000 (11:01 +0200)]
src/utils_cache.c: Add the DERIVE and ABSOLUTE data source types.

15 years agosrc/plugin.h: Use `int64_t' for `derive_t' and `uint64_t' for `absolute_t'.
Florian Forster [Wed, 1 Jul 2009 09:00:32 +0000 (11:00 +0200)]
src/plugin.h: Use `int64_t' for `derive_t' and `uint64_t' for `absolute_t'.

15 years agonetwork plugin: Add the DERIVE and ABSOLUTE data source types.
Florian Forster [Wed, 1 Jul 2009 08:22:42 +0000 (10:22 +0200)]
network plugin: Add the DERIVE and ABSOLUTE data source types.

15 years agogmond plugin: Use `strtoull' to parse counter values.
Florian Forster [Wed, 1 Jul 2009 13:39:11 +0000 (15:39 +0200)]
gmond plugin: Use `strtoull' to parse counter values.

Instead of `strtoll'.

15 years agosrc/common.c: More reliable error reporting in `parse_values'.
Florian Forster [Wed, 1 Jul 2009 12:56:17 +0000 (14:56 +0200)]
src/common.c: More reliable error reporting in `parse_values'.

15 years agoIntroduce the DERIVE and ABSOLUTE data source types.
Mariusz Gronczewski [Wed, 1 Jul 2009 07:14:29 +0000 (09:14 +0200)]
Introduce the DERIVE and ABSOLUTE data source types.

Hi,

i've updated my patch to 4.7.0, most of "data input" plugins (curl, java, exec,
perl, tail, couchdb) should work with derive. In case of couchdb and curl, if u
use absolute DS you can only "Set", no "Inc" or "Add" coz obviously that
wouldn't make much sense with it. Other plugins can be "enabled" globally to
use derive by changing "COUNTER" to "DERIVE" in types.db but that way is ugly
(but makes sense in some cases, like when u have lot of tunnels or ppp
interfaces) and either needs converting or recreating rrd files.

Regards
Mariusz

---

Hi,

ive been running my patch with 4.7.1, found a minor bug, but after repairing
that i didnt had any problems with it on my servers, im including patch
(against 4.7.1 from webpage),

Regards,
XANi

15 years agoconfigure.in: Add -rpath to JAVA_LDFLAGS.
Florian Forster [Sat, 27 Jun 2009 11:19:53 +0000 (13:19 +0200)]
configure.in: Add -rpath to JAVA_LDFLAGS.

15 years agosrc/plugin.[ch]: Add meta data to value_list_t.
Florian Forster [Sat, 27 Jun 2009 10:53:34 +0000 (12:53 +0200)]
src/plugin.[ch]: Add meta data to value_list_t.

15 years agosrc/meta_data.[ch]: Add a boolean type.
Florian Forster [Sat, 27 Jun 2009 10:53:15 +0000 (12:53 +0200)]
src/meta_data.[ch]: Add a boolean type.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agosrc/utils_cache.c: Try to improve code readability.
Florian Forster [Sat, 20 Jun 2009 10:50:21 +0000 (12:50 +0200)]
src/utils_cache.c: Try to improve code readability.

Unfortunately, there is quite some magic going on there :/

15 years agosrc/utils_cache.c: Fix OKAY notifications for missing values.
Andrés J. Díaz [Sat, 20 Jun 2009 10:49:34 +0000 (12:49 +0200)]
src/utils_cache.c: Fix OKAY notifications for missing values.

15 years agosrc/Makefile.am: Link the `sensors' plugin against libsensors.
Mirko Buffoni [Sat, 20 Jun 2009 10:24:41 +0000 (12:24 +0200)]
src/Makefile.am: Link the `sensors' plugin against libsensors.

This regression was introduced in 451d75ba.

15 years agodns plugin: Improve debug message.
Florian Forster [Sat, 20 Jun 2009 09:43:42 +0000 (11:43 +0200)]
dns plugin: Improve debug message.

15 years agolibcollectdclient/client.c: Made sstrerror() static.
Sebastian Harl [Tue, 2 Jun 2009 19:53:29 +0000 (21:53 +0200)]
libcollectdclient/client.c: Made sstrerror() static.

This is a private helper function only.

15 years agoBumped version to 4.7.1; Updated ChangeLog. collectd-4.7.1
Florian Forster [Tue, 2 Jun 2009 09:39:41 +0000 (11:39 +0200)]
Bumped version to 4.7.1; Updated ChangeLog.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Tue, 2 Jun 2009 09:31:32 +0000 (11:31 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh

15 years agoBumped version to 4.6.3; Updated ChangeLog. collectd-4.6.3
Florian Forster [Tue, 2 Jun 2009 09:15:03 +0000 (11:15 +0200)]
Bumped version to 4.6.3; Updated ChangeLog.

15 years agoconfigure: Include libganglia in the configuration summary.
Sebastian Harl [Sun, 31 May 2009 20:56:39 +0000 (22:56 +0200)]
configure: Include libganglia in the configuration summary.

15 years agoChangeLog: Fixed sorting of entries.
Sebastian Harl [Wed, 27 May 2009 19:58:00 +0000 (21:58 +0200)]
ChangeLog: Fixed sorting of entries.

15 years agoconfigfile.c: Fixed Include'ing empty files.
Sebastian Harl [Thu, 28 May 2009 09:15:41 +0000 (11:15 +0200)]
configfile.c: Fixed Include'ing empty files.

When including empty files, a typo prevented that the "Include" child (of the
config parse tree) was removed correctly, leaving behind garbage which in turn
led to a segfault if the Include option was not the last element of the config
file.

Also, another Include option following the inclusion of an empty file used to
be ignored. This has been fixed as well.

15 years agojava plugin: Replace dots ('.') with slashes ('/') when loading a class.
Florian Forster [Thu, 28 May 2009 10:10:42 +0000 (12:10 +0200)]
java plugin: Replace dots ('.') with slashes ('/') when loading a class.

Thanks to Randy Rizun for pointing this out:

Hi!

just wanted to point out an issue in cjni_config_load_plugin

the call to FindClass passes the "Name" verbatim from the LoadPlugin directive

one might intuitively say LoadPlugin "com.foobar.Plugin"

whereas FindClass wants to see it as "com/foobar/Plugin"

so I guess either (a) document LoadPlugin to say to use slashes or (b)
subst / for . in cjni_config_load_plugin or (c) something else?!?

of course, everything works fine if my plugin is in the 'default' java
package (i.e., no package name) =)

either way, thanks a lot for the great work!!

-Randy

15 years agojava plugin: Use slashes rather than dots to lookup classes.
Randy Rizun [Thu, 28 May 2009 10:06:37 +0000 (12:06 +0200)]
java plugin: Use slashes rather than dots to lookup classes.

there are three (3) invocations of FindClass that use "." periods
instead of "/" slashes

java.lang.Long
java.lang.Double
org.collectd.api.DataSet

those need to be fixed up to use "/" slashes

Thanks!

15 years agoMerge branch 'collectd-4.7'
Florian Forster [Wed, 27 May 2009 13:03:53 +0000 (15:03 +0200)]
Merge branch 'collectd-4.7'

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Wed, 27 May 2009 13:03:44 +0000 (15:03 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agodns plugin: Fix a compile warning.
Florian Forster [Wed, 27 May 2009 13:03:12 +0000 (15:03 +0200)]
dns plugin: Fix a compile warning.