Code

collectd.git
14 years agoBugfix with multiple files
Fabian Schuh [Thu, 18 Mar 2010 10:03:54 +0000 (11:03 +0100)]
Bugfix with multiple files

14 years ago[openvpn] new feature 'SumOverAllUsers'
Fabian Schuh [Thu, 18 Mar 2010 09:50:15 +0000 (10:50 +0100)]
[openvpn] new feature 'SumOverAllUsers'

14 years agoMerge branch 'cstenac'
Florian Forster [Mon, 15 Mar 2010 21:43:05 +0000 (22:43 +0100)]
Merge branch 'cstenac'

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Mon, 15 Mar 2010 21:43:00 +0000 (22:43 +0100)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
src/exec.c

14 years agoExec plugin: Update copyright header.
Florian Forster [Mon, 15 Mar 2010 21:03:14 +0000 (22:03 +0100)]
Exec plugin: Update copyright header.

14 years agoprocesses plugin: Fix a couple of hard-coded array sizes.
Florian Forster [Mon, 15 Mar 2010 21:37:56 +0000 (22:37 +0100)]
processes plugin: Fix a couple of hard-coded array sizes.

Since I was picky when accepting Clément's patch, I felt like I owed it
to clean up the entire file ;)

14 years agoprocesses plugin: Update copyright and author information.
Florian Forster [Mon, 15 Mar 2010 21:33:12 +0000 (22:33 +0100)]
processes plugin: Update copyright and author information.

14 years agocollectd.conf(5): Document the new "PrintSeverity" option.
Florian Forster [Mon, 15 Mar 2010 21:09:46 +0000 (22:09 +0100)]
collectd.conf(5): Document the new "PrintSeverity" option.

14 years agologfile plugin: Rename the "PrintLevel" option to "PrintSeverity".
Florian Forster [Mon, 15 Mar 2010 21:09:08 +0000 (22:09 +0100)]
logfile plugin: Rename the "PrintLevel" option to "PrintSeverity".

14 years agoImpove level print
Clément Stenac [Sun, 14 Mar 2010 08:25:42 +0000 (09:25 +0100)]
Impove level print

14 years agoMisc fixes, thanks to octo for pointing them out
Clément Stenac [Sun, 14 Mar 2010 08:14:11 +0000 (09:14 +0100)]
Misc fixes, thanks to octo for pointing them out

14 years agoAdd missing declarations for anonymous and code
Clément Stenac [Sun, 14 Mar 2010 07:56:55 +0000 (08:56 +0100)]
Add missing declarations for anonymous and code

14 years agoconfigfile: cf_read_dir: Don't abort reading a directory when reading one file fails.
Florian Forster [Wed, 3 Mar 2010 14:44:11 +0000 (15:44 +0100)]
configfile: cf_read_dir: Don't abort reading a directory when reading one file fails.

14 years agosrc/configfile.c: Fix a minor typo.
Florian Forster [Wed, 10 Mar 2010 17:37:47 +0000 (18:37 +0100)]
src/configfile.c: Fix a minor typo.

14 years agosrc/configfile.[ch]: Add "cf_util_get_int".
Florian Forster [Wed, 10 Mar 2010 17:37:32 +0000 (18:37 +0100)]
src/configfile.[ch]: Add "cf_util_get_int".

Helper function to parse an "int".

14 years agosrc/configfile.[ch]: Implement "cf_util_get_string_buffer".
Florian Forster [Wed, 10 Mar 2010 16:20:29 +0000 (17:20 +0100)]
src/configfile.[ch]: Implement "cf_util_get_string_buffer".

A function to parse a config node into a char buffer of limited size.

14 years agoProcesses plugin: Fix a minor typo.
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Processes plugin: Fix a minor typo.

14 years agoExec plugin: Add a missing folding marker.
Florian Forster [Tue, 9 Mar 2010 17:51:08 +0000 (18:51 +0100)]
Exec plugin: Add a missing folding marker.

14 years agoExec plugin: Set the "noreturn" attribute on the "exec_child" function.
Florian Forster [Tue, 9 Mar 2010 17:50:55 +0000 (18:50 +0100)]
Exec plugin: Set the "noreturn" attribute on the "exec_child" function.

14 years agoExec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.
Florian Forster [Tue, 9 Mar 2010 17:50:32 +0000 (18:50 +0100)]
Exec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.

14 years agolibiptc: avoid strict-aliasing warnings
Jan Engelhardt [Tue, 16 Feb 2010 20:16:47 +0000 (21:16 +0100)]
libiptc: avoid strict-aliasing warnings

libiptc: avoid strict-aliasing warnings

In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
  CC     libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec@gmail.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoMerge remote branch 'origin/collectd-4.8' into collectd-4.8
Florian Forster [Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100)]
Merge remote branch 'origin/collectd-4.8' into collectd-4.8

14 years agoconfigure.in: Check for "htonll".
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 15:12:51 +0000 (16:12 +0100)]
configure.in: Check for "htonll".

The first patch adds support to check if the htonl and htonll functions
(which are used in AIX port) are available in configure. Until now the
AIX port used these functions without perform any existence test.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agomemcached plugin: Add hack for AIX compatibility.
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 14:40:00 +0000 (15:40 +0100)]
memcached plugin: Add hack for AIX compatibility.

The second one port memcached plugin to AIX. Since AIX don't have
MSG_DONTWAIT flag support, we use MSG_NONBLOCK... and we hope to work
fine ever :)

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
14 years agooracle plugin: Fix semantics of OCIAttrGet.
Florian Forster [Wed, 3 Mar 2010 13:01:30 +0000 (14:01 +0100)]
oracle plugin: Fix semantics of OCIAttrGet.

Apparently it returns success if it could fetch the parameter value and
doesn't interpret the value itself. So returning NULL when querying for
OCI_ATTR_SERVER_STATUS does not result in an error. Handle this as a
lost connection.

Thanks to Sven for pointing this out :)

14 years agoAdd missing fetch of virtual size for Mach
Clément Stenac [Sat, 27 Feb 2010 21:16:58 +0000 (22:16 +0100)]
Add missing fetch of virtual size for Mach

14 years agoAdd support for fetching data (aka anonymous) and code virtual memory size
Clément Stenac [Sat, 27 Feb 2010 21:15:21 +0000 (22:15 +0100)]
Add support for fetching data (aka anonymous) and code virtual memory size

14 years agoMinor typo
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Minor typo

14 years agoAdd an option to add the severity of the message in the logfile plugin
Clément Stenac [Sat, 27 Feb 2010 20:08:53 +0000 (21:08 +0100)]
Add an option to add the severity of the message in the logfile plugin

14 years agowrite_http plugin: Replace tabs with spaces.
Florian Forster [Sat, 27 Feb 2010 08:55:44 +0000 (09:55 +0100)]
write_http plugin: Replace tabs with spaces.

So the entire file is indented the same way.

14 years ago.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.
Sebastian Harl [Thu, 25 Feb 2010 23:31:51 +0000 (00:31 +0100)]
.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.

His name was mis-spelled in one commit as Rodolphe Quiedeville*l*.

14 years agowrite_http plugin: Fixed a memory leak in the "StoreRates" code.
Sebastian Harl [Tue, 16 Feb 2010 22:54:02 +0000 (23:54 +0100)]
write_http plugin: Fixed a memory leak in the "StoreRates" code.

14 years agowrite_http plugin: Add a StoreRates option.
Paul Sadauskas [Mon, 15 Feb 2010 04:18:58 +0000 (21:18 -0700)]
write_http plugin: Add a StoreRates option.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
14 years agoMerge branch 'collectd-4.9'
Florian Forster [Thu, 25 Feb 2010 23:17:18 +0000 (00:17 +0100)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:

src/ping.c

14 years agocontrib/redhat/collectd.spec: Updated for version 4.9.
Stu Hood [Thu, 25 Feb 2010 21:40:53 +0000 (22:40 +0100)]
contrib/redhat/collectd.spec: Updated for version 4.9.

I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.

14 years agodebian/: Removed ancient Debian package files.
Florian Forster [Thu, 11 Feb 2010 13:03:38 +0000 (14:03 +0100)]
debian/: Removed ancient Debian package files.

You might want to look at git://git.tokkee.org/pkg-collectd.git instead.

14 years agoconfigure.in: Fix three small typos.
Florian Forster [Wed, 10 Feb 2010 14:24:23 +0000 (15:24 +0100)]
configure.in: Fix three small typos.

14 years agoBuild system: Put Java class files into a .jar file.
Amit Gupta [Wed, 10 Feb 2010 13:37:36 +0000 (14:37 +0100)]
Build system: Put Java class files into a .jar file.

Hi,

I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.

Same holds true for jmx class files as well (probably jmx.jar?).

I could work on this if everyone is okay with it.

Regards
Amit

14 years agosrc/utils_cmd_listval.c: Fix a memory leak.
Florian Forster [Wed, 10 Feb 2010 13:01:37 +0000 (14:01 +0100)]
src/utils_cmd_listval.c: Fix a memory leak.

Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.

14 years agoBugfix: correctly handle spurious wakeups in pthread_cond_timedwait
Michael Stapelberg [Sat, 6 Feb 2010 15:10:33 +0000 (16:10 +0100)]
Bugfix: correctly handle spurious wakeups in pthread_cond_timedwait

This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agosrc/utils_format_json.c: Use "isfinite" rather than "isinf".
Florian Forster [Thu, 4 Feb 2010 12:07:43 +0000 (13:07 +0100)]
src/utils_format_json.c: Use "isfinite" rather than "isinf".

Makes it a bit easier to read.

14 years agosrc/collectd.h: Add fallback implementations of "isfinite" and "isinf".
Florian Forster [Thu, 4 Feb 2010 12:07:06 +0000 (13:07 +0100)]
src/collectd.h: Add fallback implementations of "isfinite" and "isinf".

14 years agoutils_format_json: serialize nan and inf as null, as per JSON spec
Chris Buben [Thu, 4 Feb 2010 08:52:30 +0000 (00:52 -0800)]
utils_format_json: serialize nan and inf as null, as per JSON spec

I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.

[
    {
        "plugin": "memcached",
        "interval": 10,
        "host": "myhost",
        "values": [
            nan,
            5
        ],
        "time": 1265239180,
        "plugin_instance": "",
        "type_instance": "",
        "type": "ps_count"
    }
]

After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.

This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoping plugin: Improved some error messages.
Sebastian Harl [Thu, 28 Jan 2010 22:29:25 +0000 (23:29 +0100)]
ping plugin: Improved some error messages.

14 years agocontextswitch plugin: Handle large counter/derive values correctly.
Florian Forster [Tue, 26 Jan 2010 23:07:50 +0000 (00:07 +0100)]
contextswitch plugin: Handle large counter/derive values correctly.

Using "strtoul" for derive_t values fails for large counter values.
Thanks to Martin Merkel for reporting this :)

14 years agocollectd{-python,.conf}(5): Fixed some typos.
Sebastian Harl [Sun, 24 Jan 2010 14:32:25 +0000 (15:32 +0100)]
collectd{-python,.conf}(5): Fixed some typos.

Thanks to lintian(1) for catching those!

14 years agocollectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.
Sebastian Harl [Sun, 24 Jan 2010 12:20:43 +0000 (13:20 +0100)]
collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.

Thanks to lintian(1) for catching (some of) those! :-)

14 years agocurl_xml plugin: Cast _Bool to long when calling curl_easy_setopt.
Florian Forster [Sat, 23 Jan 2010 16:28:22 +0000 (17:28 +0100)]
curl_xml plugin: Cast _Bool to long when calling curl_easy_setopt.

14 years agoapache plugin: Fix collection of the "apache_connections" value with Apache 2.*.
Florian Forster [Sat, 23 Jan 2010 12:19:49 +0000 (13:19 +0100)]
apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.

Thanks to Gary (bug tracker) for pointing this out :)

14 years agocontrib/collection.cgi: Add graphs for "apache_connections" and "apache_idle_workers".
Florian Forster [Sat, 23 Jan 2010 12:10:20 +0000 (13:10 +0100)]
contrib/collection.cgi: Add graphs for "apache_connections" and "apache_idle_workers".

Thanks to Gary (via the bug tracker).

14 years agoapache plugin: Added support for the "IdleWorkers" field.
Florian Forster [Sat, 23 Jan 2010 12:06:48 +0000 (13:06 +0100)]
apache plugin: Added support for the "IdleWorkers" field.

Thanks to Gary from the bug tracker for the suggestion and code :)

14 years agocontrib/collection.cgi: Added ability to hide specified types.
Pavel Piatruk [Fri, 22 Jan 2010 08:13:29 +0000 (09:13 +0100)]
contrib/collection.cgi: Added ability to hide specified types.

It is useful when you don't want to see many graphs. How to use the patch:
apply it to collection.cgi and add lines with keyword ,,dontshowtype'' to
/etc/collectd/collection.conf:

dontshowtype: "if_errors"
dontshowtype: "if_packets"

Then you will see only if_octets types in "interface" plugin page.

Via Debian bug #566199.

14 years agosrc/filter_chain.c: Make info-message more verbose.
Florian Forster [Thu, 21 Jan 2010 10:36:30 +0000 (11:36 +0100)]
src/filter_chain.c: Make info-message more verbose.

14 years agoswap plugin: Put parsing of Linux 2.6 and <2.6 files into one loop.
Florian Forster [Wed, 20 Jan 2010 17:09:28 +0000 (18:09 +0100)]
swap plugin: Put parsing of Linux 2.6 and <2.6 files into one loop.

14 years agosrc/common.[ch]: Implement “strtoderive”.
Florian Forster [Wed, 20 Jan 2010 17:08:49 +0000 (18:08 +0100)]
src/common.[ch]: Implement “strtoderive”.

Simplifies error handling.

14 years agoswap plugin: Remove trailing whitespace.
Florian Forster [Wed, 20 Jan 2010 16:42:52 +0000 (17:42 +0100)]
swap plugin: Remove trailing whitespace.

14 years agoswap plugin - swap in/out does not work for kernels <2.6
Lorin Scraba [Tue, 19 Jan 2010 23:22:32 +0000 (15:22 -0800)]
swap plugin - swap in/out does not work for kernels <2.6

It works on RedHat9 and 6 (don't ask). A more gracefull solution is
having a configuration option for choosing /proc/<foo> format I
suppose...
Hope it helps some sysadmins like me that are forced to maintained
anqituities in production.

Cheers

From 1da38c6d515f7fa4599b7b08e1284fb2ac9a504a Mon Sep 17 00:00:00 2001
From: Lorin Scraba <lorin@si-bemol.ro>
Date: Tue, 19 Jan 2010 15:16:29 -0800
Subject: [PATCH] swap plugin - swapin/out fix for older kernels - <2.6

Signed-off-by: Lorin Scraba <lorin@si-bemol.ro>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
14 years agoUse Curl AnyAuth (digest+basic) instead of just digest
Paul Sadauskas [Sun, 17 Jan 2010 19:54:06 +0000 (12:54 -0700)]
Use Curl AnyAuth (digest+basic) instead of just digest

14 years agoMerge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Florian Forster [Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8

14 years agosrc/collectd.c: Include the plugin directory in the usage output.
Florian Forster [Tue, 19 Jan 2010 07:22:56 +0000 (08:22 +0100)]
src/collectd.c: Include the plugin directory in the usage output.

14 years agocollectd.conf.in: Add the cURL-XML plugin.
Florian Forster [Tue, 19 Jan 2010 07:17:47 +0000 (08:17 +0100)]
collectd.conf.in: Add the cURL-XML plugin.

14 years agoexec plugin: Improved some error messages.
Sebastian Harl [Fri, 15 Jan 2010 09:07:39 +0000 (10:07 +0100)]
exec plugin: Improved some error messages.

14 years agocontrib/exec-munin.px: Add GPLv2 header.
Florian Forster [Fri, 15 Jan 2010 09:16:18 +0000 (10:16 +0100)]
contrib/exec-munin.px: Add GPLv2 header.

14 years agoMerge branch 'collectd-4.8' into collectd-4.9 collectd-4.9.1
Florian Forster [Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog

14 years agoChangeLog: Added fix in the processes plugin.
Florian Forster [Thu, 14 Jan 2010 14:03:43 +0000 (15:03 +0100)]
ChangeLog: Added fix in the processes plugin.

14 years agoprocesses plugin: Fix handling of the ps_disk_{octets,ops} types.
Florian Forster [Thu, 14 Jan 2010 09:54:53 +0000 (10:54 +0100)]
processes plugin: Fix handling of the ps_disk_{octets,ops} types.

There values were stored in a `long', then `counter_t', then interpreted as
`derive_t'. Changed that to `derive_t' only. Hopefully this fixes a bug
reported by Mark Moseley.

14 years agoChangeLog: Updated for version 4.9.1.
Florian Forster [Wed, 13 Jan 2010 17:04:24 +0000 (18:04 +0100)]
ChangeLog: Updated for version 4.9.1.

14 years agoChangeLog: Updated for version 4.8.3. collectd-4.8.3
Florian Forster [Wed, 13 Jan 2010 16:55:02 +0000 (17:55 +0100)]
ChangeLog: Updated for version 4.8.3.

14 years agoMerge branch 'ag/curl_xml'
Florian Forster [Wed, 13 Jan 2010 15:16:28 +0000 (16:16 +0100)]
Merge branch 'ag/curl_xml'

14 years agoMerge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Florian Forster [Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8

14 years agocollectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.
Florian Forster [Wed, 13 Jan 2010 14:51:41 +0000 (15:51 +0100)]
collectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.

14 years agocollectd.conf(5): Remove trailing whitespace.
Florian Forster [Wed, 13 Jan 2010 14:51:02 +0000 (15:51 +0100)]
collectd.conf(5): Remove trailing whitespace.

14 years agocollectd.conf(5): Document the cURL-XML plugin.
Florian Forster [Wed, 13 Jan 2010 14:50:23 +0000 (15:50 +0100)]
collectd.conf(5): Document the cURL-XML plugin.

14 years agoREADME: Add the curl_xml plugin.
Florian Forster [Wed, 13 Jan 2010 13:05:30 +0000 (14:05 +0100)]
README: Add the curl_xml plugin.

14 years agocurl_xml plugin: Replace the AVL-tree with a linked list.
Amit Gupta [Wed, 13 Jan 2010 12:52:56 +0000 (13:52 +0100)]
curl_xml plugin: Replace the AVL-tree with a linked list.

This makes iterating over all elements more efficient. The CX_KEY_MAGIC hack is
also removed. Last but not least, “plugin_get_ds” is now called only once.

14 years agotypes.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.
Sebastian Harl [Wed, 13 Jan 2010 12:21:47 +0000 (13:21 +0100)]
types.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.

14 years agocurl_xml plugin: Rename "Instance" and "Values" to "*From" for consistency.
Amit Gupta [Wed, 13 Jan 2010 11:50:04 +0000 (12:50 +0100)]
curl_xml plugin: Rename "Instance" and "Values" to "*From" for consistency.

14 years agoMerge commit 'origin/ff/routeros'
Florian Forster [Wed, 13 Jan 2010 11:14:02 +0000 (12:14 +0100)]
Merge commit 'origin/ff/routeros'

14 years agoMerge branch 'collectd-4.9'
Florian Forster [Wed, 13 Jan 2010 11:11:28 +0000 (12:11 +0100)]
Merge branch 'collectd-4.9'

14 years agoMerge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9

14 years agoMerge branch 'collectd-4.7' into collectd-4.8
Florian Forster [Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)]
Merge branch 'collectd-4.7' into collectd-4.8

14 years agobindings/perl/lib/Collectd.pm: Add forgotten "config" callback type.
Florian Forster [Mon, 11 Jan 2010 22:18:27 +0000 (23:18 +0100)]
bindings/perl/lib/Collectd.pm: Add forgotten "config" callback type.

Thanks to "ntenev" for reporting the issue.

14 years agocurl_xml plugin: Don't use a hyphen to separate instance prefix and value.
Florian Forster [Mon, 11 Jan 2010 15:52:48 +0000 (16:52 +0100)]
curl_xml plugin: Don't use a hyphen to separate instance prefix and value.

This way the plugin behaves more like the SNMP plugin.

14 years agocurl_xml plugin: Documented the type-instance behavior a bit better.
Florian Forster [Mon, 11 Jan 2010 15:52:25 +0000 (16:52 +0100)]
curl_xml plugin: Documented the type-instance behavior a bit better.

14 years agocurl_xml plugin: Break up “cx_submit_xpath_values” into smaller functions.
Florian Forster [Mon, 11 Jan 2010 15:39:46 +0000 (16:39 +0100)]
curl_xml plugin: Break up “cx_submit_xpath_values” into smaller functions.

14 years agocurl_xml plugin: Move the setting of type_instance to a separate function.
Florian Forster [Mon, 11 Jan 2010 15:12:52 +0000 (16:12 +0100)]
curl_xml plugin: Move the setting of type_instance to a separate function.

14 years agocurl_xml plugin: Make absolutely certain “instance_node_obj” is freed.
Florian Forster [Mon, 11 Jan 2010 14:46:30 +0000 (15:46 +0100)]
curl_xml plugin: Make absolutely certain “instance_node_obj” is freed.

14 years agocurl_xml plugin: Check the return value of “cx_evaluate_xpath”.
Florian Forster [Mon, 11 Jan 2010 14:46:07 +0000 (15:46 +0100)]
curl_xml plugin: Check the return value of “cx_evaluate_xpath”.

14 years agocurl_xml plugin: Change C++-style comments into C-style comments.
Florian Forster [Mon, 11 Jan 2010 14:45:09 +0000 (15:45 +0100)]
curl_xml plugin: Change C++-style comments into C-style comments.

14 years agocurl_xml plugin: Clear type_instance if it is not set.
Florian Forster [Mon, 11 Jan 2010 14:44:14 +0000 (15:44 +0100)]
curl_xml plugin: Clear type_instance if it is not set.

14 years agocurl_xml plugin: Adapted copyright for 2010.
Florian Forster [Mon, 11 Jan 2010 14:21:59 +0000 (15:21 +0100)]
curl_xml plugin: Adapted copyright for 2010.

14 years agoAUTHORS: Added curl_xml plugin to Amit.
Florian Forster [Mon, 11 Jan 2010 14:21:28 +0000 (15:21 +0100)]
AUTHORS: Added curl_xml plugin to Amit.

14 years agocurl_xml plugin: Replace cx_config_add_string and cx_config_set_boolean by their...
Florian Forster [Mon, 11 Jan 2010 14:14:02 +0000 (15:14 +0100)]
curl_xml plugin: Replace cx_config_add_string and cx_config_set_boolean by their global versions.

14 years agocurl_xml plugin: Reorder functions and remove forward declarations.
Florian Forster [Mon, 11 Jan 2010 14:06:57 +0000 (15:06 +0100)]
curl_xml plugin: Reorder functions and remove forward declarations.

14 years agocurl_xml plugin: New plugin to fetch and parse XML files.
Amit Gupta [Mon, 11 Jan 2010 13:58:17 +0000 (14:58 +0100)]
curl_xml plugin: New plugin to fetch and parse XML files.

Do find the curl_xml.c source file attached. The implementation is done as I
suggested in my previous mail.
The supported configuration is as follows:
<xpath "/path/to/node(s)">
   InstancePrefix "test" # optional
   Instance "path/to/textnode"  # optional if base xpath expression returns
single result i.e one matching node
   Values "path/to/textnode1"  "path/to/textnode2"
   Type "magic_level"
 </xpath>

I have done some level of testing to make sure plugin is working. If someone
is interested in testing/trying the plugin, do the following:
- apply the attached patch on the 4.9.0 branch
- copy the attached curl_xml.c to the collectd-4.9.0/src
- run autconf to generate new configure script containing changes to build
curl_xml plugin
- build and install collectd (make && make install)

Do let me know if anyone has problem building/running the plugin.

Any comments/suggestions are welcome.

Regards
Amit

14 years agopython: Fixed configure script for python3.
Sven Trenkel [Tue, 5 Jan 2010 18:02:07 +0000 (19:02 +0100)]
python: Fixed configure script for python3.

14 years agosrc/collectd.conf.in: Add the new options of the routeros plugin.
Florian Forster [Tue, 5 Jan 2010 12:10:50 +0000 (13:10 +0100)]
src/collectd.conf.in: Add the new options of the routeros plugin.

14 years agocollectd.conf(5): Document the new config options of the routeros plugin.
Florian Forster [Tue, 5 Jan 2010 12:10:29 +0000 (13:10 +0100)]
collectd.conf(5): Document the new config options of the routeros plugin.