[collectd-changes] collectd, the system statistics collection daemon: Changes to 'ps/http'

[Florian Forster]

Rebased ref, commits from common ancestor:
commit 9ff7c5a40d155289ac607b8a962b5eac13907b39
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Thu Jul 9 10:33:48 2009 -0600

    http plugin: Add entries to collectd.conf

commit 896f1f22ffd9753d5ecc50c66bd2e6d380b3981d
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Thu Jul 9 10:31:49 2009 -0600

    http plugin: Man page about config vars

commit f385de1e9f7799ff3af6347bd8f30506b9036c4e
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Thu Jul 9 10:27:14 2009 -0600

    http plugin: Put the makefile stuff in the right place alphabetically

commit 8dc963f846c51d8ba173587a136231c2b3646afc
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Wed Jul 8 17:36:39 2009 -0600

    http plugin: Make the output match the PUTVAL plain-text protocol

commit f8c2c2e29ee86f3c5b7565547e57d29732576277
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Jul 7 18:31:45 2009 +0200

    configure.in: Add the http plugin to the status output.

commit 925fec2beba08825c5986a5d031f9126d111055a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 6 22:47:48 2009 +0200

    http plugin: Remove trailing whitespace.

commit 85e490aca52f057b98e50ae0612751c82878a51b
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jun 22 15:06:25 2009 -0600

    http plugin: Better error handling, and flush before shutdown

commit 6fc85b952084c71e040bec17740b2811c5574f01
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jun 22 14:22:59 2009 -0600

    http plugin: Remove some debugging info

commit c5f030fa12d743cbcf9d2d53f06e1621faa3a32d
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jun 22 14:10:17 2009 -0600

    http plugin: POST when a 4K buffer is nearly full

commit 6f618e6759257431d5ab266c1676dd53ed9d097a
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sat Jun 20 16:54:18 2009 -0600

    http plugin: Set mutex around curl, so we only perform once at a time

commit 354ae76fa3ca0c4dbb20c36c7f52d5d4d391dba9
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Wed Jun 17 10:49:02 2009 -0600

    http plugin: Fix a memory leak by cleaning up the curl handles

commit 4701c950775572616456139ac65539924e1cdb94
Author: Erik Cunningham <ewc at absolute-performance.com>
Date:   Wed Jun 17 10:24:24 2009 -0600

    http plugin: don't copy the error buffer

commit b835268fbda571674963a41218b2cc623eb1f535
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sun Jun 14 20:22:12 2009 -0600

    http plugin: Dont hold open curl connections. It ties up apache

commit d9392089cfe08ad092367b2dca9054f413ccb529
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sun Jun 14 19:52:18 2009 -0600

    http plugin: Initialze curl every time, to we don't clobber things

commit 968d1bd9a97944a52820b6d542089765b59f9bf2
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sun Jun 14 18:43:50 2009 -0600

    http plugin: Separate values into multiple lines

commit 2b9ba6a970b33397dc3b58b22b4c84e39ab53378
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Fri Jun 12 16:46:53 2009 -0600

    http plugin: it works, i think

commit 86928d3feaa0ba8f85dc3cbe0d3c34219d201a33
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Tue Jul 7 18:38:36 2009 +0200

    http plugin: Start in http plugin that can output csv to stdout

commit 92d6e909a472ce3c8b5edad9106debee7d2bf28f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 20 17:21:33 2009 +0200

    java bindings: GenericJMX: Implement user/password authentication.

commit 08d06d7d5c2d3f9f52c6db183d7bd0678440906f
Author: Aman Gupta <aman at tmm1.net>
Date:   Thu Aug 20 11:53:22 2009 +0200

    network plugin: Remove a now invalid assertion.
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit 36403bcaa8627bf41d209496ad34ddcda0f376e0
Author: Florian Forster <octo at noris.net>
Date:   Wed Aug 19 17:50:37 2009 +0200

    contrib/GenericJMX.conf: Fix some typos and improve type instances.

commit 2aa2512eff8064e5e2a9c71c2c32feec5d027f35
Author: Florian Forster <octo at noris.net>
Date:   Wed Aug 19 17:15:55 2009 +0200

    src/types.db: Sort alphabetically.

commit 08884a5cd1038e151a1ae34733aaee48ff06a09b
Author: Florian Forster <octo at noris.net>
Date:   Wed Aug 19 17:15:08 2009 +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!

commit ca1466e65cd71e9b286e608a3beb31289b2625e6
Author: Florian Forster <octo at noris.net>
Date:   Wed Aug 19 17:01:30 2009 +0200

    java bindings: GenericJMX plugin: Implement the ‘InstanceFrom’ option for <value /> blocks.

commit ac634492ce8078c0fc39f99de513d9f3ccb2f2f9
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Aug 19 11:39:41 2009 +0200

    swap plugin: Fix the ‘swap_submit’ invocation of non-Linux implementations.
    
    And replace all the ‘unsigned long long’s with ‘derive_t’.

commit c59c73bee244b78191d0b365188bd4f947521737
Author: Stefan Völkel <bd at bc-bd.org>
Date:   Mon Aug 17 13:50:17 2009 +0000

    added swapin/out support to swap plugin
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit c35203c82560eba66bb901aa22c5170fb8c389fb
Merge: 4151d975ca93af4570a1ca97a0408ba446ea7485 2bca2a511c1636bf448112d081d115ebc01b5ed4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 18 21:39:03 2009 +0200

    Merge branch 'mg/jitter'

commit 2bca2a511c1636bf448112d081d115ebc01b5ed4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 18 21:38:01 2009 +0200

    collectd.conf(5): Document the new `RandomTimeout' option.

commit d278a40cab2bcb6bb0387176d087ce13cd3e843b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 18 21:23:21 2009 +0200

    rrdtool plugin: Optimize away the ‘random_timeout_mod’ variable.

commit bdcac4078f8052b8e4f425a1e5aea3957551e0d3
Author: Mariusz Gronczewski <xani666 at gmail.com>
Date:   Tue Aug 18 21:18:06 2009 +0200

    rrdtool plugin: Call rand(3) less often.
    
    2009/8/18 Florian Forster <octo at 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 ?

commit 4151d975ca93af4570a1ca97a0408ba446ea7485
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 18 12:23:53 2009 +0200

    src/Makefile.am: Add `madwifi.h' to madwifi_la_SOURCES.
    
    The header file was not included in generated distribution tarballs.

commit 1cc3e40380c9a39f1fa2e69cdeabaf0306a42d69
Author: Aman Gupta <aman at tmm1.net>
Date:   Tue Aug 18 01:10:20 2009 -0700

    network plugin: Add MaxPacketSize config option to the network plugin.
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit 479670b30c0115d27ee9d11c10a5d464b1cda47e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 22:51:16 2009 +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>

commit fd48357ddeb1b58d5795015e845f3105a7ba3103
Author: Mariusz Gronczewski <xani666 at gmail.com>
Date:   Mon Aug 17 02:20:29 2009 +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 at huhu.verplant.org>

commit 0b9800153cec24ed79c71beaac265e33ee3001ba
Merge: 1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c dbbdb25542df6d9afbfddf78a3b1a8fee9029a80
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 10:53:07 2009 +0200

    Merge branch 'collectd-4.7'

commit dbbdb25542df6d9afbfddf78a3b1a8fee9029a80
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 10:52:16 2009 +0200

    java plugin: Fix configuration with multiple blocks.
    
    The number of children was not updated.

commit 1e4db580e37d235755de0c4a4c08ba7a6ac7bb4c
Merge: dc0a112ba2a77dc61ab99dcbbda2e0bbf133d6ed de38c1a6e44cadfc88fc6e1d0919663f0c08bbdc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 10:46:05 2009 +0200

    Merge branch 'collectd-4.7'
    
    Conflicts:
    	src/network.c

commit de38c1a6e44cadfc88fc6e1d0919663f0c08bbdc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 10:39:55 2009 +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.

commit 8f40e8dacad2bfcb9d659e12740aa3ebc15ada65
Merge: b6c75ecde000fd1377338a1ceb40f567ff60fbb6 94f2ff236902035a1d549bbe393402ec30ee245f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Aug 17 09:48:43 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7

commit 94f2ff236902035a1d549bbe393402ec30ee245f
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Aug 12 00:52:47 2009 +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 at redhat.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit dc0a112ba2a77dc61ab99dcbbda2e0bbf133d6ed
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Aug 17 08:32:55 2009 +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.

commit 08f5dee4cf337eb0cac72b87c24092e4ea2089cf
Author: Andrés J. Díaz <ajdiaz at connectical.com>
Date:   Tue Aug 11 21:57:34 2009 +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 at huhu.verplant.org>

commit b6c75ecde000fd1377338a1ceb40f567ff60fbb6
Author: Andrés J. Díaz <ajdiaz at connectical.com>
Date:   Tue Aug 11 21:57:34 2009 +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 at huhu.verplant.org>

commit d8762c435fadaeaca222ab97d93bba2352449690
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Aug 16 09:27:44 2009 +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.

commit 3f09a6bfc9327f3d3c331b48f1c0cebcd4cd6628
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Aug 16 09:21:05 2009 +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.

commit 317e5932836ec040ccf3a19054a922eb7f00bd0a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Aug 16 09:13:31 2009 +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.

commit 2c4802dbdf90c721202fd87f8141ab079b085c56
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Aug 13 12:37:20 2009 +0200

    src/plugin.c: Make `plugin_unregister_read' functional again.

commit ee203ecd5fae28ab12f158e03e18f2b57394897a
Merge: 396a709634cef7eff49cbbeb9b59ade74e4bd8bc b920755383f35b7504974d12ccfbd9597b9087d7
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Aug 13 08:14:24 2009 +0200

    Merge branch 'ff/genericjmx'

commit 633b8c6bbac1c6de6c675f28e428b7415e283d64
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Aug 12 15:08:40 2009 +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).

commit 3602864950048219eb2981be13d902cc60117da2
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Aug 12 00:53:00 2009 +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 at redhat.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit deafbed6154307233c5e7846d13c130f414ea508
Author: Florian Forster <octo at noris.net>
Date:   Wed Jul 22 10:20:59 2009 +0200

    src/meta_data.c: Fix a typo.

commit 396a709634cef7eff49cbbeb9b59ade74e4bd8bc
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Aug 11 16:44:22 2009 +0200

    AUTHORS: Add Ondrej.

commit d23ae38ad0863aca418e2003af0fcb7e4edc8f26
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Aug 11 16:29:28 2009 +0200

    madwifi plugin: Add some assertions …
    
    … to otherwise unchecked array indices.

commit a80b4a724c3b64df78f9fc73be29dde181cc7bbe
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Aug 11 16:08:03 2009 +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.

commit a49f20142a5fb2a2dab23bb81195175ac4a48de6
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Aug 11 13:24:04 2009 +0200

    madwifi plugin: Rename the ‘DisableSysfs’ to ‘Source’.
    
    Configurations like
      DisableSysfs false
    are confusing.

commit 01c19d8cf54620da94b6b22649b1c4a4e4e55c21
Author: Ondrej Zajicek <santiago at crfreenet.org>
Date:   Tue Aug 11 11:44:28 2009 +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 at verplant.org>

commit 5313ade6a32041b9312e7fe38bb6a212a85f9a0b
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Aug 4 17:37:25 2009 +0200

    collectd.conf(5): Fix two minor typos.

commit 30da84bcde05e5720ae3af4055e107e4767bb2b9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 13:08:56 2009 +0200

    src/utils_cache.c: Don't tell the user about missing values.
    
    This is bound to confuse users..

commit 27aec36864d1882bf628b9c71c233d70e994a202
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 13:02:57 2009 +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.

commit cc4301c93dc9f086f823f6e5aa90e369ca9ff188
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 12:21:07 2009 +0200

    src/utils_cache.[ch]: Make the `value_list_t *' const.
    
    The struct is only needed to build the name (a string) anyway..

commit 515a4e0625d35c791daf283c91461416e6be65ed
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Aug 4 12:13:41 2009 +0200

    network plugin: Fix an incorrectly used configuration variable.
    
    The `CacheFlush' option was assigned to the `TTL' variable. Ouch.
    
    Version 4.6 and earlier are not effected.

commit fd0445383400a82f33159ec5f3b0209ce17e7d7b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 11:05:02 2009 +0200

    src/utils_cache.c: Free the meta data when removing a cache entry.

commit 62e42f8dbbc99815f06d7204fc410bca9aece4ef
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 10:54:17 2009 +0200

    src/utils_cache.[ch]: Implement a meta-data interface for cached values.
    
    This should make it possible to write stateful matches and similar nifty
    stuff - at last \o/

commit 4f92890a48dab99e18ef30883c80f4ce70f75ac7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 10:23:42 2009 +0200

    src/common.h: Remove the `ds' argument from the `FORMAT_VL' macro.
    
    Since `type' is now included in `value_list_t' the `data_set_t' is no
    longer required.

commit 3246d8029377793602a9100c8e07e53efb142808
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Aug 4 09:59:22 2009 +0200

    src/collectd.conf.in: Fix the default class path of the java plugin.

commit b920755383f35b7504974d12ccfbd9597b9087d7
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Mon Aug 3 14:47:02 2009 +0200

    contrib/GenericJMX.conf: Added a sample config file for the GenericJMX plugin.

commit 7603c661cdeabe2068939486ed0a3e49aba129a3
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Mon Aug 3 11:56:26 2009 +0200

    java bindings: GenericJMX: Add support for more numeric classes.

commit 1a73830d72f470999df7f0289cfd0f1cf3cc150c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 17:54:37 2009 +0200

    java bindings: GenericJMX: Fix a couple of error messages.
    
    Also renamed a variable to fit the naming schema.

commit e1f4ed33a0dbf6f017ebae8395759893efa6b176
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 17:26:05 2009 +0200

    java bindings: GenericJMX: Add support for "InstanceFrom".
    
    This can be used to specify so called "properties" to include in the
    plugin instance.

commit 658b873e6ac13d387a710fa02d8f85057fd5cae8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 16:50:22 2009 +0200

    java bindings: GenericJMX: This first prototype version seems to do something.
    
    Well, at least it's not throwing exceptions like mad..

commit 38469fd7bce3b64857c711169c6289f16d8f0114
Merge: 5e22694c513a35135c9155e410a49d83ad73302b ff607e9d1abc8f738b15626b5d30145d9a9f3f0d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 12:22:20 2009 +0200

    Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6

commit 47e0e1329fd7b23486d0c5b2b007d6f2f7f1db00
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 12:21:49 2009 +0200

    java bindings: JMXMemory: Remove an annoying folding.

commit bd931500189953f6995dc0cda30a35d98a824c3d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 12:18:30 2009 +0200

    java bindings: Add first take at a `GenericJMX' plugin.

commit a6c03398aae03ae35ec676f20abe71c84cc4f039
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 12:17:05 2009 +0200

    src/collectd.conf.in: java plugin: Use @prefix@ when building the example class path.

commit a97f0dd7dc07e6fe78df806d9c6f14b3681513a6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Aug 2 12:16:42 2009 +0200

    java bindings: DataSource: Add `DERIVE' and `ABSOLUTE'.

commit 5e22694c513a35135c9155e410a49d83ad73302b
Author: Anthony Dewhurst <dewhurst at gmail.com>
Date:   Thu Jul 30 21:42:07 2009 +0100

    contrib/collection3: Don't use SI prefix for number of processes
    
    I, at least, don't normally measure processes in "milliprocesses".
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit 9831039854c254ce26af2716fc758d4df4725076
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jul 30 09:05:08 2009 +0200

    df plugin, AUTHORS: Add Paul.

commit 77d2a594d2526755c39660a9578ed4169531352f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jul 30 08:28:01 2009 +0200

    df plugin: Fix some "best practices" that have been changed.

commit 70bafb1ce6448c9e4a6f260c5888970e7a532694
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Tue Jul 28 21:38:03 2009 -0600

    Add option to collectd.conf

commit 3ada23491952cc01baadd19ffeba27e0c332f0c1
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Thu Jul 30 08:31:58 2009 +0200

    collectd.conf(5): Add new config option.

commit dfa5989366dd1d77aa0a3f908d3d148dafe846e7
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Tue Jul 28 13:15:56 2009 -0600

    df plugin: Add option to report by mountpoint or devicename

commit ff607e9d1abc8f738b15626b5d30145d9a9f3f0d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jul 26 15:01:53 2009 +0200

    collection3/etc/collection.conf: Reencoded in UTF-8.
    
    Depending on the locale settings, RRDtool might fail to handle "special
    characters" correctly. Using UTF-8 is a way to work around that issue.
    
    Thanks to Daniel Danner for reporting and testing this.

commit c2593281c3ed2919f67514381be2b5137308f3af
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jul 8 13:19:57 2009 +0200

    src/utils_cache.c: Make really sure to free the right cache entry.
    
    Make sure we do not try to free a (possibly some random) cache entry after
    removing it from the AVL tree. Potentially, this might have caused invalid
    free()s in some rare situations.

commit 95e95817de3f4962bf87fa1848c483fa27a02a0f
Author: Florian Forster <octo at noris.net>
Date:   Wed Jul 22 15:57:47 2009 +0200

    match_empty_counter plugin: Match for zero counter values.

commit 5472038917e3fbf19e4706e488c1522018c51749
Author: Florian Forster <octo at noris.net>
Date:   Wed Jul 22 09:55:21 2009 +0200

    src/utils_cache.[ch]: Add uc_get_history[_by_name].
    
    These two new functions can be used to get historical data of values in
    the cache. This can be used to calculate floating averages, hysteresis
    and a shipload of other aggregation and consolidation functions.
    
    The current implementation is probably not yet perfect:
    
     - If not enough values are available to satisfy the request, the buffer
       will be enlarged and NaNs will be returned in the newly allocated
       cells. The caller has no way to recognize this case.
    
     - If a value is missing, no NaNs will be added to the cache. It's
       unclear if this was desirable.
    
     - The returned values are reversed, i. e. val[0] will be the newest
       value, val[n-1] will be the oldest. Here, too, I'm unsure which way
       is easier to comprehend / use. I went for this implementation because
       it was easier to write.

commit a77086739afba579bee2a4a216b9e1018ef8a442
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Jul 21 08:46:49 2009 +0200

    src/collectd.conf.in: Fix a typo.

commit 35f98b6e5c4c30bd7aeb52c7894c5f6e276638da
Merge: 5137825deeb5d4a5b763185f45b3916ccc49340d 6ec92a34ccbd9454b48685e69405c633026cfe05
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 17:39:06 2009 +0200

    Merge branch 'collectd-4.7'

commit 22d070094908358bccc1f1ff9189ebaf98fe8bc6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 17:38:55 2009 +0200

    ChangeLog: Fix a typo.

commit 6ec92a34ccbd9454b48685e69405c633026cfe05
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 17:38:08 2009 +0200

    ChangeLog: Fix a typo.

commit 58ae91b5cc5b27b5317f26c238556f12dbb62258
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 13:04:20 2009 +0200

    Bumped version to 4.7.2; Updated ChangeLog.

commit eb4aab6b6d5af827b5c1fb2f7d2550b7de22fa90
Merge: 307459f5a1d79ee373cf59c7c8a0824d325c43e3 28804fd5c05159cf72401aa70872648fcc5b862e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 19 13:00:20 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit 28804fd5c05159cf72401aa70872648fcc5b862e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 18 16:36:44 2009 +0200

    Bumped version to 4.6.4; Updated ChangeLog.

commit 5137825deeb5d4a5b763185f45b3916ccc49340d
Merge: f6fda65968056137e693a916b15ce448e0961c7e 307459f5a1d79ee373cf59c7c8a0824d325c43e3
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 15 11:11:12 2009 +0200

    Merge branch 'collectd-4.7'

commit 307459f5a1d79ee373cf59c7c8a0824d325c43e3
Merge: b3bfb951c73ea3d232e0e97a42479a5e3310125d d2c40f1d7bea102065733d30bba4c9b30db23ab7
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 15 11:10:19 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    
    	src/memcached.c

commit d2c40f1d7bea102065733d30bba4c9b30db23ab7
Author: Florian Forster <octo at noris.net>
Date:   Wed Jul 15 10:09:48 2009 +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..

commit de1d790c3c63d5046ec6422f95cab7b980fdce1c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 12 11:03:07 2009 +0200

    build.sh, version-gen.sh: Remove bashisms.
    
    Thanks to Peter Bray for pointing them out.

commit f6fda65968056137e693a916b15ce448e0961c7e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 11 14:59:55 2009 +0200

    src/collectd.conf.in: Fix a typo in tokyotyrant's sample config.

commit 6ea00a8e17fccbac0cc5dee711ee2e4cb73bdaaa
Merge: dc1acaab169b0f1b2b43fed1b7044d19e6d92844 496d4e6272689604c4f4daab6823c99dd4e4fb50
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 11 14:59:21 2009 +0200

    Merge branch 'ps/tokyotyrant'

commit 496d4e6272689604c4f4daab6823c99dd4e4fb50
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 11 14:57:19 2009 +0200

    collectd.conf(5): Improved markup of the tokyotyrant documentation.

commit dc1acaab169b0f1b2b43fed1b7044d19e6d92844
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jul 11 14:32:25 2009 +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.

commit dcdeb5cbba467174efd97e019ad6b54e38a9fbb0
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 18:09:46 2009 +0200

    tokyotyrant plugin: Lookup service names (port names) and minor fixes.

commit 5395a6d43d4cc4a654d64d5bf2b298e7c99401e3
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 14:07:49 2009 +0200

    Build system: Improve detection of the tokyotyrant library.

commit 3ad4d23b1d5f9efc2f281a1eb551465888bd4068
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 11:55:33 2009 +0200

    src/utils_cache.c: `ce' *is* written to in `c_avl_remove'.
    
    Therefore we should definitely free it.

commit d0c9d0c41967b18748f76e67a136fb2295430a01
Author: Matthew Sporleder <msporleder at gmail.com>
Date:   Wed Jul 8 11:00:02 2009 +0200

    src/collectd.conf.in: Fix a typo.

commit 984f37cb1a5813d2a089129ebf906a9963b6f7c8
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 10:51:28 2009 +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.

commit 526320a0389a54a3629038fe6b34da8c6d4eec0e
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Wed Jul 8 10:49:23 2009 +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.

commit 1e6290da7c939e2b5dddaa559e5c189506f56151
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Tue Jul 7 19:11:57 2009 +0200

    tokyotyrant plugin: Make DB handle `static'.

commit 578991e044113f2378da5ee828ecde29bf2f0352
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Tue Jul 7 18:42:30 2009 +0200

    .gitignore: Add some *.o files.

commit 31a153c2bdf8e2ff270b58238cde64a15d2dfe6a
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jul 6 14:15:29 2009 -0600

    tokyotyrant plugin: Don't need to pass the db handle around, its global.

commit 159ed49f25849438b4106c71dff1755f9d7d5ed1
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jul 6 14:02:46 2009 -0600

    tokyotyrant plugin: Only connect once.

commit 255f24f4990830b3f9d60c31ba2ec587a0fa960b
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jul 6 13:50:49 2009 -0600

    tokyotyrant plugin: Handle port config param as a string

commit 55d2fac6446a7ea3cc87b36a1195853ca6b89fb2
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Mon Jul 6 12:22:22 2009 -0600

    Add some documentation for tokyotyrant to the collectd.conf manpage

commit 1940ec77070be4a13bd7905f18a1c70d0f9ada64
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 6 22:31:28 2009 +0200

    cpu plugin: Fix a typo.

commit dce5e6533de1652cfc88f400f71ac74abbea483b
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Mon Jul 6 16:51:55 2009 +0200

    Update README and add Paul to the AUTHORS file.

commit 895287495fcae8c8f496a398384ce40576f81acd
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sat Jun 20 15:38:28 2009 -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.

commit ed633b658eeda4bab77d34baae23143c14ce0831
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Sat Jun 20 14:50:36 2009 -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.

commit ced8c219dbf4c6b9dcfa430fb83282bfd0ccc392
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Thu Jun 18 13:39:11 2009 -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/

commit 10c85e89cbd077980ae297b17a23bbc42ce5d3d5
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Mon Jul 6 13:07:00 2009 +0200

    memcached plugin: Pass `ai_hints' to `getaddrinfo'.