conditionally use rd_kafka_conf_set_log_cb, fixes #686
Merge pull request #685 from teftin/curl-json-per-url-interval
per-url intervals for curl_json
per-url intervals for curl_json
Merge pull request #687 from txaj/fix-doc-postgresmodule-sslmode
Fixing misplaced block in documentation.
Fixing misplaced block in documentation.
Fixing misplaced block in documentation.
Merge pull request #654 from timl/fix_ttl_order
Fix ttl order
Fix ttl order
correctly generate LOAD_PLUGIN_LOG_LOGSTASH for substitution
Merge pull request #662 from komeda-shinji/fix-config-oracle
patch required to build oracle plugin, collectd-5.4.0 (#653)
patch required to build oracle plugin, collectd-5.4.0 (#653)
per-url intervals for curl_json
Merge branch 'fix-config-oracle' of https://github.com/komeda-shinji/collectd into fix-config-oracle
mistake, SAVE_LIBS="$LIBS" is correct.
mistake
Enforce JSON as the default format on a topic
Merge pull request #684 from manuelluis/mlsr/aix-disable-multimeter
Disable plugin multimeter in AIX
Disable plugin multimeter in AIX
Merge pull request #673 from deferraz/master
Including DStypes GaugeInc and GaugeAdd for tail plugin
Including DStypes GaugeInc and GaugeAdd for tail plugin
Disable plugin multimeter in AIX
fix dstype gauge values and expands the number of possible subtypes
Merge pull request #683 from tmtom/barometer2
New barometer plugin
New barometer plugin
New barometer plugin
Merge pull request #264 from ChrisLundquist/cl/perl-openvz
Improve OpenVZ.pm
Improve OpenVZ.pm
Merge pull request #313 from tiwilliam/master
Add two new options for the MySQL plugin
Add two new options for the MySQL plugin
Onewire plugin - support full owfs path, add more device families
Conflicts:
src/onewire.c
Conflicts:
src/onewire.c
Merge remote-tracking branch 'github/pr/682'
bindings/perl/lib/Collectd/Unixsock.pm: Relicense to MIT.
Merge pull request #681 from pyr/feature/use-collectd-hostname
Bring in hostname as defined in the main configuration by default
Bring in hostname as defined in the main configuration by default
Also relicense all of Pierre-Yves Ritschard's work to the MIT license.
collectd-tg: Fix license in usage output.
{GPL, other}: Relicense to MIT license.
This change relicenses all files where the sole owner(s) are Sebastian
Harl and/or Florian Forster to the MIT license. This change happens
according to prior agreement with Sebastian.
This change relicenses all files where the sole owner(s) are Sebastian
Harl and/or Florian Forster to the MIT license. This change happens
according to prior agreement with Sebastian.
Bring in hostname as defined in the main configuration by default
supersedes collectd/collectd#530
supersedes collectd/collectd#530
Merge pull request #655 from dothebart/statsd_fix_division_by_zero
Statsd: avoid doing a division by zero when calculating the average
Statsd: avoid doing a division by zero when calculating the average
Statsd: avoid doing a division by zero when calculating the percentile with an empty histogram.
Merge pull request #416 from udoprog/master
PUTNOTIF: Add the ability to populate meta options
PUTNOTIF: Add the ability to populate meta options
Merge pull request #252 from eokerson/vpnfixes
Add support for OpenVPN 2.3.0 status files.
Add support for OpenVPN 2.3.0 status files.
Merge pull request #680 from pyr/feature/older-conntrack-files
Support older conntrack files with an option
Support older conntrack files with an option
Support older conntrack files with an option
supersedes collectd/collectd#605
supersedes collectd/collectd#605
Merge pull request #385 from ccin2p3/libvirt-plugin-instance
libvirt plugin: Add "PluginInstanceFormat" option.
libvirt plugin: Add "PluginInstanceFormat" option.
Add final documentation for new libvirt plugin option PluginInstanceFormat
Merge pull request #679 from ccin2p3/f/cpu-percent-vs-ticks
ReportByCpu and ValuesPercentage are now independant
ReportByCpu and ValuesPercentage are now independant
ReportByCpu and ValuesPercentage are now independant
ReportActive false now actually does as advertised
Change-Id: I93d9c36778253373c05b4efada5b082147656d89
ReportActive false now actually does as advertised
Change-Id: I93d9c36778253373c05b4efada5b082147656d89
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
Including DStypes GaugeInc and GaugeAdd for tail plugin
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
patch required to build oracle plugin, collectd-5.4.0 (#653)
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