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

[Florian Forster]

 src/Makefile.am             |    3 +
 src/collectd.conf.in        |    9 +
 src/collectd.conf.pod       |  105 ++++++++-
 src/collectd.h              |    4 +
 src/postgresql.c            |  553 +++++++++++++++++++++++++++++++------------
 src/postgresql_default.conf |   50 ++++
 6 files changed, 570 insertions(+), 154 deletions(-)

New commits:
commit 9ebbb794012e4f68118b550377a42f7b1dbf4bb5
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jul 23 14:31:08 2008 +0200

    collectd.conf(5): Documented the support for custom queries.
    
    Also, collectd.conf.in has been updated.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit b762e50bdd12424dc40a58f82a25bb86c7348849
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jul 18 21:39:29 2008 +0200

    postgresql plugin: Moved pg_stat_database query to postgresql_default.conf.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 883531cd6271cb8e47adf24973893062db0d3d43
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jul 23 14:29:56 2008 +0200

    postgresql plugin: Fixed the expansion of the "hostname" parameter.
    
    If the configured hostname specifies a UNIX domain socket, the parameter now
    expands to "localhost" as described earlier.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 29fbb8ec3fab3fc1e5c2e386b63f65f6832c0e7d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jul 18 21:38:48 2008 +0200

    postgresql plugin: Added support for passing parameters to a query.
    
    The parameters are referred to in the query string as $1, $2, ... The value of
    a parameter is specified using the new "Param <name>" config option of a
    "<Query>" block. <name> may be any of "hostname", "database" or "username"
    which will be replaced by the value of the appropriate connection parameters.
    The hostname will not evaluate to the the UNIX domain socket path -
    "localhost" will be used instead.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 09c001b38efcb0344c517c5944df87127ea30ee6
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jul 18 21:38:03 2008 +0200

    postgresql plugin: Define default queries in a configuration file.
    
    Instead of writing custom code for each default query, those are now defined
    in a configuration file which is parsed using the same mechanism as used for
    user-defined queries. This configuration file (postgresql_default.conf) is
    installed into $pkgdatadir.
    
    Querying the pg_stat_database view is not currently supported this way. This
    would require support for parameters in user-defined queries which is not
    (yet) available.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 12d48e6b453a4f028d4550d8cea159c913534c5d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jul 18 21:37:23 2008 +0200

    postgresql plugin: Added support for custom queries.
    
    The user may now define and use custom queries to collect data. A query is
    defined by specifying the SQL query to execute and a definition of the data
    type of each result column:
    
      <Query magic>
        Query "SELECT magic FROM wizard;"
        Column gauge magic
      </Query>
    
    The "Column" configuration option specifies the type name and optional type
    instance: Column <type> [<type_instance>]. The number and order of the
    "Column" option has to match the columns of the query result.
    
    A query is activated by adding the configuration option "Query <name>" to the
    appropriate "<Database>" configuration blocks. A query may be used multiple
    times.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 122cdaec2cc7d235d58a5e3e97aa6a4bbfa2d37c
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri Jul 18 21:36:41 2008 +0200

    postgresql plugin: Split off memory management into dedicated functions.
    
    Allocation and freeing of c_psql_database_t objects is now handled by the new
    functions. This increases readability of the code.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>