[collectd-changes] collectd, the system statistics collection daemon: Changes to 'ff/netlib'
Florian Forster
octo at verplant.org
Thu Aug 19 15:06:24 CEST 2010
.gitignore | 6 +
README | 8 ++
configure.in | 63 ++++++++++
src/Makefile.am | 20 +++
src/collectd-nagios.c | 44 ++-----
src/collectd-perl.pod | 10 ++-
src/collectd.conf.in | 18 +++
src/collectd.conf.pod | 101 +++++++++++++++--
src/collectdctl.c | 33 ++++--
src/configfile.c | 13 ++-
src/curl_json.c | 105 ++++++++---------
src/plugin.c | 7 +-
src/redis.c | 311 +++++++++++++++++++++++++++++++++++++++++++++++++
src/types.db | 3 +
src/utils_heap.c | 9 +-
src/utils_match.c | 8 +-
src/utils_match.h | 8 +-
src/write_redis.c | 238 +++++++++++++++++++++++++++++++++++++
18 files changed, 884 insertions(+), 121 deletions(-)
New commits:
commit 6624c959628fa1188f8cfa4789da1eccccc5f5e4
Merge: d866effbc50aef27811aac113ef2619da7fc6b43 d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 15:03:22 2010 +0200
Merge branch 'master' into ff/netlib
Conflicts:
src/collectdctl.c
commit d1c3baabf0c7bf65f699fb66db5b2aea92d1f5e7
Merge: 959e4e77abe00cd4e081a6555df00cbde86e0ce8 97addf1e406c75be500ae020635f3cb389f206e0
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 15:02:48 2010 +0200
Merge branch 'collectd-4.10'
commit 97addf1e406c75be500ae020635f3cb389f206e0
Merge: c15dbfc3739f7c3bbd8171797eaef55749008bfa 69149f2f18463f82a567ca27ff1eb2fc4bb8dc3d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 15:02:41 2010 +0200
Merge branch 'collectd-4.9' into collectd-4.10
commit 69149f2f18463f82a567ca27ff1eb2fc4bb8dc3d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 15:00:26 2010 +0200
src/utils_heap.c: Fix calculation of the parent's index.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
commit 959e4e77abe00cd4e081a6555df00cbde86e0ce8
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 09:59:34 2010 +0200
collectd-nagios: Remove forgotten commend.
commit 1731be96ba72786f4f69d4f752d2f99c6d774b4c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Thu Aug 19 09:57:54 2010 +0200
collectd-nagios: Remove unnecessary includes.
The UNIX socket is now handled in the library, no need for including
those files anymore.
commit 9f28473ab8e8b93c1bf19a72f02bb4e799dd7eed
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 18 10:22:36 2010 +0200
collectdctl: Reorder includes and set strict C99/POSIX mode.
This enables NAN on some systems, e.g. old Linux boxes.
commit 8ddd37a8d389a9c183394c87b299845709222e67
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 18 10:22:11 2010 +0200
collectdctl: Fix comparison with uninitialized variable.
commit e216f303206f269ba89bb4be32ffcb7eb15ca289
Author: Florian Forster <octo at huhu.verplant.org>
Date: Wed Aug 18 10:21:49 2010 +0200
collectdctl: Fix problems with strict aliasing.
commit b53110ef99e3d6a5e2f8e79b8f068cfe96a1accb
Merge: e7be1d7ea062e8d4d59c04c42e63d655188dc597 c15dbfc3739f7c3bbd8171797eaef55749008bfa
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 18:53:38 2010 +0200
Merge branch 'collectd-4.10'
commit c15dbfc3739f7c3bbd8171797eaef55749008bfa
Merge: 0fe0b565ea84fb2363411366905c7cfb492cd709 b76b0341b759e4e2dbb2abd46d60b8decdf2fd6d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 18:53:29 2010 +0200
Merge branch 'collectd-4.9' into collectd-4.10
commit b76b0341b759e4e2dbb2abd46d60b8decdf2fd6d
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 18:52:36 2010 +0200
src/plugin.c: Improve an info message.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
commit e7be1d7ea062e8d4d59c04c42e63d655188dc597
Merge: 97a1b92446be5e0ebb68d25ec8b94743f2ac12fb e76aaa05606e1dfb443a4e4c7028c0ee6ed558e3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 18:43:37 2010 +0200
Merge branch 'ad/redis'
commit e76aaa05606e1dfb443a4e4c7028c0ee6ed558e3
Merge: 7983affe67549ba8d84606f5ada0b98325687d13 3e2a37d253db4eb286445e696029506c1bcec34a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 18:43:33 2010 +0200
Merge branch 'ff/redis' into ad/redis
commit 3e2a37d253db4eb286445e696029506c1bcec34a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 16:45:42 2010 +0200
write_redis plugin: Add all identifiers to a "set".
This should make it easy for front-ends to discover available metrics.
commit b79847972128878c67655b9a0c89b481861ee45a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 16:09:55 2010 +0200
write_redis plugin: Use an "append" macro to fill the values buffer.
This way we don't have to copy the entire buffer, which is hopefully
faster.
commit 53181fa3b5a91f47e51d01d56b34906f8b244a1b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 15:54:15 2010 +0200
write_redis plugin: Fix copyright information.
commit 7983affe67549ba8d84606f5ada0b98325687d13
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 15:50:26 2010 +0200
redis plugin: Add default configuration.
commit ab81f781b1baad179f2c96abf54138d8a7d43cc9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 15:48:25 2010 +0200
redis plugin: Improve the types used for storing information.
commit e8d81d7d47826dbb0e0549ab1c1d5a50add51037
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 17 15:20:59 2010 +0200
redis plugin: Use a linked list rather than an AVL tree.
Since the main purpose of the data structure is to iterate over it, using
an AVL tree here is less efficient than a linked list. Also, it's easier
to read.
commit b1bd5d71df61b00507bfab19bcc7fd6562a2d88a
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 17 08:07:35 2010 +0200
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
commit 459c30811590c42d0d47922199577f0b61f54962
Author: Florian Forster <octo at huhu.verplant.org>
Date: Tue Aug 17 08:05:38 2010 +0200
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.
commit fd4a555fed0d88033e2e5bbe3c84f9847fd1ec22
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Mon Aug 16 10:32:27 2010 +0200
src/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
commit 3d96322c6330132dd67312b72cb62df10a7f09cf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Fri Aug 13 23:15:48 2010 +0200
src/configfile.c: Continue parsing config files if stat'ing one file fails.
commit f3706b0b8792e7340225d7667f69ffb7b178c08e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 10 13:26:45 2010 +0200
write_redis plugin: Add a new plugin writing collectd data to an instance of Redis.
commit fe3dc1b1d500cf1593009ef70487c3eb29cec57f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 10 11:18:42 2010 +0200
collectd.conf(5): Improve the "Redis plugin" documentation a bit.
commit b591eca287a75abd96523d0ac10304cd18881c7b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 10 11:08:03 2010 +0200
configure.in: Reorder the library checks alphabetically.
commit acc9dfa25b7c0c2eedd28c3861f7ef7fc82945ed
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Aug 10 10:54:31 2010 +0200
redis plugin: Simplify configuration handling.
commit d6ef3dad2f3dc9d7c35a9bbb563e52c3f0c1ec7c
Author: Andres J. Diaz <ajdiaz at connectical.com>
Date: Mon Aug 9 10:45:06 2010 +0200
Fix a number of minor bugs.
- The Port configuration option is a string, not a number. Fix
documentation.
- Fix a bad status assignement in port parser.
- Remove default node. Now node is mandatory to prevent
duplicates in tree.
- Update configuration example too.
commit 74ba45134a428c971bc9274b17e8d8bd210156e3
Author: Florian Forster <octo at huhu.verplant.org>
Date: Sun Aug 8 10:59:15 2010 +0200
curl json: Fix checking the response code.
commit 0fe0b565ea84fb2363411366905c7cfb492cd709
Author: Garret Heaton <powdahound at gmail.com>
Date: Mon Jul 19 18:56:31 2010 -0700
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
commit 47d5efe6eae80527119114892aa539d5bfd925df
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Wed Aug 4 14:43:38 2010 +0200
redis plugin: Use "sizeof" rather than repeating the size.
commit 66124ee0d4b7677b2243c6a722eaad621d694f46
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Wed Aug 4 14:40:04 2010 +0200
curl_json plugin: Use a more descriptive define as return value.
commit 272fd122c536588e4d196ee098705c482aee13e3
Author: Florian Forster <octo at noris.net>
Date: Wed Aug 4 11:49:06 2010 +0200
redis plugin: Whitespace fixes.
I've re-indented the entire plugin because indentation was all over the
place. Sorry, if this breaks any patches for you. I'm not usually a
friend of doing this, but I felt it'd be best to do this early on to
annoy the smallest possible number of people.
commit ef30456d00ad45d734a17877aeb97d3dc7fd3e21
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Wed Aug 4 11:36:04 2010 +0200
redis plugin: Fix typos preventing a successful build.
commit 799410cb4a38cf6c6e85eb3c86d050a4010d8c54
Author: Andres J. Diaz <ajdiaz at connectical.com>
Date: Fri Jul 30 16:06:48 2010 +0200
Add redis plugin.
This commit adds a new redis plugin, which connect to a number of redis
server and get information about their status, using the libcredis > 0.2.2
library. The plugin get the following information:
* bgsave_in_progress
* change_since_last_save
* connected_clients
* connected_slaves
* total_command_processed
* total_connection_received
* uptime_in_seconds
* used_memory
Here is an example of configuration file:
<Plugin redis>
<Node example>
Host "localhost"
Timeout 2000
</Node>
</Plugin>
And the output of rrdtool plugin must be something similar to this:
redis-example/bgsave_in_progress.rrd
redis-example/changes_since_last_save.rrd
redis-example/connected_clients.rrd
redis-example/connected_slaves.rrd
redis-example/total_commands_processed.rrd
redis-example/total_connections_received.rrd
redis-example/uptime_in_seconds.rrd
redis-example/used_memory.rrd
Enjoy! :)
commit 5c3e14a2937c7b1b14e6377b1285a36815ca5111
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jul 28 22:42:48 2010 +0200
collectd-perl(5): Mention that "Globals" should be enabled.
commit 4944b8e57d6b08f0434382e64f9687e0fd1cc682
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jul 28 22:42:23 2010 +0200
collectd.conf(5): Documents LoadPlugin's "Globals" option.
commit b16fd65efea0f4073c967f9c93237585fcc7b88c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date: Tue Jul 13 13:58:34 2010 +0200
curl_json plugin: Use the "number" callback of libyajl.
The "integer" callback only works with "long"s, which are 32bit on
x86 and other 32bit architectures. The "number" callback gets the raw
string for us to parse ourselves – honoring the data source type in the
process.
The "integer" and "double" callbacks have been removed, since they are not
used if the "number" callback is present.
More information about the collectd-changes
mailing list