Merge pull request #427 from kbingham/version_fix
version-gen.sh: Ensure only collectd repository versions are used
version-gen.sh: Ensure only collectd repository versions are used
Merge pull request #321 from mwongatemma/db_meta_data
Annotate meta data for db plugins
Annotate meta data for db plugins
Merge pull request #408 from radford/curl-json-cache-aliasing
curl_json plugin: avoid cache aliasing by using all fields instead of just two
curl_json plugin: avoid cache aliasing by using all fields instead of just two
Merge pull request #553 from Whissi/issue_553
collectd ignores command line argument "-P"
collectd ignores command line argument "-P"
Merge pull request #672 from zdzichu/master
onewire: add other temperature-providing sensor families
onewire: add other temperature-providing sensor families
Merge pull request #675 from mfournier/write_http_doc
document new options to write_http plugin
document new options to write_http plugin
Merge pull request #581 from jktjkt/hysteresis
Fix transitions between FAILURE and WARNING when using option Hysteresis in Thresholds
Fix transitions between FAILURE and WARNING when using option Hysteresis in Thresholds
Rename foo_test to test_foo.
src/Makefile.am: Expand tabs.
Add tests for src/utils_mount.[ch].
Github: #412
Github: #412
utils_heap_test: Add some tests for the heap structure.
Tests: Make the self-rolled test framework a bit more useful and consistent.
Move tests and mocks to src/tests/{,mock/}.
src/utils_avltree_test.c: Add partial check for the AVL tree.
utils_vl_lookup_test: Fix dependencies.
src/common_test.c: Add some tests for files in src/common.c.
Merge pull request #613 from rubenk/master
Fix a few typos
Fix a few typos
Merge pull request #649 from manuelluis/mlsr/flush-fix_time
FLUSH cmd: convert timeout (double) to cdtime_t as the previous call to plugin_flush
FLUSH cmd: convert timeout (double) to cdtime_t as the previous call to plugin_flush
Merge pull request #644 from manuelluis/mlsr/putnotif-fix_time
Fix the conversion of time option in PUTNOTIF from timestamp to cdtime_t
Fix the conversion of time option in PUTNOTIF from timestamp to cdtime_t
Merge pull request #645 from manuelluis/mlsr/java-fix_cdtime
Plugin java: fix notification time conversion to cdtime_t.
Plugin java: fix notification time conversion to cdtime_t.
vanity
Merge pull request #647 from manuelluis/mlsr/threshold-missing_time
Plugin threshold: time is not set in missing notifications.
Plugin threshold: time is not set in missing notifications.
Merge pull request #659 from mfournier/amqp-fixups
Amqp fixups
Amqp fixups
Merge branch 'master' of github.com:collectd/collectd
Merge pull request #674 from manuelluis/mlsr/unixsock_getthreshold
Plugin unixsock: reenable getthreshold cmd.
Plugin unixsock: reenable getthreshold cmd.
Merge branch 'mlsr/unixsock_getthreshold' of https://github.com/manuelluis/collectd
Renable getthreshold cmd in unixsock Plugin.
Move threshold_search and threshold_get to utils_threshold.c
make configure summary consistent
Merge pull request #360 from pyr/feature-log-logstash
add log_logstash plugin to emit logstash json_event messages.
add log_logstash plugin to emit logstash json_event messages.
document log_logstash
small typos
forgotten printf
Merge pull request #660 from mfournier/logfile-log_level
Logfile log level
Logfile log level
avoid possibility of muting log output
bring in AM_CPPFLAGS
support emitting to stdout or stderr
Merge pull request #670 from pyr/feature-write-kafka
Add a write_kafka output with similar properties to the amqp one.
Add a write_kafka output with similar properties to the amqp one.
Merge pull request #518 from pyr/feature-riemann-threshold
Feature riemann threshold
Feature riemann threshold
add 2 missing options to example config
Merge branch 'udev-disk'
disk: document missing option + add example
add documentation
Merge pull request #639 from dothebart/fix_cpu_crash
CPU Percentage: after realloc the pointer becomes invalid;
CPU Percentage: after realloc the pointer becomes invalid;
Merge pull request #666 from KiNgMaR/write_http-ssloptions
write_http: expose more TLS options
write_http: expose more TLS options
make kafka logs go through collectd's logging
remove unneeded include
onewire: add other temperature-providing sensor families
Add a write_kafka output with similar properties to the amqp one.
document new options
make threshold checking optional
Merge branch 'master' into feature-riemann-threshold
reuse main avl tree
Store the avl tree within collectd core.
We need this if we want modules to share access to the threshold
avl tree.
We need this if we want modules to share access to the threshold
avl tree.
write_http: expose more TLS options
* adds support for client certificate authentication
* allows setting CAPath
* allows forcing a specific SSL/TLS version
* adds support for client certificate authentication
* allows setting CAPath
* allows forcing a specific SSL/TLS version
Merge pull request #619 from Crapworks/master
increased buffer size
increased buffer size
correct typo in error message
logfile: avoid total silence in case of a misconfiguration
Basically the same patch that was applied to syslog.c in 84c38056
Basically the same patch that was applied to syslog.c in 84c38056
document 2 new options added to amqp plugin
amqp: new Queue{Durable,AutoDelete} options are subscribe-only options
remove quotes in example config to make all statements consistent
mention new options to cpu plugin in example config
add brackets to the list of characters graphite chokes on
(cherry-pick of 109cc80a to avoid a merge conflict later on)
(cherry-pick of 109cc80a to avoid a merge conflict later on)
Merge pull request #636 from dothebart/config_debug_nonsilent
Syslog: don't go all silent on 'debug' with production binary
Syslog: don't go all silent on 'debug' with production binary
Add support for durable AMQP queues
The collectd amqp plugin allows setting messages as persistent but is hardcoded to create or use transient queues that are set to auto_delete. This commit adds support for QueueDurable and QueueAutoDelete boolean values in the config file and changes the queue creation as appropriate.
If the values are not set in the config file, QueueDurable defaults to false and QueueAutoDelete defaults to true.
Tested with RabbitMQ 3.3.1
The collectd amqp plugin allows setting messages as persistent but is hardcoded to create or use transient queues that are set to auto_delete. This commit adds support for QueueDurable and QueueAutoDelete boolean values in the config file and changes the queue creation as appropriate.
If the values are not set in the config file, QueueDurable defaults to false and QueueAutoDelete defaults to true.
Tested with RabbitMQ 3.3.1
FLUSH cmd: convert timeout (double) to cdtime_t
as the previous call to plugin_flush
as the previous call to plugin_flush
cmd PUTNOTIF time option: handle double values.
Plugin threshold: time is not set in missing notifications.
Plugin java: fix notification time conversion to cdtime_t.
Fix the conversion of time option in PUTNOTIF
from timestamp to cdtime_t
from timestamp to cdtime_t
CPU Percentage: after realloc the pointer becomes invalid; need to work on new pointer.
fixes https://gist.github.com/toni-moreno/a2f80021535f87202de7
fixes https://gist.github.com/toni-moreno/a2f80021535f87202de7
Syslog: if we can't find the loglevel specified by the configuration string default to 'info' and warn about the unknown configuration option. no way to make syslog totaly silent anymore.
Remove _num suffix from listen_disabled_num collected value
Submit listen_disabled_num in memcached.c
This is a counter which increments when the connection limit to
memcached is reached and a socket listen is disabled.
This is a counter which increments when the connection limit to
memcached is reached and a socket listen is disabled.
Fix link to memcached protocol
increased buffer size
Fix a few typos
write_http plugin: Remove custom string and boolean config handlers.
collection.cgi: Use -l 0 for df_complex graphs.
collection.cgi: Added support for df_complex types.
collection.cgi: Fixed apache data-sources.
examples/myplugin: Updated to the current plugin API.
Merge pull request #569 from manuelluis/mlsr/MSG_DONTWAIT-aix
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
Merge pull request #546 from manuelluis/mlsr/tcpconns-aix
Fix tcp state names in AIX to be like others.
Fix tcp state names in AIX to be like others.
Merge pull request #446 from bugsduggan/feature/tail_plugin_interval_per_file
Allow Interval per File block for tail plugin
Allow Interval per File block for tail plugin
thresholds: Fix calculation of hysteresis
The old code would never emit a notification when the value changed between the
WARNING and FAILURE; the reason was that each branch in the switch statement
only checked the "old" thresholds valid for the previously encountered state.
That is wrong and pretty dangerous, as there will be no notification when a
values progresses slowly from OK to WARN to FAIL.
Fixes #578.
The old code would never emit a notification when the value changed between the
WARNING and FAILURE; the reason was that each branch in the switch statement
only checked the "old" thresholds valid for the previously encountered state.
That is wrong and pretty dangerous, as there will be no notification when a
values progresses slowly from OK to WARN to FAIL.
Fixes #578.
thresholds: Log the current value of a DS value when generating an OKAY notification
Coding style: fix indents
Merge pull request #575 from amiron/riemann_notification_message
write_riemann: send notification message
write_riemann: send notification message
typo in plugin descr header
add documentation for #516
Merge pull request #516 from pyr/feature-normalized-cpu
Add ReportByCpu and ValuesPercentage for cpu plugin
Add ReportByCpu and ValuesPercentage for cpu plugin
write_riemann: send notification message to riemann via description field
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
indents
HTTP Digest support for curl plugins
memory plugin: fix submit multivalue (fill vl.type)
Make sure that "PIDFile" option cannot be set when command-line option "-P" was used. (Fixes #553)
The "PIDFile" value from command-line option "-P", which should take
precedence over any "PIDFile" value from configuration files, could be
overwritten if a configuration file contained the "PIDFile" option.
We introduced a new global variable "pidfile_from_cli" which will be set
to 1 when the command-line option "-P" was detected and the
"global_option_set" function will only set the "PIDFile" option if
"pidfile_from_cli" is 0.
The "PIDFile" value from command-line option "-P", which should take
precedence over any "PIDFile" value from configuration files, could be
overwritten if a configuration file contained the "PIDFile" option.
We introduced a new global variable "pidfile_from_cli" which will be set
to 1 when the command-line option "-P" was detected and the
"global_option_set" function will only set the "PIDFile" option if
"pidfile_from_cli" is 0.
disk: Add udev-based device renaming on Linux
On systems with large collections of allocated disk resources, the
kernel provided names can be difficult to use to logically group or
compare collected values. To grant users the ability to assign custom
instance names for disk devices, collectd can query for a specified udev
attribute. If the attribute is present, its value is subsituted for the
kernel name when submitting the data points.
On systems with large collections of allocated disk resources, the
kernel provided names can be difficult to use to logically group or
compare collected values. To grant users the ability to assign custom
instance names for disk devices, collectd can query for a specified udev
attribute. If the attribute is present, its value is subsituted for the
kernel name when submitting the data points.