Merge pull request #499 from pyr/feature-cpu-active
Report a CPU "active" value, summing non-idle values
Report a CPU "active" value, summing non-idle values
Merge pull request #498 from pyr/feature-relative-load
Feature relative load
Feature relative load
Merge pull request #362 from mikepilat/add-snmpv3
Add SNMPv3 authentication and encryption support
Add SNMPv3 authentication and encryption support
Report a CPU "active" value, summing non-idle values
This small change provides a per-core aggregate of non-idle
values for CPUs. This is a good indicator to apply a threshold
on (especially if aggregated by means of the aggregation plugin).
This small change provides a per-core aggregate of non-idle
values for CPUs. This is a good indicator to apply a threshold
on (especially if aggregated by means of the aggregation plugin).
Document changes, mostly taken from @vbartoni's original work
Adapt to @octo's comments for PR #344
Merge remote-tracking branch 'github/master'
Merge pull request #495 from abhinav-upadhyay/fix-readme
Remove 'the' from in front of collectd.
Remove 'the' from in front of collectd.
Remove 'the' from in front of collectd.
Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd
Merge branch 'netlinkfix' of git://github.com/marekbecka/collectd
Merge branch 'ff/network'
collection3: Fix data source names
Data sources were renamed in 6c1415d, but the data source names for some
of these entries still referenced the old data sources.
Data sources were renamed in 6c1415d, but the data source names for some
of these entries still referenced the old data sources.
Merge pull request #459 from pyr/feature-riemann-attributes
Add support for custom attributes.
Add support for custom attributes.
Ignore more build artifacts
This hides:
- vl_utils_lookup_test
- junk left behind by pod2man
- the buildperl dir
This hides:
- vl_utils_lookup_test
- junk left behind by pod2man
- the buildperl dir
Add documentation bits for the new 'Attribute' directive
Add support for custom attributes.
Refactor / modernize config parsing with configfile helpers
... as requested by @octo
... as requested by @octo
Merge pull request #453 from vincentbernat/feature/parallel-dbi
Handle several databases in parallel with dbi plugin
Handle several databases in parallel with dbi plugin
Merge pull request #441 from katzj/localhost-sql
Fix handling of 127.0.0.1 instead of localhost for *sql plugins
Fix handling of 127.0.0.1 instead of localhost for *sql plugins
Merge pull request #452 from alexscott/master
Add a JMXProvider Class Loader to be able to load Provider using
Add a JMXProvider Class Loader to be able to load Provider using
dbi plugin: register one read callback for each database block
By using a distinct read callback for each database block, collectd
will be able to query several databases in parallel. This is useful if
the plugin should handle many queries. This lets the user split them in
chunks and speed up the retrieval.
By using a distinct read callback for each database block, collectd
will be able to query several databases in parallel. This is useful if
the plugin should handle many queries. This lets the user split them in
chunks and speed up the retrieval.
dbi plugin: fix a warning mentioning snmp plugin
Merge pull request #444 from falzm/master
Append rules/targets to existing chain.
Append rules/targets to existing chain.
Add a JMXProvider Class Loader to be able to load Provider using
getConnectorAsService from JMXConnectorFactory. The protocol remoting-jmx
using by JBOSS > 7 need that to work.
getConnectorAsService from JMXConnectorFactory. The protocol remoting-jmx
using by JBOSS > 7 need that to work.
Rewritten condition more clearly.
Append rules/targets to existing chain.
This patch allows appending rules/targets to an existing chain instead
of overwriting it. This way, it is possible to split filter chains
definition among several files.
This patch allows appending rules/targets to an existing chain instead
of overwriting it. This way, it is possible to split filter chains
definition among several files.
Merge pull request #417 from udoprog/udoprog/riemann
write_riemann: Add extra meta strings as attributes in notifications
write_riemann: Add extra meta strings as attributes in notifications
Merge pull request #425 from spotify/master
write_riemann plugin: Receive acknowledge message when using TCP.
write_riemann plugin: Receive acknowledge message when using TCP.
configure.in: Move the useragent config to a more appropriate block.
Fix handling of 127.0.0.1 instead of localhost for *sql plugins
The mysql and postgresql plugins have special handling if you
use localhost as your hostname. Sometimes you need to use 127.0.0.1
instead and want to not have that make changes to the hostname
for the metrics.
The mysql and postgresql plugins have special handling if you
use localhost as your hostname. Sometimes you need to use 127.0.0.1
instead and want to not have that make changes to the hostname
for the metrics.
Add support for a custom user agent at compile-time
Make it possible to specify a custom user agent at compile time
and then use on all libcurl calls instead of just going with
PACKAGE_NAME/PACKAGE_VERSION
Make it possible to specify a custom user agent at compile time
and then use on all libcurl calls instead of just going with
PACKAGE_NAME/PACKAGE_VERSION
libcollectdclient: Implement the lcc_server_set_interface() function.
Copied from the network plugin. License changed to MIT with permission
from Max Henkel, thank you very much!
Copied from the network plugin. License changed to MIT with permission
from Max Henkel, thank you very much!
fix typos
Add support for 64bit netlink counters to the netlink plugin
Merge remote-tracking branch 'origin/master'
write_riemann plugin: Receive acknowledge message when using TCP.
Not receiving an acknowledge message when communicating with riemann over TCP
will cause the riemann instance to eventually hang for extended periods of time
because of resource exhaustion.
Took the time to reaorganize the riemann_send function to simplify locking.
Not receiving an acknowledge message when communicating with riemann over TCP
will cause the riemann instance to eventually hang for extended periods of time
because of resource exhaustion.
Took the time to reaorganize the riemann_send function to simplify locking.
write_riemann: Add extra meta strings as attributes in notifications
Bump version to 5.4.0; Update ChangeLog.
Merge branch 'collectd-5.3'
Conflicts:
configure.in
Conflicts:
configure.in
Merge branch 'collectd-5.2' into collectd-5.3
Merge branch 'ad/aquaero'
collectd.conf(5): Improve markup of the aquaero plugin.
README: Add dependency "aerotools-ng".
aquaero plugin: Use the "complex" configuration.
Actually less LOC.
Actually less LOC.
aquaero plugin: Some coding style fixes.
* Break long lines.
* Rename temperatures. The type instances are now "sensor", "virtual",
"software" and "other".
* Rename "flow-flow" to "flow-sensor".
* Break long lines.
* Rename temperatures. The type instances are now "sensor", "virtual",
"software" and "other".
* Rename "flow-flow" to "flow-sensor".
configure.in: Check for the libaquaero5.o file in "obj/".
This is what the aerotools-ng Makefile is currently using.
This is what the aerotools-ng Makefile is currently using.
Merge branch 'jr/json'
collectd.conf(5): Markup improvements for the curl_json plugin.
curl_json plugin: Random minor improvements.
I did these changes while wrapping my head around the new array code.
* Added a comment to explain the cj_cb_map_key() function.
* Renamed some variabled and the arguments of the cj_cb_map_key() function.
* Renamed the "ignore" argument to "update_key" (inversing its meaning).
I did these changes while wrapping my head around the new array code.
* Added a comment to explain the cj_cb_map_key() function.
* Renamed some variabled and the arguments of the cj_cb_map_key() function.
* Renamed the "ignore" argument to "update_key" (inversing its meaning).
Mention libsigrok dependency
Merge remote-tracking branches 'github/pr/392' and 'github/pr/399' into jr/json
src/types.db: Remove the maximum value for "latency".
Github: #400
Github: #400
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'github/pr/404'
Attempt to fix collectd/collectd#229 by doing user / group lookups before we fork.
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
Update clean.sh
statsd plugin: add TimerCount option
The "count" name was chosen over "num" to match the naming scheme
used by the node.js implementation.
The "count" name was chosen over "num" to match the naming scheme
used by the node.js implementation.
statsd plugin: add TimerSum option
statsd plugin: add TimerLower and TimerUpper options
The "lower" and "upper" names were chosen over "min" and "max"
to match the naming scheme used by the node.js implementation.
The "lower" and "upper" names were chosen over "min" and "max"
to match the naming scheme used by the node.js implementation.
fix .gitignore of lcc_features.h
.gitignore collectd-tg
curl_json plugin: warn when config expects a map and a number is provided
Moves the warning for strings in the number callback which was being called anyway.
This also serves to fix parsing numbers represented as JSON strings which was inadvertantly broken when adding array support.
Moves the warning for strings in the number callback which was being called anyway.
This also serves to fix parsing numbers represented as JSON strings which was inadvertantly broken when adding array support.
aquaero: Fix AC_CHECK configure setting for libaquaero5.
aquaero: Documentation for aquaero plugin.
This patch includes the manpage, smaller config sample file and
the README and AUTHORS description.
This patch includes the manpage, smaller config sample file and
the README and AUTHORS description.
aquaero: Fix sensor names
This patch replaces some sensor names to more reasonable ones.
This patch replaces some sensor names to more reasonable ones.
RedHat RPM spec: support for RHEL5
plus some minor updates: bump version to 5.3.1 & add usage example.
plus some minor updates: bump version to 5.3.1 & add usage example.
curl_json plugin: add an example of array access to the documented uWSGI example
curl_json plugin: document the new Sock option
curl_json plugin: free the socket name
curl_json plugin: style cleanups
curl_json plugin: use sstrerr for thread safety
curl_json plugin: support getting json from a Unix socket as well as a URL
curl_json plugin: separate the cj_curl_perform in to the curl and yajl parts
curl_json plugin: document being able to access arrays
curl_json plugin: support arrays
Allow access to data in JSON arrays. For example
{ workers: [ { requests: 10 }, { requests: 10 } ] }
can all be accessed with
workers/*/requests
or just one by using the index.
workers/1/requests
Allow access to data in JSON arrays. For example
{ workers: [ { requests: 10 }, { requests: 10 } ] }
can all be accessed with
workers/*/requests
or just one by using the index.
workers/1/requests
disable fields not available in varnish 2.0.x
Several fields were added in commit 8775392. 3 of them make the build
fail when varnish 2.0.x is used. This patch makes them available only
when using varnish 3.x.
The commit message of 8775392 gives more detail on the rationale behind
this way of doing.
Several fields were added in commit 8775392. 3 of them make the build
fail when varnish 2.0.x is used. This patch makes them available only
when using varnish 3.x.
The commit message of 8775392 gives more detail on the rationale behind
this way of doing.
Merge remote-tracking branch 'origin/pr/376'
Merge branch 'pr/392'
curl_json plugin: style cleanups
curl_json plugin: use sstrerr for thread safety
update copyright and authors list
remove redundant inclusion of time.h
Add sigrok to README/AUTHORS
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
memcached plugin: actually connect when using a unix socket
Signed-off-by: Florian Forster <octo@collectd.org>
Signed-off-by: Florian Forster <octo@collectd.org>
curl_json plugin: support getting json from a Unix socket as well as a URL
curl_json plugin: separate the cj_curl_perform in to the curl and yajl parts
csv plugin: set datadir null when free
If you define twice DataDir:
<Plugin csv>
DataDir "/opt/collectd/var/lib/collectd/csv"
DataDir stdout
</Plugin>
the second time datadir will not be null and
you will get garbage in value_list_to_filename
Signed-off-by: Florian Forster <octo@collectd.org>
If you define twice DataDir:
<Plugin csv>
DataDir "/opt/collectd/var/lib/collectd/csv"
DataDir stdout
</Plugin>
the second time datadir will not be null and
you will get garbage in value_list_to_filename
Signed-off-by: Florian Forster <octo@collectd.org>
csv plugin: fix forgotten "datadir" in re-implement value_list_to_filename()
In the commit 7f90e30 the re-implementation of value_list_to_filename
forgot to prepend the datadir string.
Signed-off-by: Florian Forster <octo@collectd.org>
In the commit 7f90e30 the re-implementation of value_list_to_filename
forgot to prepend the datadir string.
Signed-off-by: Florian Forster <octo@collectd.org>
Merge branch 'ff/statsd'
Merge branch 'pr/381'
src/collectd.conf.in: Unify indentation.
sigrok plugin: Ensure consistent logging prefix.
* Make sure all logging is using the "sigrok plugin: " prefix.
* Improved logging when handling the "LogLevel" option.
* Renamed free_drvopts() to sigrok_free_drvopts(). All functions now use the
"sigrok_" prefix.
* Don't abort parsing a "Device" block when encountering an incorrect number of
arguments. The cf_util_* functions will complain about that.
* Make sure all logging is using the "sigrok plugin: " prefix.
* Improved logging when handling the "LogLevel" option.
* Renamed free_drvopts() to sigrok_free_drvopts(). All functions now use the
"sigrok_" prefix.
* Don't abort parsing a "Device" block when encountering an incorrect number of
arguments. The cf_util_* functions will complain about that.
collectd.conf(5): sigrok plugin: Improve markup.
use pkg-config to locate libmnl and configure netlink plugin
rrdtool plugin: Minor performance improvement.
Replace the value_list_to_string() function with a version which is optimized
for data sets with a single data source. The original function is still used
for data sets with multiple data sources. This allows to reduce the number of
calls to snprintf() in this (very common) case, resulting in ~2% speedup.
Replace the value_list_to_string() function with a version which is optimized
for data sets with a single data source. The original function is still used
for data sets with multiple data sources. This allows to reduce the number of
calls to snprintf() in this (very common) case, resulting in ~2% speedup.
sigrok: Update docs to reflect config keyword change
sigrok: Change 'interval' option to 'MinimumInterval', and allow 0
A MinimumInterval of 0 means whatever the device sends gets dispatched
to collectd. This is the default.
A MinimumInterval of 0 means whatever the device sends gets dispatched
to collectd. This is the default.
Fix temperature type to be unit-agnostic
The minimum value of -273.15 implies Celcius, which is not necessarily
what is used for this type.
The minimum value of -273.15 implies Celcius, which is not necessarily
what is used for this type.
add sound pressure level type