Code

collectd.git
10 years agoopenldap: prefer using ldap_err2string() over sstrerror()
Marc Fournier [Wed, 20 Aug 2014 10:27:21 +0000 (12:27 +0200)]
openldap: prefer using ldap_err2string() over sstrerror()

10 years agoopenldap: add missing support for "Timeout" config option
Marc Fournier [Wed, 20 Aug 2014 10:13:31 +0000 (12:13 +0200)]
openldap: add missing support for "Timeout" config option

10 years agoopenldap: initialize LDAP library before collectd goes multi-threaded
Marc Fournier [Wed, 20 Aug 2014 08:13:14 +0000 (10:13 +0200)]
openldap: initialize LDAP library before collectd goes multi-threaded

10 years agoopenldap: terminate attrs array with NULL
Marc Fournier [Tue, 19 Aug 2014 11:54:53 +0000 (13:54 +0200)]
openldap: terminate attrs array with NULL

... as mentioned in ldap_search_ext_s(3). This fixes a segfault when
building with -O2.

10 years agoopenldap: use ldap_unbind_ext_s() to avoid memory leak
Marc Fournier [Tue, 1 Jul 2014 15:31:07 +0000 (17:31 +0200)]
openldap: use ldap_unbind_ext_s() to avoid memory leak

... as ldap_destroy() is only available in newer libldap versions.

10 years agoopenldap: revert change leading to use of uninitialised variable
Marc Fournier [Tue, 1 Jul 2014 15:29:45 +0000 (17:29 +0200)]
openldap: revert change leading to use of uninitialised variable

this was preventing build with -Wall

10 years agoopenldap: move config-handling functions after ldap_read_host()
Marc Fournier [Tue, 1 Jul 2014 12:49:30 +0000 (14:49 +0200)]
openldap: move config-handling functions after ldap_read_host()

This prevents the need for a dummy ldap_read_host() declaration.

10 years agoopenldap: coding style consistency
Marc Fournier [Tue, 1 Jul 2014 12:47:24 +0000 (14:47 +0200)]
openldap: coding style consistency

10 years agoopenldap: fix double-free error on shutdown
Marc Fournier [Tue, 1 Jul 2014 12:32:27 +0000 (14:32 +0200)]
openldap: fix double-free error on shutdown

This is already handled by ldap_unbind_ext_s() on line 739

10 years agoopenldap: prepend function names with ldap_ to avoid confusion with apache plugin
Marc Fournier [Tue, 1 Jul 2014 12:12:05 +0000 (14:12 +0200)]
openldap: prepend function names with ldap_ to avoid confusion with apache plugin

10 years agoopenldap: monitor every BDB-based database's cache
Marc Fournier [Tue, 1 Jul 2014 12:04:10 +0000 (14:04 +0200)]
openldap: monitor every BDB-based database's cache

10 years agoopenldap: add threads monitoring
Marc Fournier [Mon, 30 Jun 2014 16:03:47 +0000 (18:03 +0200)]
openldap: add threads monitoring

10 years agoopenldap: fix leak when reading from server fails
Marc Fournier [Mon, 30 Jun 2014 14:42:54 +0000 (16:42 +0200)]
openldap: fix leak when reading from server fails

10 years agoopenldap: fix typo preventing PDU stats from getting collected
Marc Fournier [Mon, 30 Jun 2014 14:40:20 +0000 (16:40 +0200)]
openldap: fix typo preventing PDU stats from getting collected

10 years agoopenldap: note starttls in the doc
Kimo Rosenbaum [Tue, 18 Jan 2011 21:46:35 +0000 (13:46 -0800)]
openldap: note starttls in the doc

10 years agonew plugin: openldap
Kimo Rosenbaum [Tue, 18 Jan 2011 21:35:23 +0000 (13:35 -0800)]
new plugin: openldap

10 years agoMerge branch 'feature/ZOL'
Marc Fournier [Fri, 22 Aug 2014 21:22:34 +0000 (23:22 +0200)]
Merge branch 'feature/ZOL'

Conflicts:
configure.ac

10 years agoMerge remote-tracking branch 'github/pr/706'
Florian Forster [Fri, 22 Aug 2014 05:23:28 +0000 (07:23 +0200)]
Merge remote-tracking branch 'github/pr/706'

Conflicts:
src/write_riemann.c

10 years agoSmall naming conventions fixes, let the user to choose its delimiter
Moshe Zada [Thu, 21 Aug 2014 12:23:27 +0000 (15:23 +0300)]
Small naming conventions fixes, let the user to choose its delimiter

10 years agos/appended/used/ according to PR 706
Moshe Zada [Thu, 21 Aug 2014 06:06:31 +0000 (09:06 +0300)]
s/appended/used/ according to PR 706

10 years agoMerge remote-tracking branch 'github/pr/711'
Florian Forster [Thu, 21 Aug 2014 05:47:03 +0000 (07:47 +0200)]
Merge remote-tracking branch 'github/pr/711'

10 years agoMerge pull request #712 from tas50/master
Marc Fournier [Wed, 20 Aug 2014 19:13:34 +0000 (21:13 +0200)]
Merge pull request #712 from tas50/master

Fix spelling and split words where appropriate in readme / authors

10 years agoFix spelling and split words where appropriate in readme / authors
Tim Smith [Wed, 20 Aug 2014 19:04:37 +0000 (12:04 -0700)]
Fix spelling and split words where appropriate in readme / authors

10 years agoStatsd: support samplerate field in timing metric types
John Leach [Mon, 18 Aug 2014 20:36:35 +0000 (21:36 +0100)]
Statsd: support samplerate field in timing metric types

Fixes "Unable to parse line" bug, often seen receiving stats from
OpenStack Swift. Should fix GH issue #461

10 years agoMerge branch 'collectd-5.4'
Florian Forster [Mon, 18 Aug 2014 07:50:34 +0000 (09:50 +0200)]
Merge branch 'collectd-5.4'

Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

10 years agoMerge branch 'collectd-4.10' into collectd-5.3
Florian Forster [Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

10 years agocurl_xml plugin: Fixed tautological pointer comparison error.
Arthur Marble [Sun, 17 Aug 2014 22:34:04 +0000 (17:34 -0500)]
curl_xml plugin: Fixed tautological pointer comparison error.

Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
10 years agorename prefix variable to eventServicePrefix
~/.gitconfig [Sun, 17 Aug 2014 14:19:55 +0000 (17:19 +0300)]
rename prefix variable to eventServicePrefix

10 years agocheck the status of cf_util_get_string
~/.gitconfig [Sun, 17 Aug 2014 14:16:34 +0000 (17:16 +0300)]
check the status of cf_util_get_string

10 years agoignore EventServicePrefix when its empty ("")
~/.gitconfig [Sun, 17 Aug 2014 08:45:19 +0000 (11:45 +0300)]
ignore EventServicePrefix when its empty ("")

10 years agoAdd documentation about the plugin in the pod file
~/.gitconfig [Sun, 17 Aug 2014 07:01:44 +0000 (10:01 +0300)]
Add documentation about the plugin in the pod file

10 years agoFix indentation, change Prefix to EventServicePrefix
~/.gitconfig [Fri, 15 Aug 2014 18:46:02 +0000 (21:46 +0300)]
Fix indentation, change Prefix to EventServicePrefix

10 years agoMerge remote-tracking branch 'github/pr/703'
Florian Forster [Thu, 14 Aug 2014 15:49:52 +0000 (17:49 +0200)]
Merge remote-tracking branch 'github/pr/703'

10 years agohandle prefix=null
~/.gitconfig [Thu, 14 Aug 2014 14:37:10 +0000 (17:37 +0300)]
handle prefix=null

10 years agorefactor prefix feature - cast directly to service_buffer
~/.gitconfig [Thu, 14 Aug 2014 13:50:24 +0000 (16:50 +0300)]
refactor prefix feature - cast directly to service_buffer

10 years ago[METRICS-383] Review fixes for octo
Kevin Bowling [Thu, 14 Aug 2014 09:21:17 +0000 (02:21 -0700)]
[METRICS-383] Review fixes for octo

10 years agoconfigure.ac: correct "if" condition altering generated example collectd.conf
Marc Fournier [Thu, 14 Aug 2014 08:27:47 +0000 (10:27 +0200)]
configure.ac: correct "if" condition altering generated example collectd.conf

10 years ago[METRICS-383] Add documentation for write_tsdb
Kevin Bowling [Wed, 13 Aug 2014 08:25:57 +0000 (01:25 -0700)]
[METRICS-383] Add documentation for write_tsdb

10 years ago[METRICS-383] Default to counters, not rates. Remove unused config code.
Kevin Bowling [Wed, 13 Aug 2014 08:21:11 +0000 (01:21 -0700)]
[METRICS-383] Default to counters, not rates. Remove unused config code.

10 years ago[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS
Kevin Bowling [Wed, 13 Aug 2014 07:16:06 +0000 (00:16 -0700)]
[METRICS-383] Add Brett Hawn and Kevin Bowling to AUTHORS

10 years agoadd the prefix feature to the src
~/.gitconfig [Wed, 13 Aug 2014 12:06:43 +0000 (15:06 +0300)]
add the prefix feature to the src

10 years ago[METRICS-390] Make sure HostTags is initialized if not configured
Kevin Bowling [Wed, 11 Jun 2014 08:44:02 +0000 (01:44 -0700)]
[METRICS-390] Make sure HostTags is initialized if not configured

10 years ago[METRICS-390] Fix string handling for TSDB prefix and tags
Kevin Bowling [Tue, 3 Jun 2014 04:11:27 +0000 (21:11 -0700)]
[METRICS-390] Fix string handling for TSDB prefix and tags

10 years ago[METRICS-390] Add tag writing from metadata using TSDB target_set patches
Kevin Bowling [Sat, 31 May 2014 02:42:14 +0000 (19:42 -0700)]
[METRICS-390] Add tag writing from metadata using TSDB target_set patches

10 years ago[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Kevin Bowling [Fri, 30 May 2014 02:58:51 +0000 (19:58 -0700)]
[METRICS-383] Add HostTags which adds tags for all metrics from this writer

10 years agoUncrustify write_tsdb
Kevin Bowling [Fri, 30 May 2014 01:15:21 +0000 (18:15 -0700)]
Uncrustify write_tsdb

10 years ago[METRICS-383] write_tsdb plugin
Kevin Bowling [Tue, 22 Apr 2014 03:53:25 +0000 (20:53 -0700)]
[METRICS-383] write_tsdb plugin

10 years agocollectd.conf(5): add detail & example about multi-instance filterchain targets
Marc Fournier [Wed, 13 Aug 2014 07:09:14 +0000 (09:09 +0200)]
collectd.conf(5): add detail & example about multi-instance filterchain targets

10 years agoMerge pull request #700 from timl/drbd_warning_fix
Marc Fournier [Tue, 12 Aug 2014 15:54:51 +0000 (17:54 +0200)]
Merge pull request #700 from timl/drbd_warning_fix

drbd plugin: Make the warning message more readable when /proc/drbd is m...

10 years agodrbd plugin: Make the warning message more readable when /proc/drbd is missing
Tim Laszlo [Tue, 12 Aug 2014 13:33:09 +0000 (08:33 -0500)]
drbd plugin: Make the warning message more readable when /proc/drbd is missing

10 years agocollectd.conf(5): fix typo
Marc Fournier [Mon, 11 Aug 2014 11:07:52 +0000 (13:07 +0200)]
collectd.conf(5): fix typo

10 years agoMerge pull request #694 from mfournier/kafka_missing_ifdef
Pierre-Yves Ritschard [Mon, 11 Aug 2014 08:54:58 +0000 (10:54 +0200)]
Merge pull request #694 from mfournier/kafka_missing_ifdef

write_kafka: avoid unused function build error

10 years agosrc/utils_tail{,_match}.[ch]: Relicense to MIT license.
Florian Forster [Mon, 11 Aug 2014 08:27:17 +0000 (10:27 +0200)]
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

10 years agoMerge branch 'ff/innodb'
Florian Forster [Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)]
Merge branch 'ff/innodb'

10 years agosnmp: free snmp_pdu struct allocated by snmp_pdu_create()
Marc Fournier [Fri, 8 Aug 2014 13:55:10 +0000 (15:55 +0200)]
snmp: free snmp_pdu struct allocated by snmp_pdu_create()

This should fix the leak reported in issue #610.

10 years agomysql plugin: Remove TODO comment, improve line wrapping.
Florian Forster [Fri, 8 Aug 2014 07:36:10 +0000 (09:36 +0200)]
mysql plugin: Remove TODO comment, improve line wrapping.

10 years agomysql plugin: Document the InnodbStats option.
Florian Forster [Wed, 6 Aug 2014 13:38:40 +0000 (15:38 +0200)]
mysql plugin: Document the InnodbStats option.

Resolves #248

10 years agolvm: change vg_read() return value to void
Marc Fournier [Fri, 8 Aug 2014 07:30:34 +0000 (09:30 +0200)]
lvm: change vg_read() return value to void

To match function prototype change from 55cd1f9a and avoid conflict with
bugfix from 25d7de9.

10 years agolvm: Do not segfault when there are no VGs
Jan Kundrát [Thu, 20 Feb 2014 01:13:20 +0000 (02:13 +0100)]
lvm: Do not segfault when there are no VGs

10 years agoMerge remote-tracking branch 'origin/pr/603'
Marc Fournier [Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)]
Merge remote-tracking branch 'origin/pr/603'

10 years agoMerge pull request #566 from timl/drbd
Marc Fournier [Thu, 7 Aug 2014 15:30:01 +0000 (17:30 +0200)]
Merge pull request #566 from timl/drbd

Collect drbd statistics on linux

10 years agoMerge pull request #540 from tokkee/configure
Marc Fournier [Thu, 7 Aug 2014 13:42:22 +0000 (15:42 +0200)]
Merge pull request #540 from tokkee/configure

configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.

10 years agoMerge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Marc Fournier [Thu, 7 Aug 2014 12:32:47 +0000 (14:32 +0200)]
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag

Fix for 'linux/inet_diag.h: No such file or directory'

10 years agoRedHat RPM spec: add modbus plugin
Marc Fournier [Wed, 6 Aug 2014 14:59:21 +0000 (16:59 +0200)]
RedHat RPM spec: add modbus plugin

...  now that EPEL6 provides libmodbus

10 years agowrite_kafka: avoid unused function build error
Marc Fournier [Wed, 6 Aug 2014 14:28:07 +0000 (16:28 +0200)]
write_kafka: avoid unused function build error

10 years agomysql plugin: adding select and sort counters
Wilson Felipe [Mon, 4 Feb 2013 19:31:11 +0000 (11:31 -0800)]
mysql plugin: adding select and sort counters

10 years agomysql plugin: adding innodb counters
Wilson Felipe [Mon, 4 Feb 2013 19:27:49 +0000 (11:27 -0800)]
mysql plugin: adding innodb counters

10 years agoRevert "lvm: Fix segfault if a VG contains no LVs"
Benjamin Gilbert [Mon, 4 Aug 2014 17:29:56 +0000 (13:29 -0400)]
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.

10 years agoFix for 'linux/inet_diag.h: No such file or directory'
Yves Mettier [Mon, 4 Aug 2014 12:01:01 +0000 (14:01 +0200)]
Fix for 'linux/inet_diag.h: No such file or directory'

10 years agofix: use DOUBLE_TO_CDTIME_T() to match input type
Marc Fournier [Mon, 4 Aug 2014 11:37:09 +0000 (13:37 +0200)]
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.

10 years agoadd write_kafka to example config
Marc Fournier [Sat, 2 Aug 2014 21:01:41 +0000 (23:01 +0200)]
add write_kafka to example config

10 years agoadd a conditional for the new dbi reentrant driver interface
Pierre-Yves Ritschard [Fri, 1 Aug 2014 09:13:27 +0000 (11:13 +0200)]
add a conditional for the new dbi reentrant driver interface

10 years agoignore tests output
Pierre-Yves Ritschard [Fri, 1 Aug 2014 09:12:39 +0000 (11:12 +0200)]
ignore tests output

10 years agoMerge pull request #312 from jazzmes/libvirt-mem-usage
Pierre-Yves Ritschard [Thu, 31 Jul 2014 21:49:35 +0000 (23:49 +0200)]
Merge pull request #312 from jazzmes/libvirt-mem-usage

Included memory usage per VM

10 years agoMerge pull request #688 from mfournier/misc-build-cleanups
Marc Fournier [Thu, 31 Jul 2014 21:39:11 +0000 (23:39 +0200)]
Merge pull request #688 from mfournier/misc-build-cleanups

Misc build cleanups

10 years agoREADME: cleanup & consistency
Marc Fournier [Thu, 31 Jul 2014 21:24:07 +0000 (23:24 +0200)]
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

10 years agoFixed memory leaks
jazzmes [Thu, 31 Jul 2014 17:08:54 +0000 (10:08 -0700)]
Fixed memory leaks

Fixed memory leaks

10 years agoenable logging for older versions of librdkafka
Pierre-Yves Ritschard [Thu, 31 Jul 2014 13:12:38 +0000 (15:12 +0200)]
enable logging for older versions of librdkafka

10 years agoconditionally use rd_kafka_conf_set_log_cb, fixes #686
Pierre-Yves Ritschard [Thu, 31 Jul 2014 07:58:06 +0000 (09:58 +0200)]
conditionally use rd_kafka_conf_set_log_cb, fixes #686

10 years agobuild system: correct warning about subdir-objects
Marc Fournier [Wed, 30 Jul 2014 21:15:23 +0000 (23:15 +0200)]
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

10 years agobuild system: correct warning about 'INCLUDES'
Marc Fournier [Wed, 30 Jul 2014 21:13:19 +0000 (23:13 +0200)]
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')

10 years agobuild: remove obsolete reference to bundled libiptc
Marc Fournier [Wed, 30 Jul 2014 21:06:03 +0000 (23:06 +0200)]
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.

10 years agoMerge pull request #685 from teftin/curl-json-per-url-interval
Pierre-Yves Ritschard [Wed, 30 Jul 2014 16:08:32 +0000 (18:08 +0200)]
Merge pull request #685 from teftin/curl-json-per-url-interval

per-url intervals for curl_json

10 years agoMerge pull request #687 from txaj/fix-doc-postgresmodule-sslmode
Pierre-Yves Ritschard [Wed, 30 Jul 2014 16:01:04 +0000 (18:01 +0200)]
Merge pull request #687 from txaj/fix-doc-postgresmodule-sslmode

Fixing misplaced block in documentation.

10 years agoFixing misplaced block in documentation.
txaj [Wed, 30 Jul 2014 14:55:58 +0000 (09:55 -0500)]
Fixing misplaced block in documentation.

10 years agoMerge pull request #654 from timl/fix_ttl_order
Pierre-Yves Ritschard [Wed, 30 Jul 2014 14:12:04 +0000 (16:12 +0200)]
Merge pull request #654 from timl/fix_ttl_order

Fix ttl order

10 years agomistake, SAVE_LIBS="$LIBS" is correct.
KOMEDA Shinji [Wed, 30 Jul 2014 08:56:07 +0000 (17:56 +0900)]
mistake, SAVE_LIBS="$LIBS" is correct.

10 years agopatch required to build oracle plugin, collectd-5.4.0 (#653)
KOMEDA Shinji [Wed, 25 Jun 2014 13:34:15 +0000 (22:34 +0900)]
patch required to build oracle plugin, collectd-5.4.0 (#653)

10 years agocorrectly generate LOAD_PLUGIN_LOG_LOGSTASH for substitution
Pierre-Yves Ritschard [Wed, 30 Jul 2014 10:17:27 +0000 (12:17 +0200)]
correctly generate LOAD_PLUGIN_LOG_LOGSTASH for substitution

10 years agoMerge pull request #662 from komeda-shinji/fix-config-oracle
Pierre-Yves Ritschard [Wed, 30 Jul 2014 10:08:05 +0000 (12:08 +0200)]
Merge pull request #662 from komeda-shinji/fix-config-oracle

patch required to build oracle plugin, collectd-5.4.0 (#653)

10 years agoper-url intervals for curl_json
Stan Sawa [Wed, 18 Sep 2013 14:24:06 +0000 (15:24 +0100)]
per-url intervals for curl_json

10 years agoMerge branch 'fix-config-oracle' of https://github.com/komeda-shinji/collectd into...
KOMEDA Shinji [Wed, 30 Jul 2014 09:09:36 +0000 (18:09 +0900)]
Merge branch 'fix-config-oracle' of https://github.com/komeda-shinji/collectd into fix-config-oracle

10 years agomistake, SAVE_LIBS="$LIBS" is correct.
KOMEDA Shinji [Wed, 30 Jul 2014 08:56:07 +0000 (17:56 +0900)]
mistake, SAVE_LIBS="$LIBS" is correct.

10 years agomistake
KOMEDA Shinji [Wed, 30 Jul 2014 08:56:07 +0000 (17:56 +0900)]
mistake

10 years agoEnforce JSON as the default format on a topic
Pierre-Yves Ritschard [Wed, 30 Jul 2014 05:20:25 +0000 (07:20 +0200)]
Enforce JSON as the default format on a topic

10 years agoMerge pull request #684 from manuelluis/mlsr/aix-disable-multimeter
Pierre-Yves Ritschard [Tue, 29 Jul 2014 20:33:27 +0000 (22:33 +0200)]
Merge pull request #684 from manuelluis/mlsr/aix-disable-multimeter

Disable plugin multimeter in AIX

10 years agoMerge pull request #673 from deferraz/master
Pierre-Yves Ritschard [Tue, 29 Jul 2014 20:05:40 +0000 (22:05 +0200)]
Merge pull request #673 from deferraz/master

Including DStypes GaugeInc and GaugeAdd for tail plugin

10 years agoDisable plugin multimeter in AIX
Manuel Luis Sanmartin Rozada [Tue, 29 Jul 2014 20:04:09 +0000 (22:04 +0200)]
Disable plugin multimeter in AIX

10 years agofix dstype gauge values and expands the number of possible subtypes
Andre Ferraz [Tue, 29 Jul 2014 19:52:50 +0000 (16:52 -0300)]
fix dstype gauge values and expands the number of possible subtypes