Code

collectd.git
15 years agoCollectd::Unixsock: Add support for the “GETTHRESHOLD” command.
Florian Forster [Sun, 6 Sep 2009 08:57:41 +0000 (10:57 +0200)]
Collectd::Unixsock: Add support for the “GETTHRESHOLD” command.

15 years agounixsock plugin: Implement the “GETTHRESHOLD” command.
Florian Forster [Sun, 6 Sep 2009 08:54:01 +0000 (10:54 +0200)]
unixsock plugin: Implement the “GETTHRESHOLD” command.

Example session:
 -> GETTHRESHOLD "leeloo.lan.home.verplant.org/cpu-3/cpu-idle"
 <- 6 Threshold found
 <- Type: cpu
 <- Type Instance: idle
 <- Warning Min: 5
 <- Warning Max: 100
 <- Failure Min: 1
 <- Failure Max: 120

15 years agosrc/utils_threshold.[ch]: Update copyright information.
Florian Forster [Sat, 5 Sep 2009 14:41:01 +0000 (16:41 +0200)]
src/utils_threshold.[ch]: Update copyright information.

15 years agosrc/utils_threshold.[ch]: Implement `ut_search_threshold'.
Florian Forster [Sat, 5 Sep 2009 14:36:12 +0000 (16:36 +0200)]
src/utils_threshold.[ch]: Implement `ut_search_threshold'.

It allows external modules to query the threshold for a specific
`value_list_t'.

15 years agoREADME: Add missing plugins; moved “write_http”.
Florian Forster [Sat, 5 Sep 2009 09:05:19 +0000 (11:05 +0200)]
README: Add missing plugins; moved “write_http”.

15 years agoChangeLog: Updated for the 4.8.0 release.
Florian Forster [Thu, 3 Sep 2009 09:48:43 +0000 (11:48 +0200)]
ChangeLog: Updated for the 4.8.0 release.

15 years agosrc/utils_threshold.c: Implement the “Hits” and “Hysteresis” config options.
Andrés J. Díaz [Mon, 31 Aug 2009 19:16:41 +0000 (21:16 +0200)]
src/utils_threshold.c: Implement the “Hits” and “Hysteresis” config options.

Hi all!

Based on Mariusz's idea, i attach a patch for thresholds (no for
filtering, yet) with basic hysteresis support adding the keyword
Hysteresis to configuration file, for example:

<Threshold>
  <Type "load">
     DataSource "midterm"
     WarningMax 1
     Hysteresis 0.3
  </Type "load">
</Treshold>

In this case the notification is raised when load (midterm datasource)
is greater than 1, and came back to OKAY when lower than 0.7 (1 - 0.3).

This is a proof of concept and I do not have a lot of time to test,
please use this patch with caution. Furthermore, the code is really hard
and dirty :)

Best regards,
  Andres

P.S.: The patch also including hits support, so to compile you also
require to apply hits-cache.patch and, obviously this patch is
incompatible with hits-threshold.patch.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agosrc/utils_cache.c: Implement “uc_{get,set,inc}_hits”.
Andrés J. Díaz [Mon, 31 Aug 2009 16:06:15 +0000 (18:06 +0200)]
src/utils_cache.c: Implement “uc_{get,set,inc}_hits”.

Hi

I've attached a patch to add hit counter to thresholds, that is, each
time when threhsold raised, then an internal hit counter is incremented,
when the value of the counter raise a specific value setted in
configuration, then the notification is generated and counter is reset.
Here are an example of threshold configuration with hit conter:

<Threshold>
  <Plugin load>
    <Type load>
       WarninMax 1
       Hits 3
    </Type>
   </Plugin>
</Threshold>

In this example the notification will be generated when load value is
greater than 1 for 3 intervals.

Here are two patches, the first one adds hit feature to the collectd
cached and the second one use hits in thresholds,

Of course comments and suggestions are welcome :)

Enjoy!

Regards,
  Andres

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocontrib/collection3: Add graphing module for “arc_counts”.
Anthony Dewhurst [Sun, 30 Aug 2009 21:08:17 +0000 (22:08 +0100)]
contrib/collection3: Add graphing module for “arc_counts”.

Managed to forget this: script for generating the ArcCounts graphs.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agozfs_arc plugin: add to default config file
Anthony Dewhurst [Sun, 30 Aug 2009 20:53:51 +0000 (21:53 +0100)]
zfs_arc plugin: add to default config file

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agowrite_http plugin: Make it possible to send values as JSON.
Florian Forster [Sun, 30 Aug 2009 13:23:33 +0000 (15:23 +0200)]
write_http plugin: Make it possible to send values as JSON.

15 years agowrite_http plugin: Send “\r\n” line endings.
Florian Forster [Sun, 30 Aug 2009 09:12:19 +0000 (11:12 +0200)]
write_http plugin: Send “\r\n” line endings.

15 years agowrite_http plugin: Suppress the “Expect:” header.
Florian Forster [Sun, 30 Aug 2009 09:11:55 +0000 (11:11 +0200)]
write_http plugin: Suppress the “Expect:” header.

15 years agowrite_http plugin: Fix a typo.
Florian Forster [Sun, 30 Aug 2009 08:41:52 +0000 (10:41 +0200)]
write_http plugin: Fix a typo.

15 years agoMerge branch 'ad/arc'
Florian Forster [Sun, 30 Aug 2009 07:47:17 +0000 (09:47 +0200)]
Merge branch 'ad/arc'

15 years agonetwork plugin: “sizeof (send_buffer)” → “network_config_packet_size”.
Aman Gupta [Sat, 29 Aug 2009 20:11:27 +0000 (22:11 +0200)]
network plugin: “sizeof (send_buffer)” → “network_config_packet_size”.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoREADME, AUTHORS: Add information about the zfs_arc plugin and Anthony.
Florian Forster [Sat, 29 Aug 2009 14:03:46 +0000 (16:03 +0200)]
README, AUTHORS: Add information about the zfs_arc plugin and Anthony.

15 years agozfs_arc plugin: Fix a small typo.
Florian Forster [Sat, 29 Aug 2009 13:25:23 +0000 (15:25 +0200)]
zfs_arc plugin: Fix a small typo.

15 years agozfs_arc plugin: Renamed the “arc” plugin to “zfs_arc”.
Florian Forster [Sat, 29 Aug 2009 13:21:42 +0000 (15:21 +0200)]
zfs_arc plugin: Renamed the “arc” plugin to “zfs_arc”.

15 years agoarc plugin: Remove a left-over `printf'.
Florian Forster [Sun, 2 Aug 2009 10:07:03 +0000 (12:07 +0200)]
arc plugin: Remove a left-over `printf'.

15 years agoARC stats plugin
Anthony Dewhurst [Thu, 30 Jul 2009 22:44:00 +0000 (23:44 +0100)]
ARC stats plugin

Get stats for ZFS's Adaptive Replacement Cache.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoMerge branch 'ps/http'
Florian Forster [Sat, 29 Aug 2009 08:45:38 +0000 (10:45 +0200)]
Merge branch 'ps/http'

15 years agowrite_http plugin: Implement the usual SSL options.
Florian Forster [Sat, 29 Aug 2009 08:39:09 +0000 (10:39 +0200)]
write_http plugin: Implement the usual SSL options.

15 years agowrite_http plugin: Implement support for multiple destinations.
Florian Forster [Sat, 29 Aug 2009 08:33:19 +0000 (10:33 +0200)]
write_http plugin: Implement support for multiple destinations.

15 years agocollectd.conf(5): Updated to reflect the renaming of the “write_http” plugin.
Florian Forster [Sat, 29 Aug 2009 06:23:29 +0000 (08:23 +0200)]
collectd.conf(5): Updated to reflect the renaming of the “write_http” plugin.

15 years agowrite_http plugin: Rename the “http” plugin to “write_http”.
Florian Forster [Sat, 29 Aug 2009 06:07:21 +0000 (08:07 +0200)]
write_http plugin: Rename the “http” plugin to “write_http”.

15 years agocollectd.conf(5): Renamed the couchdb plugin to curl_json here, too.
Florian Forster [Thu, 27 Aug 2009 07:46:09 +0000 (09:46 +0200)]
collectd.conf(5): Renamed the couchdb plugin to curl_json here, too.

15 years agocurl_json plugin: Renamed the “couchdb” plugin to “curl_json”.
Florian Forster [Thu, 27 Aug 2009 07:06:16 +0000 (09:06 +0200)]
curl_json plugin: Renamed the “couchdb” plugin to “curl_json”.

On Thu, Aug 20, 2009 at 10:31:22AM -0700, Doug MacEachern wrote:
> Wanted to bring this up before 4.8..
> When I first started on the couchdb plugin, there were metrics
> specific to couchdb, but ended up making it generic and the metrics
> are all specified in the config.  Since then, I've looked at Dynomite
> which has its own set of metrics exposed the same way:
> http://gist.github.com/137771
> Also noticed Hadoop 0.21 daemons now support: "/metrics?format=json to
> retrieve the data in a structured form.", but haven't had a chance to
> try yet.  I'm sure there's more too.  So I'm wondering if 'couchdb'
> should be renamed to something more generic, 'json' or 'yajl'  maybe?
> And/or pushing the curl/yajl code out to util functions, then add the
> couchdb specific metrics to the couchdb plugin.  Then also use the
> util functions for dynomite, hadoop, etc., specific plugins. Thoughts?

15 years agoconfigure.in: Check for the <linux/wireless.h> header.
Florian Forster [Sun, 23 Aug 2009 10:37:43 +0000 (12:37 +0200)]
configure.in: Check for the <linux/wireless.h> header.

15 years agonetwork plugin: Free dynamically allocated buffers when appropriate.
Aman Gupta [Sat, 22 Aug 2009 08:04:10 +0000 (10:04 +0200)]
network plugin: Free dynamically allocated buffers when appropriate.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoconfigure.in: Sort the status output alphabetically.
Florian Forster [Fri, 21 Aug 2009 11:14:47 +0000 (13:14 +0200)]
configure.in: Sort the status output alphabetically.

15 years agohttp plugin: Update the copyright notice and AUTHORS file.
Florian Forster [Fri, 21 Aug 2009 11:03:10 +0000 (13:03 +0200)]
http plugin: Update the copyright notice and AUTHORS file.

15 years agohttp plugin: Small fixes for the buffer handling.
Florian Forster [Fri, 21 Aug 2009 10:45:54 +0000 (12:45 +0200)]
http plugin: Small fixes for the buffer handling.

Don't actually send anything when the buffer is empty. Initialize the
buffer in the ‘init’ function.

15 years agohttp plugin: Implement a `flush' callback.
Florian Forster [Fri, 21 Aug 2009 09:34:39 +0000 (11:34 +0200)]
http plugin: Implement a `flush' callback.

15 years agohttp plugin: http_write: Clean-up.
Florian Forster [Fri, 21 Aug 2009 09:34:05 +0000 (11:34 +0200)]
http plugin: http_write: Clean-up.

A couple of bugs have been fixed in the process. One error handling path
didn't release a mutex, for example. Also, the buffer may have been sent
truncated.

15 years agohttp plugin: Comment in the call to `curl_easy_perform'.
Florian Forster [Fri, 21 Aug 2009 09:24:24 +0000 (11:24 +0200)]
http plugin: Comment in the call to `curl_easy_perform'.

15 years agohttp plugin: http_value_list_to_string: Clean-up.
Florian Forster [Fri, 21 Aug 2009 09:23:30 +0000 (11:23 +0200)]
http plugin: http_value_list_to_string: Clean-up.

15 years agohttp plugin: Use the `FORMAT_VL' macro.
Florian Forster [Fri, 21 Aug 2009 08:23:30 +0000 (10:23 +0200)]
http plugin: Use the `FORMAT_VL' macro.

15 years agohttp plugin: Don't convert COUNTER values to rates.
Florian Forster [Fri, 21 Aug 2009 08:22:59 +0000 (10:22 +0200)]
http plugin: Don't convert COUNTER values to rates.

15 years agohttp plugin: Remove an unused variable.
Florian Forster [Fri, 21 Aug 2009 08:22:38 +0000 (10:22 +0200)]
http plugin: Remove an unused variable.

15 years agohttp plugin: Rename the “Location” option to “URL”.
Florian Forster [Fri, 21 Aug 2009 07:21:19 +0000 (09:21 +0200)]
http plugin: Rename the “Location” option to “URL”.

That's more in line with other plugins.

15 years agohttp plugin: Remove tailing whitespace.
Florian Forster [Fri, 21 Aug 2009 07:13:55 +0000 (09:13 +0200)]
http plugin: Remove tailing whitespace.

15 years agohttp plugin: Add entries to collectd.conf
Paul Sadauskas [Thu, 9 Jul 2009 16:33:48 +0000 (10:33 -0600)]
http plugin: Add entries to collectd.conf

15 years agohttp plugin: Man page about config vars
Paul Sadauskas [Thu, 9 Jul 2009 16:31:49 +0000 (10:31 -0600)]
http plugin: Man page about config vars

15 years agohttp plugin: Put the makefile stuff in the right place alphabetically
Paul Sadauskas [Thu, 9 Jul 2009 16:27:14 +0000 (10:27 -0600)]
http plugin: Put the makefile stuff in the right place alphabetically

15 years agohttp plugin: Make the output match the PUTVAL plain-text protocol
Paul Sadauskas [Wed, 8 Jul 2009 23:36:39 +0000 (17:36 -0600)]
http plugin: Make the output match the PUTVAL plain-text protocol

15 years agoconfigure.in: Add the http plugin to the status output.
Florian Forster [Tue, 7 Jul 2009 16:31:45 +0000 (18:31 +0200)]
configure.in: Add the http plugin to the status output.

15 years agohttp plugin: Remove trailing whitespace.
Florian Forster [Mon, 6 Jul 2009 20:47:48 +0000 (22:47 +0200)]
http plugin: Remove trailing whitespace.

15 years agohttp plugin: Better error handling, and flush before shutdown
Paul Sadauskas [Mon, 22 Jun 2009 21:06:25 +0000 (15:06 -0600)]
http plugin: Better error handling, and flush before shutdown

15 years agohttp plugin: Remove some debugging info
Paul Sadauskas [Mon, 22 Jun 2009 20:22:59 +0000 (14:22 -0600)]
http plugin: Remove some debugging info

15 years agohttp plugin: POST when a 4K buffer is nearly full
Paul Sadauskas [Mon, 22 Jun 2009 20:10:17 +0000 (14:10 -0600)]
http plugin: POST when a 4K buffer is nearly full

15 years agohttp plugin: Set mutex around curl, so we only perform once at a time
Paul Sadauskas [Sat, 20 Jun 2009 22:54:18 +0000 (16:54 -0600)]
http plugin: Set mutex around curl, so we only perform once at a time

15 years agohttp plugin: Fix a memory leak by cleaning up the curl handles
Paul Sadauskas [Wed, 17 Jun 2009 16:49:02 +0000 (10:49 -0600)]
http plugin: Fix a memory leak by cleaning up the curl handles

15 years agohttp plugin: don't copy the error buffer
Erik Cunningham [Wed, 17 Jun 2009 16:24:24 +0000 (10:24 -0600)]
http plugin: don't copy the error buffer

15 years agohttp plugin: Dont hold open curl connections. It ties up apache
Paul Sadauskas [Mon, 15 Jun 2009 02:22:12 +0000 (20:22 -0600)]
http plugin: Dont hold open curl connections. It ties up apache

15 years agohttp plugin: Initialze curl every time, to we don't clobber things
Paul Sadauskas [Mon, 15 Jun 2009 01:52:18 +0000 (19:52 -0600)]
http plugin: Initialze curl every time, to we don't clobber things

15 years agohttp plugin: Separate values into multiple lines
Paul Sadauskas [Mon, 15 Jun 2009 00:43:50 +0000 (18:43 -0600)]
http plugin: Separate values into multiple lines

15 years agohttp plugin: it works, i think
Paul Sadauskas [Fri, 12 Jun 2009 22:46:53 +0000 (16:46 -0600)]
http plugin: it works, i think

15 years agohttp plugin: Start in http plugin that can output csv to stdout
Paul Sadauskas [Tue, 7 Jul 2009 16:38:36 +0000 (18:38 +0200)]
http plugin: Start in http plugin that can output csv to stdout

15 years agojava bindings: GenericJMX: Implement user/password authentication.
Florian Forster [Thu, 20 Aug 2009 15:21:33 +0000 (17:21 +0200)]
java bindings: GenericJMX: Implement user/password authentication.

15 years agonetwork plugin: Remove a now invalid assertion.
Aman Gupta [Thu, 20 Aug 2009 09:53:22 +0000 (11:53 +0200)]
network plugin: Remove a now invalid assertion.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocontrib/GenericJMX.conf: Fix some typos and improve type instances.
Florian Forster [Wed, 19 Aug 2009 15:50:37 +0000 (17:50 +0200)]
contrib/GenericJMX.conf: Fix some typos and improve type instances.

15 years agosrc/types.db: Sort alphabetically.
Florian Forster [Wed, 19 Aug 2009 15:15:55 +0000 (17:15 +0200)]
src/types.db: Sort alphabetically.

15 years agocontrib/GenerixJMX.conf: Add some example configuration for Tomcat.
Florian Forster [Wed, 19 Aug 2009 15:15:08 +0000 (17:15 +0200)]
contrib/GenerixJMX.conf: Add some example configuration for Tomcat.

Currently configured for tomcat are:

 * Received / sent octets for each request processor.
 * Number of requests.
 * Time spent processing queries.
 * Number of total/busy threads.

The first three values are available as a summary for a request processor
as well as detailed (for each thread).

This configuration is yet untested and may contain obvious typos!

15 years agojava bindings: GenericJMX plugin: Implement the ‘InstanceFrom’ option for <value...
Florian Forster [Wed, 19 Aug 2009 15:01:30 +0000 (17:01 +0200)]
java bindings: GenericJMX plugin: Implement the ‘InstanceFrom’ option for <value /> blocks.

15 years agoswap plugin: Fix the ‘swap_submit’ invocation of non-Linux implementations.
Florian Forster [Wed, 19 Aug 2009 09:39:41 +0000 (11:39 +0200)]
swap plugin: Fix the ‘swap_submit’ invocation of non-Linux implementations.

And replace all the ‘unsigned long long’s with ‘derive_t’.

15 years agoadded swapin/out support to swap plugin
Stefan Völkel [Mon, 17 Aug 2009 13:50:17 +0000 (13:50 +0000)]
added swapin/out support to swap plugin

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'mg/jitter'
Florian Forster [Tue, 18 Aug 2009 19:39:03 +0000 (21:39 +0200)]
Merge branch 'mg/jitter'

15 years agocollectd.conf(5): Document the new `RandomTimeout' option.
Florian Forster [Tue, 18 Aug 2009 19:38:01 +0000 (21:38 +0200)]
collectd.conf(5): Document the new `RandomTimeout' option.

15 years agorrdtool plugin: Optimize away the ‘random_timeout_mod’ variable.
Florian Forster [Tue, 18 Aug 2009 19:23:21 +0000 (21:23 +0200)]
rrdtool plugin: Optimize away the ‘random_timeout_mod’ variable.

15 years agorrdtool plugin: Call rand(3) less often.
Mariusz Gronczewski [Tue, 18 Aug 2009 19:18:06 +0000 (21:18 +0200)]
rrdtool plugin: Call rand(3) less often.

2009/8/18 Florian Forster <octo@verplant.org>:
> Hi Mariusz,
>
> On Mon, Aug 17, 2009 at 02:20:29AM +0200, Mariusz Gronczewski wrote:
>> i was thinking how to "spread out" writes to rrd files a bit, because
>> now its big spike every CacheTimeout or little smaller "square" on
>> graph if u use WritesPerSecond.
>
> in general I like your patch, thank you very much for posting it :)
> I have some doubts about calling rand() in such a busy place though,
> since getting random numbers is potentially costly. Also, rand(3) is not
> thread-safe, though I don't think that's really an issue for us.

Yeah good point, but that would be probably noticable on very slow
(like PIII 800 slow) machines with tons of rrd, and then machine would
run out of disk bandwidth first.

> Maybe a solution would be to add a ‘random_timeout’ member to the
> ‘rrd_cache_t’ struct, too. This member is then set when creating the
> entry and set again right after the values have been removed. That way
> rand(3) is only called once for each write instead of calling for every
> check.
Yeah, very good idea, i didnt thougth about that (well tbh. i didnt
looked much into "interiors" of rrdtool plugin). Ive implemented it in
attached patch, so far ive been testing it for about 1 hour and works
pretty well.

> As an interesting sidenote: With the above approach, the random write
> times are distributed “uniform”, i. e. every delay from 0 to max-1
> seconds has the same probability. With your code, I think the actual
> time a value is written follows a “normal” distribution (you know, that
> famous bell curve). So I'd expect the above approach to spread the value
> quicker.

Yup, exactly as u said, its much quicker like that.
Im wondering how config variable should be called, name
"RandomTimeout" dont mean anything useful ("random timeout of what?"),
maybe TimeoutSpread ? RandomizeTimeout ?

15 years agosrc/Makefile.am: Add `madwifi.h' to madwifi_la_SOURCES.
Florian Forster [Tue, 18 Aug 2009 10:23:53 +0000 (12:23 +0200)]
src/Makefile.am: Add `madwifi.h' to madwifi_la_SOURCES.

The header file was not included in generated distribution tarballs.

15 years agonetwork plugin: Add MaxPacketSize config option to the network plugin.
Aman Gupta [Tue, 18 Aug 2009 08:10:20 +0000 (01:10 -0700)]
network plugin: Add MaxPacketSize config option to the network plugin.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocontrib/GenericJMX.conf: Fix ‘property patterns’ in the sample config.
Florian Forster [Mon, 17 Aug 2009 20:51:16 +0000 (22:51 +0200)]
contrib/GenericJMX.conf: Fix ‘property patterns’ in the sample config.

See also: <http://java.sun.com/j2se/1.5.0/docs/api/javax/management/ObjectName.html>

15 years agoRandom write timeout for rrdtool plugin
Mariusz Gronczewski [Mon, 17 Aug 2009 00:20:29 +0000 (02:20 +0200)]
Random write timeout for rrdtool plugin

Hi,

i was thinking how to "spread out" writes to rrd files a bit, because
now its big spike every CacheTimeout or little smaller "square" on
graph if u use WritesPerSecond. So ive written little patch which
"spreads out" writing by changing Cache timeout every time rrdtool
plugin finds data to save. Basically instead of moving data older than
CacheTimeout to write queue it moves it if its older than CacheTimeout
+- RandomTimeout. What it changes?

Without it, gathered data is "synchronised" with eachother, for
example (CacheTimeout = 600):
1.collectd starts
2. after 10 minutes, data from all plugins get "too old" and get
pushed into write queue and get saved
3. after another 10 minutes, same thing, all data "ages" at same time
and get saved in one big chunk

With it (RandomTimeout=300) it works like that
1. collectd starts
2. after 5 minutes some data (lets call it A) starts to go into write queue
3. after 10 minutes from start about 50% (on average) data is saved
(lets call it B)
4. finally, after 15 minutes, all "leftover" data gets saved (lets call it C)
5. next "cycle"
6. data A ages first (cos it was put to disk first) and like before,
some of it gets writen earlier, some of it gets written later)
7. after that data B ages and like before writes are spread over 10 mins
8. same with C

so first cycle (looking at i/o) looks like sinus, next 10 minute cycle
is same sinus but flattened a bit and so on (looks like fading sinus),
and after few cycles it gives pretty much same amount on writes per
sec, no ugly spikes.
Effect looks like that:
http://img24.imageshack.us/img24/7294/drrawcgi.png
(after few more h it will be more "smooth")

Regards
Mariusz

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agoMerge branch 'collectd-4.7'
Florian Forster [Mon, 17 Aug 2009 08:53:07 +0000 (10:53 +0200)]
Merge branch 'collectd-4.7'

15 years agojava plugin: Fix configuration with multiple blocks.
Florian Forster [Mon, 17 Aug 2009 08:52:16 +0000 (10:52 +0200)]
java plugin: Fix configuration with multiple blocks.

The number of children was not updated.

15 years agoMerge branch 'collectd-4.7'
Florian Forster [Mon, 17 Aug 2009 08:46:05 +0000 (10:46 +0200)]
Merge branch 'collectd-4.7'

Conflicts:
src/network.c

15 years agojava plugin: Wait with the configuration until the daemon has forked.
Florian Forster [Mon, 17 Aug 2009 08:39:55 +0000 (10:39 +0200)]
java plugin: Wait with the configuration until the daemon has forked.

Passing the configuration to Java-based plugins requires the JVM to be
active and running. However, the JVM starts some threads that are lost
when the daemon forks to the background.

This patch changes the behavior of the Java plugin to copy the
configuration blocks found to a local variable and run the configuration
of the Java-based plugins from the `init' callback, because it is
invoked after the daemon has forked to the background.

15 years agoMerge branch 'collectd-4.6' into collectd-4.7
Florian Forster [Mon, 17 Aug 2009 07:48:43 +0000 (09:48 +0200)]
Merge branch 'collectd-4.6' into collectd-4.7

15 years agocontrib/fedora/init.d-collectd: Fix condrestart.
Alan Pevec [Tue, 11 Aug 2009 22:52:47 +0000 (00:52 +0200)]
contrib/fedora/init.d-collectd: Fix condrestart.

on upgrade collectd is not restarted
https://bugzilla.redhat.com/show_bug.cgi?id=516273

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agomadwifi plugin: Signal an error in the read function when appropriate.
Florian Forster [Mon, 17 Aug 2009 06:32:55 +0000 (08:32 +0200)]
madwifi plugin: Signal an error in the read function when appropriate.

An error will be signaled to the daemon if querying all interfaces failed.
Querying an interface fails if all ioctls return an error.

15 years agosrc/utils_cache.c: Update GETVAL output when missing state.
Andrés J. Díaz [Tue, 11 Aug 2009 19:57:34 +0000 (21:57 +0200)]
src/utils_cache.c: Update GETVAL output when missing state.

Hi

I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.

I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.

BTW a GETSTATE command will be an useful feature too :P

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/utils_cache.c: Update GETVAL output when missing state.
Andrés J. Díaz [Tue, 11 Aug 2009 19:57:34 +0000 (21:57 +0200)]
src/utils_cache.c: Update GETVAL output when missing state.

Hi

I think that I've found a bug when use unixsock plugin. The problem is
releate with missing state, when no value is received by daemon for a
while in the cache is marked as MISSING, but the last value is still
showing even when machine is not reporting in a GETVAL and LISTVAL
commands. Some utlities like collectd-nagios does not work correctly,
and report an OKAY value when host is not reporting from a long time.

I attach a patch with check the state value of an cache entry in
uc_get_names and in uc_get_rate_by_name. This patch works for me, but
it's not very tested yet, and I not very sure about if it's a good way
to check the problem. The patch is tested on 4.7.2 release version.

BTW a GETSTATE command will be an useful feature too :P

Regards,
  Andres

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agomadwifi plugin: Rename the antenna stats.
Florian Forster [Sun, 16 Aug 2009 07:27:44 +0000 (09:27 +0200)]
madwifi plugin: Rename the antenna stats.

The first part of the type instance is already something like `ast_ant_rx' -
using `antenna%i' as the second part is therefore redundant. Thanks to Ondrej
for the pointer.

15 years agomadwifi plugin: Unify ioctl error handling.
Florian Forster [Sun, 16 Aug 2009 07:21:05 +0000 (09:21 +0200)]
madwifi plugin: Unify ioctl error handling.

If an ioctl fails, a debug message is generated rather than an error message.
There are several types of interfaces manages by the madwifi driver, and not
all interfaces support all ioctls. Thanks to Ondrej for pointing this out.

15 years agomadwifi plugin: Fix buffer handling around `readlink'.
Florian Forster [Sun, 16 Aug 2009 07:13:31 +0000 (09:13 +0200)]
madwifi plugin: Fix buffer handling around `readlink'.

readlink(2) doesn't null-terminate the buffer in any case. Thanks to Ondrej for
pointing this out.

15 years agosrc/plugin.c: Make `plugin_unregister_read' functional again.
Florian Forster [Thu, 13 Aug 2009 10:37:20 +0000 (12:37 +0200)]
src/plugin.c: Make `plugin_unregister_read' functional again.

15 years agoMerge branch 'ff/genericjmx'
Florian Forster [Thu, 13 Aug 2009 06:14:24 +0000 (08:14 +0200)]
Merge branch 'ff/genericjmx'

15 years agolibvirt plugin: Further improve the connection handling.
Florian Forster [Wed, 12 Aug 2009 13:08:40 +0000 (15:08 +0200)]
libvirt plugin: Further improve the connection handling.

Use the complaint mechanism for failed connection attempts and handle multiple
`Connection' configuration options like other options in other plugins (i. e.
later options overwrite earlier settings of the same name).

15 years agolibvirt plugin: Re-connect to libvirtd if connecting fails.
Alan Pevec [Tue, 11 Aug 2009 22:53:00 +0000 (00:53 +0200)]
libvirt plugin: Re-connect to libvirtd if connecting fails.

https://bugzilla.redhat.com/show_bug.cgi?id=480997

Signed-off-by: Alan Pevec <apevec@redhat.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
15 years agosrc/meta_data.c: Fix a typo.
Florian Forster [Wed, 22 Jul 2009 08:20:59 +0000 (10:20 +0200)]
src/meta_data.c: Fix a typo.

15 years agoAUTHORS: Add Ondrej.
Florian Forster [Tue, 11 Aug 2009 14:44:22 +0000 (16:44 +0200)]
AUTHORS: Add Ondrej.

15 years agomadwifi plugin: Add some assertions …
Florian Forster [Tue, 11 Aug 2009 14:29:28 +0000 (16:29 +0200)]
madwifi plugin: Add some assertions …

… to otherwise unchecked array indices.

15 years agomadwifi plugin: Fix a few best practices.
Florian Forster [Tue, 11 Aug 2009 14:08:03 +0000 (16:08 +0200)]
madwifi plugin: Fix a few best practices.

Use `sstrncpy' and `ssnprintf' instead of the unsafe versions. Don't
specify array dimensions twice. Don't cast _Bool to int.

15 years agomadwifi plugin: Rename the ‘DisableSysfs’ to ‘Source’.
Florian Forster [Tue, 11 Aug 2009 11:24:04 +0000 (13:24 +0200)]
madwifi plugin: Rename the ‘DisableSysfs’ to ‘Source’.

Configurations like
  DisableSysfs false
are confusing.

15 years agomadwifi plugin: Plugin for detailed information from the MadWifi driver.
Ondrej Zajicek [Tue, 11 Aug 2009 09:44:28 +0000 (11:44 +0200)]
madwifi plugin: Plugin for detailed information from the MadWifi driver.

Hello

After some time i managed to make a new version of Madwifi plugin. The
main change is that it is possible to finely tune the set of monitored
statistics and just the most important statistics are monitored by
default. Also the number of new data types is reduced (by using type
instances).

Signed-off-by: Florian Forster <octo@verplant.org>
15 years agocollectd.conf(5): Fix two minor typos.
Florian Forster [Tue, 4 Aug 2009 15:37:25 +0000 (17:37 +0200)]
collectd.conf(5): Fix two minor typos.

15 years agosrc/utils_cache.c: Don't tell the user about missing values.
Florian Forster [Tue, 4 Aug 2009 11:08:56 +0000 (13:08 +0200)]
src/utils_cache.c: Don't tell the user about missing values.

This is bound to confuse users..

15 years agonetwork plugin: Use the meta data to implement the `Forward' option.
Florian Forster [Tue, 4 Aug 2009 11:02:57 +0000 (13:02 +0200)]
network plugin: Use the meta data to implement the `Forward' option.

Previously, a cache in the network plugin was used to keep track of
which values were received via the network in order to distinguish
between ``forwarded'' values and values that were received from
somewhere else.

The same cache was also used to avoid loops when forwarding packages by
keeping track of the highest timestamp that was sent by the plugin and
discard received data that was older or as old as that.

This information is not kept in the meta data of the global cache (what
is the last timestamp sent) and the meta data of the value list (was
this value list received via the network?). The cache that was
maintained in the network plugin has been removed.