![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
Fix spelling and split words where appropriate in readme / authors
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
Conflicts:
contrib/redhat/collectd.spec
Merge branch 'collectd-4.10' into collectd-5.3
curl_xml plugin: Fixed tautological pointer comparison error.
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
Merge remote-tracking branch 'github/pr/703'
[METRICS-383] Review fixes for octo
configure.ac: correct "if" condition altering generated example collectd.conf
[METRICS-383] Add documentation for write_tsdb
[METRICS-383] Default to counters, not rates. Remove unused config code.
[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS
[METRICS-390] Make sure HostTags is initialized if not configured
[METRICS-390] Fix string handling for TSDB prefix and tags
[METRICS-390] Add tag writing from metadata using TSDB target_set patches
[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Uncrustify write_tsdb
[METRICS-383] write_tsdb plugin
collectd.conf(5): add detail & example about multi-instance filterchain targets
Merge pull request #700 from timl/drbd_warning_fix
drbd plugin: Make the warning message more readable when /proc/drbd is m...
drbd plugin: Make the warning message more readable when /proc/drbd is m...
drbd plugin: Make the warning message more readable when /proc/drbd is missing
collectd.conf(5): fix typo
Merge pull request #694 from mfournier/kafka_missing_ifdef
write_kafka: avoid unused function build error
write_kafka: avoid unused function build error
src/utils_tail{,_match}.[ch]: Relicense to MIT license.
Date: Sun, 10 Aug 2014 07:11:04 -0700
From: "waynec@c-ware.com" <waynec@c-ware.com>
To: Luke Heberling <luke@ivylink.net>
Subject: Re: [octo@collectd.org: Relicensing collectd]
No objection. MIT licence is good with me.
- Wayne
Date: Sun, 10 Aug 2014 07:11:04 -0700
From: "waynec@c-ware.com" <waynec@c-ware.com>
To: Luke Heberling <luke@ivylink.net>
Subject: Re: [octo@collectd.org: Relicensing collectd]
No objection. MIT licence is good with me.
- Wayne
Merge branch 'ff/innodb'
snmp: free snmp_pdu struct allocated by snmp_pdu_create()
This should fix the leak reported in issue #610.
This should fix the leak reported in issue #610.
mysql plugin: Remove TODO comment, improve line wrapping.
mysql plugin: Document the InnodbStats option.
Resolves #248
Resolves #248
lvm: change vg_read() return value to void
To match function prototype change from 55cd1f9a and avoid conflict with
bugfix from 25d7de9.
To match function prototype change from 55cd1f9a and avoid conflict with
bugfix from 25d7de9.
lvm: Do not segfault when there are no VGs
Merge remote-tracking branch 'origin/pr/603'
Merge pull request #566 from timl/drbd
Collect drbd statistics on linux
Collect drbd statistics on linux
Merge pull request #540 from tokkee/configure
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Fix for 'linux/inet_diag.h: No such file or directory'
Fix for 'linux/inet_diag.h: No such file or directory'
RedHat RPM spec: add modbus plugin
... now that EPEL6 provides libmodbus
... now that EPEL6 provides libmodbus
write_kafka: avoid unused function build error
mysql plugin: adding select and sort counters
mysql plugin: adding innodb counters
Revert "lvm: Fix segfault if a VG contains no LVs"
Avoid merge conflict with 25d7de9 in 5.4 branch, per #603.
This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.
Avoid merge conflict with 25d7de9 in 5.4 branch, per #603.
This reverts commit 45805cf888cda0e840d774f1d42cd21525a722ea.
Fix for 'linux/inet_diag.h: No such file or directory'
fix: use DOUBLE_TO_CDTIME_T() to match input type
... as strtod() returns a double not a time_t.
Follow-up to 7d1d59fb to match what ada80db25 does (currently in
master) and avoid a merge conflict.
... as strtod() returns a double not a time_t.
Follow-up to 7d1d59fb to match what ada80db25 does (currently in
master) and avoid a merge conflict.
add write_kafka to example config
add a conditional for the new dbi reentrant driver interface
ignore tests output
Merge pull request #312 from jazzmes/libvirt-mem-usage
Included memory usage per VM
Included memory usage per VM
Merge pull request #688 from mfournier/misc-build-cleanups
Misc build cleanups
Misc build cleanups
README: cleanup & consistency
* add 2 plugins missing from plugin list
* add 2 libraries missing from prerequisites section
* remove reference to bundled libiptc
* add a few missing references to plugins in the prerequisites section
* consistent quoting of plugin names
* wrap lines at column 80
* add 2 plugins missing from plugin list
* add 2 libraries missing from prerequisites section
* remove reference to bundled libiptc
* add a few missing references to plugins in the prerequisites section
* consistent quoting of plugin names
* wrap lines at column 80
Fixed memory leaks
Fixed memory leaks
Fixed memory leaks
enable logging for older versions of librdkafka
conditionally use rd_kafka_conf_set_log_cb, fixes #686
build system: correct warning about subdir-objects
This suppresses this category of warnings when running build.sh:
src/Makefile.am:NNN: warning: source file 'XXX' is in a subdirectory,
src/Makefile.am:NNN: but option 'subdir-objects' is disabled
This suppresses this category of warnings when running build.sh:
src/Makefile.am:NNN: warning: source file 'XXX' is in a subdirectory,
src/Makefile.am:NNN: but option 'subdir-objects' is disabled
build system: correct warning about 'INCLUDES'
This suppresses this warning when running build.sh:
Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
This suppresses this warning when running build.sh:
Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
build: remove obsolete reference to bundled libiptc
Libiptc was removed 3 years ago in 99364c70, so this option to
./configure isn't of any use anymore.
Libiptc was removed 3 years ago in 99364c70, so this option to
./configure isn't of any use anymore.
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
mistake, SAVE_LIBS="$LIBS" is correct.
patch required to build oracle plugin, collectd-5.4.0 (#653)
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
drbd plugin: Relicense to MIT license
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.
drbd plugin: expand comments
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 #579 from mfournier/libiptc-ldflags
link iptables plugin against flags from pkg-config
link iptables plugin against flags from pkg-config
drbd plugin: replace atoi with strtol
Merge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4
Revert "write_tsdb plugin"
Revert "write_tsdb plugin"