[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 AUTHORS         |    3 +
 configure.in    |    4 +
 src/Makefile.am |    8 ++
 src/apcups.c    |   10 +-
 src/battery.c   |    2 +
 src/csv.c       |    2 +
 src/exec.c      |    6 +-
 src/fscache.c   |  235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/hddtemp.c   |    3 +
 src/ipmi.c      |    6 +-
 src/iptables.c  |    2 +
 src/irq.c       |    4 +-
 src/load.c      |    2 +-
 src/mbmon.c     |    4 +-
 src/memcached.c |    9 +-
 src/nginx.c     |    2 +
 src/processes.c |    7 +-
 src/sensors.c   |    1 +
 src/tcpconns.c  |    4 +-
 src/types.db    |    1 +
 src/users.c     |    6 ++
 src/vserver.c   |    2 +
 22 files changed, 304 insertions(+), 19 deletions(-)

New commits:
commit 330010ea9cf8dad458dc9245d8284a7dbf62b1a9
Merge: d9095bfd1e26026763867c4d647db092e2c0b787 52f41fed6e32f66f5817a82ae175fd443084f8a3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:38:47 2009 +0200

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

commit 52f41fed6e32f66f5817a82ae175fd443084f8a3
Merge: 4a453ab95047898e5942e869b09ebcba4c083d28 3d4319f8ec237226f85e05848650a0f14f5cf2ab
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:34:51 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6

commit 3d4319f8ec237226f85e05848650a0f14f5cf2ab
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:34:30 2009 +0200

    irq plugin: Force 32bit wrap-around.

commit 98ace6ba53855a4984e79bd7a6ed9a785478ba4f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:34:15 2009 +0200

    battery plugin: Fix a typo.

commit d9095bfd1e26026763867c4d647db092e2c0b787
Merge: 9e9d1133de2ccff0267fec43170efdc9fd1ff587 ec7fdf6748b717b9be36221bddaa58941338bb72
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:11:09 2009 +0200

    Merge branch 'ek/fscache'

commit ec7fdf6748b717b9be36221bddaa58941338bb72
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:10:28 2009 +0200

    AUTHORS: Added Edward “Koko” Konetzko.

commit 474ee78ed074aeedb8ef4c27eda376631ecdc39a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri May 1 16:06:09 2009 +0200

    fscache plugin: Simplyfied the parsing code.

commit f8b596a3e11e7afe2b69e72008d8e1de5d9fbc64
Author: Edward Koko Konetzko <konetzed at quixoticagony.com>
Date:   Wed Apr 29 22:26:52 2009 -0500

    fscache plugin: Add new plugin for Linux' file-system based caching framework.
    
    Tried to submit the patch via "git send-mail" but I don't think it worked if
    you already have the patch disregard the attachment.
    
    Looking forward to your feedback, I am sure there are a few issues its been a
    few years since I programmed in C. I have been running this in my test lab at
    work for a few days now with no issues.
    
    With 62 metrics I would like to modify the code to group them by their
    classification and possibly add configuration support. If the changes are
    finished this weekend is it ok to send an updated patch?
    
    Thanks
    Edward
    
    Signed-off-by: Edward "Koko" Konetzko <konetzed at quixoticagony.com>
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit 4a453ab95047898e5942e869b09ebcba4c083d28
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 22:04:28 2009 +0200

    src/libcollectdclient/: Specify _XOPEN_SOURCE=600.

commit ac1aa530ff9c875068e69991f6cfa7f46ea10aaf
Author: Tomasz Pala <gotar at pld-linux.org>
Date:   Sat Apr 18 17:45:01 2009 +0200

    irq plugin: Parse interrupt counters as unsigned long long.
    
    Hello,
    
    attached patch fixes accounting of most frequent interrupts (like NICs
    on routers). E.g. in my case:
    
    213:      76266      76357      76250      76397 2408617852 2411844062 2411642538 2411814531   PCI-MSI-edge      eth1
    214: 2621368360 2621463385 2621343444 2621386931    2349184         28         35         32   PCI-MSI-edge      eth0
    
    Here LONG_MAX (2147483647L) overflows in 10 days uptime and strtol()
    returns the same value.
    
    As all the values (including counter_t) are unsigned long long int, the
    fix is trivial (for now there's no need to check for irq_value overflow;>).
    
    --
    Tomasz Pala <gotar at pld-linux.org>
    
    Signed-off-by: Florian Forster <octo at leeloo.lan.home.verplant.org>

commit a5aa5217ba70cb87c343349b7b8a20cae97b3d23
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 16:17:08 2009 +0200

    csv plugin: Update copyright information.

commit 4fcf23160e7d3fd034dc7e807cbf4047970dd218
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 20 16:16:33 2009 +0200

    Various plugins: Update copyright information.