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

[Florian Forster]

 AUTHORS               |    3 +
 README                |    3 +
 configure.in          |    2 +
 src/Makefile.am       |    9 +
 src/collectd.conf.in  |   13 +
 src/collectd.conf.pod |   59 +++++
 src/write_graphite.c  |  687 +++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 776 insertions(+), 0 deletions(-)

New commits:
commit c149ae31b04a082f7915f39e8d51ddec4a0595f8
Merge: 38c765b 015aa39
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 13 22:10:52 2012 +0100

    Merge branch 'ss/graphite'

commit 015aa39bd906a3e3764aeeee440fbf7a645b5372
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 13 22:03:07 2012 +0100

    collectd.conf(5): Improve description of the write_graphite plugin.
    
    Change-Id: Ide28fe5eef021bc18cfd05202b1efefea693350c

commit 3e1b18d9e950553989dfde85cac475c5da7ae34c
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 13 21:27:40 2012 +0100

    write_graphite plugin: Set a (hopefully unique) callback name.
    
    Change-Id: Iab70d4f40a614bc04b70b61868d30721ee9641c1

commit 686286bd66079430b65d50bfb49ffa3b1e776d66
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 13 14:33:44 2012 +0100

    write_graphite plugin: Simplify wg_write_messages().
    
    There is no need for special handling of values with one / more data sources.
    
    Change-Id: I849d4a881ed50ad1c7b8cf5c0abd1c5d62fe5258

commit a49ed2ad7f046517f1e48b417a71ac2005362d2f
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 9 10:48:50 2012 +0100

    write_graphite plugin: Report configuration errors for the EscapeCharacter option.
    
    Change-Id: Ia99e2c8d9c7ced344bb52f4d80957fa9abe3e7db

commit f6eb6efd7d1bae52bf3fecccf4c6f9b3476eb8fa
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 9 10:46:21 2012 +0100

    write_graphite plugin: Print the time as an unsigned int.
    
    Change-Id: I61f4952c8debdf7c80c4e1e4647cf42ecf00f033

commit 2c31c879e1ed7417e9b612de18de41040a499922
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 8 18:25:03 2012 +0100

    write_graphite plugin: Use CR-LF line endings.
    
    Using this line ending in ASCII conversations over the network has been a
    convention since the 1970s, let's stick with it.
    
    Change-Id: I5d0640e520a70483ab9256989f89e9e2dcab7643

commit 4c95b05e38f52460d7e89b98da5c2edddd37fc07
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 8 16:38:01 2012 +0100

    write_graphite plugin: Use swrite() instead of write().
    
    swrite() ensures that the entire buffer is written before the buffer is reset.
    
    Change-Id: I105d42d8ea5b71acd5a5e37b7cc4209045f28d47

commit b44c85528c7449e9db4610e325fd9550f6ea1dd4
Author: Florian Forster <octo at collectd.org>
Date:   Wed Feb 8 10:25:59 2012 +0100

    write_graphite plugin: Decrese buffer size.
    
    The larger the buffer, the longer you need to wait for the data to be written
    to Carbon. The new buffer size assumes an MTU of 1500 bytes (Ethernet payload)
    and keeps margins for IPv6 and TCP (with timestamps). This should decrease the
    number of packets needed (because data is now cleanly aligned to the packet
    size) and decrease the overall time spent buffered.
    
    Change-Id: I73021608f1ff0f22f9e73cd62b7fb5ea79421546

commit 93b9e0876f661e5c26523a776d10c97635a55ace
Author: Florian Forster <octo at collectd.org>
Date:   Tue Feb 7 18:21:33 2012 +0100

    src/collectd.conf.in: Add the write_graphite plugin.
    
    Change-Id: I238d9bd7d2413bdc747f0603cb6e97d777252fcd

commit 184f1db5791939c13d7e65bb1d05dd2ff0f9ae6d
Author: Florian Forster <octo at collectd.org>
Date:   Tue Feb 7 18:19:20 2012 +0100

    write_graphite plugin: Implement the "AlwaysAppendDS" option.
    
    Don't append DS name by default, except when there is more than one DS.
    The "AlwaysAppendDS" option can be used to force the plugin to always
    append the DS.
    
    Change-Id: I0221bef49375e3b5c5de99bb8f5a9cd641b696c3

commit acd2fa45d20e4445140fbad3dae7032019dff16b
Author: Florian Forster <octo at collectd.org>
Date:   Tue Feb 7 18:16:02 2012 +0100

    write_graphite plugin: Fix trailing underscores.
    
    This may also fix an off-by-one error when the name is long enough. D'oh!
    
    Change-Id: Ibc5a68f9bc93eed6366d074b55a7aca020bcf990

commit 3e9d0babd83c359ffa114c0bc0f808cade99e3e8
Author: Florian Forster <octo at collectd.org>
Date:   Tue Feb 7 17:59:00 2012 +0100

    write_graphite plugin: Implement the StoreRates option.
    
    Most of it was already present in the code anyway, so I just added the
    appropriate config handling.
    
    Change-Id: I7ce8be2f5b075da690872ec72b3610eae05b3c6c

commit e175e6673e3409c2d41258dedf8eba2409553d33
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 6 14:54:40 2012 +0100

    write_graphite plugin: Use cf_util_get_service() for the "Port" option.
    
    Change-Id: If3f0b32f86a40dbaa22837dc15f51429239af03a

commit 5e1d7902ffae810f851f4298683f675fc538f5bd
Merge: 7353a23 d0efcb2
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 6 14:37:52 2012 +0100

    Merge branch 'master' into ss/graphite

commit 7353a23cf525e3e820e32076c89eae8bbb2d3a3d
Author: Florian Forster <octo at collectd.org>
Date:   Mon Feb 6 10:48:14 2012 +0100

    collectd.conf(5): Add stub for the write_graphite plugin.
    
    Change-Id: I129127ff7216b8a23f9cb638df49192f5b16e45f

commit f7f4cc14a2eb055b6097a2946fd15bd2b8ac39e4
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:54:58 2012 +0100

    write_graphite plugin: Fix locking.
    
    wg_send_buffer() is called from wg_flush_nolock(). When calling
    wg_flush_nolock(), the thread has to hold cb->send_lock. Locking it again
    will fail, but this condition is not checked for. Then the lock is
    released twice which may result in concurrency issues.
    
    Change-Id: Ie3062d50e6545adeb95b3a1938837c1f26835a56

commit 917f8784060b467e67b4b05429ddd120be4bb845
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:52:18 2012 +0100

    write_graphite plugin: Remove the unused "server" field.
    
    Change-Id: I6ae59f4a2f6be69f891bbfa16afddc5ec9be9bad

commit f4f617a40d19dbf82fad9cb72f8af1e58b8aa4eb
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:51:50 2012 +0100

    write_graphite plugin: Update the copyright header.
    
    It's based on the write_http plugin, so these copyrights apply as well.
    
    Change-Id: I9def5e5b7e3cf6081f820df07187f47dd9d4b92b

commit 3506f7a5735c6ad217323c0ad3cb3ba24bc8a6f9
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:34:51 2012 +0100

    write_graphite plugin: Escape *all* the things!
    
    Dots and spaces can appear anywhere, e.g. spaces in hostnames and dots in type
    instances. Escape them all to avoid unintended special treatment by Carbon /
    Graphite.
    
    Change-Id: Iccc330934bcd765a237a1fed42d0cdb4bf3aa2b1

commit bf92e4541ad2740c5bfa223d5d28b283de6bca07
Merge: 88c3266 0fef1f5
Author: Florian Forster <github at nospam.verplant.org>
Date:   Fri Feb 3 01:05:46 2012 -0800

    Merge pull request #20 from pyr/ss/graphite
    
    Remove spaces and dots from the identifier.

commit 88c3266498b3b7e834674f12133b16ec9109e2e6
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:03:58 2012 +0100

    write_graphite plugin: Remove duplicate includes.
    
    Change-Id: I8745634aee66edde18f5720a6b4882d51e19ee12

commit afabd3b6f9bce573b9878cc8e1085b88db77756a
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:03:28 2012 +0100

    Build system: write_graphite doesn't depend on cURL.
    
    Change-Id: Ide4fccdef64fc37434c87e662484930ab69b9f1b

commit ef54e5630c088c572049a38b89f15745d913bb70
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:02:23 2012 +0100

    README: Add the write_graphite plugin.
    
    Change-Id: I265711b7b76d2244264c1df4158aed43cfcbb31b

commit 52614f564b24992afd31ae669bfa6ecd9d30d0cb
Author: Florian Forster <octo at collectd.org>
Date:   Fri Feb 3 10:02:02 2012 +0100

    AUTHORS: Add Scott Sanders.
    
    Change-Id: I633b1f64a00db7192e64e88d5960683404e0602e

commit 0fef1f5e1d38ce85c14523a4cc76da0e40139877
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Fri Feb 3 09:57:53 2012 +0100

    bring back prefix/postfix handling. simplify swap_chars.
    
    prefix and postfix need to be set to an empty string when
    they are null since they are used in format strings.
    
    swap_chars return value is never used and could never be
    negative, switch to a void prototype instead.

commit 39dccb06ed38bff82b09085796b58e34ad39d273
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Fri Feb 3 09:30:44 2012 +0100

    reimport my changes

commit 2f6cab9349c3ff8331590a7ca563cc6168f5dbf9
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 2 18:05:34 2012 +0100

    Build system: Add the write_graphite plugin.
    
    Change-Id: I333cb950bb68e47366bf9dd17eca181dde25847d

commit efa4700ad47969749b0fca622294fd006b2d7cb8
Merge: 51f9222 cbe5d0b
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 2 18:19:15 2012 +0100

    Merge branch 'import/ss/graphite' into ss/graphite

commit cbe5d0b3deec5978a5b0c61371d5c87b9285a0ae
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 2 17:43:28 2012 +0100

    write_graphite plugin: Don't allocate {Pre,Post}fix if unspecified.
    
    Just leave them at NULL and catch this condition in wg_format_name().

commit 75754cebc8d16dc4246d83c61dc5adba610ddfa0
Author: Florian Forster <octo at collectd.org>
Date:   Thu Feb 2 17:39:21 2012 +0100

    write_graphite plugin: Improve Hostname / Port handling.
    
    Use getaddrinfo(3) for hostname lookup -- this also adds IPv6 compatibility.
    Switch the internal names to node / service, to follow the terminology used by
    getaddrinfo(3). Use cf_util_get_string() rather than implementing our own.
    Allow service names in addition to port numbers.

commit bd5985aa3853e2e71cf03dda75a86f6703e521e2
Author: Scott Sanders <scott at jssjr.com>
Date:   Mon Dec 26 11:34:52 2011 -0500

    Fix copy/paste typo in config option handler
    
    Spotted by Pavel Korovin. Thanks!

commit b2c7ba100aabd35751e379561773878013f31e04
Author: Scott Sanders <scott at jssjr.com>
Date:   Fri Nov 18 11:11:35 2011 -0500

    Add patch from jimmyattime (issue #8)
    
    This is certainly no worse than the previous usage of
    pthread_mutex_lock, and will prevent the plugin from blocking. I'd like
    to add better handling of failed locks in future commits.

commit 1ff2894d084f8bcc87ab3a04e890cfc99113a431
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 9 19:08:27 2011 -0400

    Prefix is no longer a required directive
    
    While useful, the user should not be required to provide a prefix.
    Having the hosts as the top level containers may make sense in some
    environments. The current format is "${prefix}${hostname}${postfix}" so
    be careful to add dots where needed.
    
    Also updated docs to reflect this change.

commit 677ce0421a6c77570eba780197310f8d7be43ea1
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 9 19:02:06 2011 -0400

    Allow the user to append a string to the hostname
    
    The user should be able to append a string to the hostname to provide
    better organization if they wish. The directive used to set this option
    is Postfix.

commit a53a376a490902c088b343ae6bcd3df89bd46c97
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 9 18:32:07 2011 -0400

    Make the dot substitution char configurable
    
    Set the character used as the substitute in host and datasource names in
    the collectd configuration block. The directive used to set this option
    is DotCharactor and its default is '_' (underscore).

commit 3286815f3b28cc6ac04af7ef48ef84008ed76b63
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 20:18:41 2011 -0400

    Mangle dots on the type instance, not ds name

commit f7958d71313733156ba9ff1d36c7e54ac5df41f7
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 19:56:24 2011 -0400

    Must be getting tired...

commit 6c16a604aacf313751cac123ddc04dbf626788f8
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 19:41:06 2011 -0400

    Oops. Use the new string and free it when done

commit cac69c551964873a3ab905b22ba40d3ca7792fae
Merge: 16d2dea 4959697
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 19:23:24 2011 -0400

    Merge branch 'master' of github.com:jssjr/collectd-write_graphite

commit 16d2deacb576d32e304f7dd1143c434720676ab0
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 19:18:06 2011 -0400

    Converts . to _ in datasource names
    
    This came up during testing with the ntp plugin. The ds_name was being
    sent with an ip in the string. This will prevent the result from nesting
    in the carbon store.

commit 4959697cfd6d1c08c98626232e8fd58bf7c074e1
Author: Scott Sanders <scott at jssjr.com>
Date:   Sun Oct 2 16:28:32 2011 -0400

    Don't require a named backend
    
    Naming a backend adds no value to the configuration and only serves to
    complicate things. Multiple unamed carbon backends are still allowed.
    Documentation updated to reflect the change.

commit 43d8db196d8e89476d59bca4ad89114488a64faa
Author: Scott Sanders <scott at jssjr.com>
Date:   Sat Oct 1 19:12:01 2011 -0400

    Modify whitepsace

commit 8f88dfef16969ebdd82f46bf31729a009b0b5b0f
Author: Scott Sanders <scott at jssjr.com>
Date:   Sat Oct 1 18:56:29 2011 -0400

    Optimize strlen() calls out

commit e2541dfbfe8c9d7ec75ccd128a4b2d3eeb462a30
Author: Scott Sanders <scott at jssjr.com>
Date:   Sat Oct 1 18:46:06 2011 -0400

    Move send buffer size to the top of the file

commit 352eee4ecccdd9855191de35a09b0e8f6b3f7bb7
Author: Scott Sanders <scott at jssjr.com>
Date:   Sat Oct 1 18:42:54 2011 -0400

    Remove fold markers

commit d703a9d107a5542b6ef19b906b05053840c6385d
Author: Scott Sanders <scott at jssjr.com>
Date:   Tue Aug 9 20:17:46 2011 -0400

    move sources

commit cebf25048c288b07e01860af9f9c4a3d48681ea6
Author: Scott Sanders <scott at jssjr.com>
Date:   Mon Aug 8 11:00:11 2011 -0400

    free name appropriately

commit 0ccc0b1a9a548ab25844fc860cebcc69d0d31758
Author: Scott Sanders <scott at jssjr.com>
Date:   Mon Aug 8 10:55:23 2011 -0400

    add config example and move host definitation out of <Carbon> attribute

commit 92af8f3cd08e9d6e607a477d2a59e34c4d048d58
Author: Scott Sanders <scott at jssjr.com>
Date:   Mon Aug 8 10:47:10 2011 -0400

    initial sync from private repo