src/utils_cmd_putval.c: Use `parse_values'.
snmp plugin: Use `parse_value' instead of using a separate function here.
src/plugin.c: Introduce the `DS_TYPE_TO_STRING' macro.
src/common.c: Rewrite `parse_value'.
src/utils_cache.c: Add the DERIVE and ABSOLUTE data source types.
src/plugin.h: Use `int64_t' for `derive_t' and `uint64_t' for `absolute_t'.
network plugin: Add the DERIVE and ABSOLUTE data source types.
Introduce the DERIVE and ABSOLUTE data source types.
Hi,
i've updated my patch to 4.7.0, most of "data input" plugins (curl, java, exec,
perl, tail, couchdb) should work with derive. In case of couchdb and curl, if u
use absolute DS you can only "Set", no "Inc" or "Add" coz obviously that
wouldn't make much sense with it. Other plugins can be "enabled" globally to
use derive by changing "COUNTER" to "DERIVE" in types.db but that way is ugly
(but makes sense in some cases, like when u have lot of tunnels or ppp
interfaces) and either needs converting or recreating rrd files.
Regards
Mariusz
---
Hi,
ive been running my patch with 4.7.1, found a minor bug, but after repairing
that i didnt had any problems with it on my servers, im including patch
(against 4.7.1 from webpage),
Regards,
XANi
Hi,
i've updated my patch to 4.7.0, most of "data input" plugins (curl, java, exec,
perl, tail, couchdb) should work with derive. In case of couchdb and curl, if u
use absolute DS you can only "Set", no "Inc" or "Add" coz obviously that
wouldn't make much sense with it. Other plugins can be "enabled" globally to
use derive by changing "COUNTER" to "DERIVE" in types.db but that way is ugly
(but makes sense in some cases, like when u have lot of tunnels or ppp
interfaces) and either needs converting or recreating rrd files.
Regards
Mariusz
---
Hi,
ive been running my patch with 4.7.1, found a minor bug, but after repairing
that i didnt had any problems with it on my servers, im including patch
(against 4.7.1 from webpage),
Regards,
XANi
src/plugin.[ch]: Add meta data to value_list_t.
src/meta_data.[ch]: Add a boolean type.
Merge branch 'collectd-4.7'
Merge branch 'collectd-4.6' into collectd-4.7
dns plugin: Fix a compile warning.
dns plugin: Implement the `SelectNumericQueryTypes' option.
I've added this patch to my collectd because I have my data dir overpopulated
by unknown query types (those not found in nameserv.h which are converted to
their #xxxx numeric form).
When enabled in configuration file, this option just prevent registering these
qtypes to the list.
I don't see any issues, so I decided to contribute this patch to the list.
This has being tested against 4.6.2, but shouldn't have problems with 4.7.0
Your comments are welcome.
Mirko
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
I've added this patch to my collectd because I have my data dir overpopulated
by unknown query types (those not found in nameserv.h which are converted to
their #xxxx numeric form).
When enabled in configuration file, this option just prevent registering these
qtypes to the list.
I don't see any issues, so I decided to contribute this patch to the list.
This has being tested against 4.6.2, but shouldn't have problems with 4.7.0
Your comments are welcome.
Mirko
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
rrdtool plugin: If `flush' cannot find the requested file, issue an `INFO'.
... and not a `WARNING' - this may happen under perfectly fine conditions.
(I. e. file exists but isn't updated anymore.)
... and not a `WARNING' - this may happen under perfectly fine conditions.
(I. e. file exists but isn't updated anymore.)
src/utils_cache.c: Fix incorrect checking of persistent thresholds.
I attached a patch to solve a problem related with notifications. When a value
is missing for a while (2 intervals), a FAILURE notification is raised, and if
Persist is false, the notification is repeated each interval, but man page
says:
If set to false (the default) then a notification is only generated if a
value is out of range but the previous value was okay.
So, I think that is a bug, if not I'm sorry for the noise :)
Regards,
Andres
P.S.: The problem is only a mixing in if conditions into uc_check_timeout
function.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
I attached a patch to solve a problem related with notifications. When a value
is missing for a while (2 intervals), a FAILURE notification is raised, and if
Persist is false, the notification is repeated each interval, but man page
says:
If set to false (the default) then a notification is only generated if a
value is out of range but the previous value was okay.
So, I think that is a bug, if not I'm sorry for the noise :)
Regards,
Andres
P.S.: The problem is only a mixing in if conditions into uc_check_timeout
function.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Disable LFS flags to avoid 32-bit solaris sys/swap.h error
configure.in: Add libyajl to Configuration/Libraries output.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Add libmemcached to Configuration/Libraries output.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
olsrd plugin: Include <netinet/tcp.h>.
Merge branch 'ff/olsrd'
src/collectd.conf.in: Added the olsrd plugin.
collectd.conf(5): Added documentation about the olsrd plugin.
Merge branch 'collectd-4.7'
Merge branch 'collectd-4.6' into collectd-4.7
build system: (Hopefully) added support for libtool 1.5 _and_ 2.2.
The macro LT_PACKAGE_VERSION (which appeared in libtool 2.2) is used to check
weather we're using libtool 2.2.
The macro LT_PACKAGE_VERSION (which appeared in libtool 2.2) is used to check
weather we're using libtool 2.2.
olsrd plugin: Switch the terminology back to LQ and NLQ.
You get used to it after a while..
You get used to it after a while..
olsrd plugin: Send a line to the daemon, so it answers.
Merge branch 'collectd-4.7'
Merge branch 'collectd-4.6' into collectd-4.7
rrdtool plugin: Make sure the initialization is run only once.
Thanks to Amit Gupta for reporting this bug!
Thanks to Amit Gupta for reporting this bug!
src/plugin.c: Initiate the threshold checking again.
Hi,
I have the same problem in my instalation, exactly the same scenario, I found a
possible explanation in the plugin.c module. While in the 4.5 branch exists a
callback to function ut_check_threshold (defined in utils_threshold.c), in the
4.6.2 (and also in 4.6.1, I think), the callback is missing, so threshold
checking never runs.
In fact, a grep -r ut_check_threshold over src dir, only show the definition of
the function in ut_check_threshold module.
I'm not sure if it's really a bug, but when I patched my code, it works fine
for me :) I'm using the 4.6.2 version from tar.gz.
Best regards,
Andrés
The regression was introduced in 65954d9b.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Hi,
I have the same problem in my instalation, exactly the same scenario, I found a
possible explanation in the plugin.c module. While in the 4.5 branch exists a
callback to function ut_check_threshold (defined in utils_threshold.c), in the
4.6.2 (and also in 4.6.1, I think), the callback is missing, so threshold
checking never runs.
In fact, a grep -r ut_check_threshold over src dir, only show the definition of
the function in ut_check_threshold module.
I'm not sure if it's really a bug, but when I patched my code, it works fine
for me :) I'm using the 4.6.2 version from tar.gz.
Best regards,
Andrés
The regression was introduced in 65954d9b.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Be more verbose if libperl exists but doesn't support ithreads.
configure.in, java plugin: Instruct `find' to return files only.
Hopefully this solves this problem:
/home/hudson/jdk/sample/javac -d "." "./org/collectd/api"/*.java
/bin/sh: /home/hudson/jdk/sample/javac: is a directory
Hopefully this solves this problem:
/home/hudson/jdk/sample/javac -d "." "./org/collectd/api"/*.java
/bin/sh: /home/hudson/jdk/sample/javac: is a directory
types.db: Sort the file alphabetically.
olsrd plugin: Implement a `submit' function and use it, too ;)
olsrd plugin: Add a plugin for the “optimized link-state routing daemon”.
This daemon is often used to route in mesh networks, i. e. highly dynamic
wireless networks. The plugin connects to the TCP port opened by the `txtinfo'
plugin of olsrd and parses its output.
Available statistics are:
* links: How many direct connections exist and which quality do they have?
* routes: Number of nets/hosts a node can contact and the average metric to
each network.
* topology: Link quality of the entire topology known to the router.
Each statistic can be configured to be collected as
* No: Values are ignored.
* Summary: Only a fixed number of statistics are collected. This number does
*not* depend on the number of nodes in the network.
* Detail: One (or more) values for each link/node, i. e. the number of
values depends on the number of hosts and may be *huge*.
No documentation exists yet. The plugin has not yet been tested.
This daemon is often used to route in mesh networks, i. e. highly dynamic
wireless networks. The plugin connects to the TCP port opened by the `txtinfo'
plugin of olsrd and parses its output.
Available statistics are:
* links: How many direct connections exist and which quality do they have?
* routes: Number of nets/hosts a node can contact and the average metric to
each network.
* topology: Link quality of the entire topology known to the router.
Each statistic can be configured to be collected as
* No: Values are ignored.
* Summary: Only a fixed number of statistics are collected. This number does
*not* depend on the number of nodes in the network.
* Detail: One (or more) values for each link/node, i. e. the number of
values depends on the number of hosts and may be *huge*.
No documentation exists yet. The plugin has not yet been tested.
src/Makefile.am: Added missing backslash before newline.
The list of manpages is split into several lines. One of those lines was
missing the backslash which caused the list to be cut after collectd-java.5,
i.e. several of the manpages would have not been built at all.
Thanks to 'dh_install --fail-missing' for catching that ;-)
The list of manpages is split into several lines. One of those lines was
missing the backslash which caused the list to be cut after collectd-java.5,
i.e. several of the manpages would have not been built at all.
Thanks to 'dh_install --fail-missing' for catching that ;-)
Merge branch 'collectd-4.7'
Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7
bindings/java/Makefile.am: Install to $pkgdatadir/java/.
And don't use $(builddir): It may be an empty string, making handling of this
variable cumbersome.
And don't use $(builddir): It may be an empty string, making handling of this
variable cumbersome.
collectd.conf: Added a sample config for the memcachec plugin.
... copied from the manpage.
... copied from the manpage.
collectd.conf: Added missing whitespace in sample table configuration.
WTF happened there? ...
WTF happened there? ...
configure: Added support for --enable-<plugin>=force.
This may be used to force a plugin to be built, no matter what the dependency
check yielded. I.e. this is basically the same --enable-<plugin> before commit
9276a81328091fdebc833eb10580d53bc51659db (configure.in: Let configure bail out
on missing dependencies).
This may be used to force a plugin to be built, no matter what the dependency
check yielded. I.e. this is basically the same --enable-<plugin> before commit
9276a81328091fdebc833eb10580d53bc51659db (configure.in: Let configure bail out
on missing dependencies).
configure: Added the --enable-all-plugins option.
This option may be used to enable or disable all plugins by default. The
default may be overwritten by explicitly enabling or disabling a plugin using
the --enable-<plugin> option.
This option may be used to enable or disable all plugins by default. The
default may be overwritten by explicitly enabling or disabling a plugin using
the --enable-<plugin> option.
memcachec plugin: Fixed a typo in a comment.
Build system: Build and install .java files in bindings/java/ automatically.
collectd.conf(5): Add documentation for the memcachec plugin.
README: Fix a typo.
bindings/Makefile: Include java/ subdir in the dist tarball.
contrib/README: Added a short description for collectd-{network,unixsock}.py.
README: Added missing plugins and libraries.
That is, the fscache, memcachec, table and uptime plugins and libganglia,
libgcrypt and libmemcached.
That is, the fscache, memcachec, table and uptime plugins and libganglia,
libgcrypt and libmemcached.
collectd.conf: Added fscache, memcachec, table and ted plugins.
configure: Sort plugins alphabetically in the summary output.
ChangeLog: Changed date to May 11th; Updated version.
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Merge branch 'collectd-4.5' into collectd-4.6
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
Bumped version to 4.5.4; Updated ChangeLog.
Merge branch 'collectd-4.7'
couchdb plugin: Add plugin to fetch data from a CouchDB and parse its contents.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.6' into collectd-4.7
Merge branch 'collectd-4.5' into collectd-4.6
configure.in: Hint towards the CFLAGS instead of using $CC.
configure.in: Add hint for building solaris 64-bit binary.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Check libgcrypt minimum version 1.2.0.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
swap module: Include <vm/anon.h> on Solaris.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Check for `mysql_get_server_version' in libmyql.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Use AC_HEADER_STDBOOL
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
README: Document how to build the Java plugin.
configure.in: Simplified configuration of the Java plugin.
The configure script now uses `find' to search the JAVA_HOME directory for the
files `jni.h', `jni_md.h', and `libjvm.so'. Not nice, but I don't know how else
to solve this problem.
The configure script now uses `find' to search the JAVA_HOME directory for the
files `jni.h', `jni_md.h', and `libjvm.so'. Not nice, but I don't know how else
to solve this problem.
Merge branch 'collectd-4.5' into collectd-4.6
Conflicts:
src/Makefile.am
Conflicts:
src/Makefile.am
Build system: Straighten up building of the DF plugin.
In rare cases, e. g. Solaris, getmntent is available but neither the one nor
the two argument version could be recognized. This lead to `cu_mount_getlist'
returning NULL without an error, leading to the df plugin fail without notice.
While at it I re-implemented the dependency checking of the DF plugin to match
the proprocessor logic in utils_mount.c.
In rare cases, e. g. Solaris, getmntent is available but neither the one nor
the two argument version could be recognized. This lead to `cu_mount_getlist'
returning NULL without an error, leading to the df plugin fail without notice.
While at it I re-implemented the dependency checking of the DF plugin to match
the proprocessor logic in utils_mount.c.
libcollectdclient: Fix a typo.
network plugin: Fix use of a uninitialized variable.
This only happened if debugging was enabled.
This only happened if debugging was enabled.
Merge branch 'collectd-4.6' into collectd-4.7
Merge branch 'collectd-4.5' into collectd-4.6
uuid plugin: Pass `int' to `isxdigit'.
Fixes compilation on NetBSD and possibly other systems.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Fixes compilation on NetBSD and possibly other systems.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
tcpconns plugin: Compilation fixes for NetBSD.
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.6' into collectd-4.7
libcollectdclient: Copy `sstrerror' from src/common.c.
I don't want to simply include common.h, since that pulls in a lot of
other daemon-related headers..
I don't want to simply include common.h, since that pulls in a lot of
other daemon-related headers..
Restructure the --enable-standards option.
On Debian GNU/Linux (testing) this works. Let's see how other
systems hold up.
On Debian GNU/Linux (testing) this works. Let's see how other
systems hold up.
src/Makefile.am: Add standards.h to the sources.
iptables plugin: Initialize ip_version.
iptables.c: In function 'iptables_config':
iptables.c:99: warning: 'ip_version' is used uninitialized in this function
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
iptables.c: In function 'iptables_config':
iptables.c:99: warning: 'ip_version' is used uninitialized in this function
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Merge branch 'collectd-4.6' into collectd-4.7
Set process vmem_size and stack_size on FreeBSD
Fixes:
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.
Conflicts:
src/processes.c
Fixes:
processes.c: In function 'ps_read':
processes.c:328: warning: 'pse.vmem_size' is used uninitialized in this function
processes.c:1300: note: 'pse.vmem_size' was declared here
processes.c:330: warning: 'pse.stack_size' is used uninitialized in this function
processes.c:1300: note: 'pse.stack_size' was declared here
Signed-off-by: Doug MacEachern <dougm@hyperic.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Cherry-picked *again* because the initial commit to the collectd-4.5
branch was incorrect. collectd-4.6 is the branch this should be in.
Conflicts:
src/processes.c
Merge branch 'collectd-4.6' into collectd-4.7
Merge branch 'collectd-4.5' into collectd-4.6
processes plugin: Fix compilation issues under OpenBSD.
Unfortunately OpenBSD support is non-trivial to add, so we'll keep that for
later.
Unfortunately OpenBSD support is non-trivial to add, so we'll keep that for
later.
Merge branch 'collectd-4.6' into collectd-4.7
Merge branch 'collectd-4.5' into collectd-4.6
rrdtool plugin: Make absolutely sure two local variables are initialized.
To make the compiler happy.
To make the compiler happy.
Build system: Add the --enable-standards configure option.
Merge branch 'collectd-4.6' into collectd-4.7
Conflicts:
src/filter_chain.c
src/meta_data.c
src/target_notification.c
src/target_replace.c
src/target_set.c
Conflicts:
src/filter_chain.c
src/meta_data.c
src/target_notification.c
src/target_replace.c
src/target_set.c
bind plugin: Fixes for FreeBSD 7.1
X/Open is needed for strptime,
sys/select.h is needed for some libcurl versions, and
mktime is the POSIX variant of timegm (+ localization).
X/Open is needed for strptime,
sys/select.h is needed for some libcurl versions, and
mktime is the POSIX variant of timegm (+ localization).
Various: Remove strict standards compliance defines.
ntpd plugin: Fix dereference of type-punned pointer.
Merge branch 'collectd-4.5' into collectd-4.6
processes plugin: Comment out nonexistent struct members.
We should reintroduce those values eventually.
We should reintroduce those values eventually.
memory plugin: Fix a formatstring error.
email plugin: Don't assume `pthread_t' is a `unsigned long'.