Code

collectd.git
9 years agoREADME/AUTHORS: mention ceph plugin
Marc Fournier [Tue, 3 Mar 2015 20:54:58 +0000 (21:54 +0100)]
README/AUTHORS: mention ceph plugin

9 years agoMerge remote-tracking branch 'origin/pr/598'
Marc Fournier [Tue, 3 Mar 2015 20:36:21 +0000 (21:36 +0100)]
Merge remote-tracking branch 'origin/pr/598'

Conflicts:
src/collectd.conf.in
src/types.db

9 years agoRemove superfluous debug statements
daryder [Mon, 2 Mar 2015 14:33:01 +0000 (09:33 -0500)]
Remove superfluous debug statements

9 years agosnmp plugin: add hostname to "csnmp_instance_list_add" error message
Sergey [Tue, 24 Feb 2015 21:13:00 +0000 (22:13 +0100)]
snmp plugin: add hostname to "csnmp_instance_list_add" error message

Fixes #939

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100)]
Merge branch 'collectd-5.4'

Conflicts:
src/Makefile.am
src/write_http.c

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
src/collectd.conf.pod

9 years agoMerge pull request #890 from trenkel/master
trenkel [Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)]
Merge pull request #890 from trenkel/master

Fix compiler warnings with Python3.

9 years agoperl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS
Jim Radford [Tue, 17 Sep 2013 17:52:03 +0000 (17:52 +0000)]
perl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS

Conflicts:
src/Makefile.am

9 years agolibperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS
Jim Radford [Wed, 7 Aug 2013 20:21:08 +0000 (13:21 -0700)]
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

Without this configure fails compile its libperl test program because
-lperl comes before the test program on the compiler command line.

Conflicts:
src/Makefile.am

9 years agoMerge pull request #390 from radford/libperl-ldopts
Marc Fournier [Fri, 6 Feb 2015 15:31:26 +0000 (16:31 +0100)]
Merge pull request #390 from radford/libperl-ldopts

libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

9 years agomodbus: rename register types once more
Eric Sandeen [Wed, 28 Jan 2015 04:36:05 +0000 (22:36 -0600)]
modbus: rename register types once more

As I was looking over my config files again, ModbusRegisterType
kind of stuck out like a sore thumb.

Modbus does talk about "read holding" and "read input" as "commands";
perhaps renaming it as this patch does is more intuitive, so that all
of the Modbus register configurations start with Register.

I'm not wedded to it, but if you like it & agree, here you go.

Thanks,
-Eric

9 years agoMerge pull request #908 from vincentbernat/fix/libstatgrab4
Marc Fournier [Mon, 2 Feb 2015 10:41:48 +0000 (11:41 +0100)]
Merge pull request #908 from vincentbernat/fix/libstatgrab4

libstatgrab: fix detection of libstatgrab >= 0.90

9 years agoMerge pull request #902 from mfournier/write_http-node-blocks
Marc Fournier [Mon, 2 Feb 2015 10:25:03 +0000 (11:25 +0100)]
Merge pull request #902 from mfournier/write_http-node-blocks

write_http: deprecate <URL> blocks in favor of <Node>

9 years agoMerge pull request #899 from mfournier/write_http-multiple-destionations
Marc Fournier [Mon, 2 Feb 2015 10:24:08 +0000 (11:24 +0100)]
Merge pull request #899 from mfournier/write_http-multiple-destionations

write_http: make callback names context-dependent

9 years agoRPM specfile: doc clarification
Marc Fournier [Wed, 28 Jan 2015 14:06:28 +0000 (15:06 +0100)]
RPM specfile: doc clarification

9 years agoipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM
Vincent Bernat [Fri, 23 Jan 2015 17:55:04 +0000 (18:55 +0100)]
ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

Java uses SIGUSR2 to suspend/resume threads. The OpenIPMI plugins also
need a signal to resume its event loop when setting a timer. They can't
both use the same signal. We ask OpenIPMI to use SIGIO instead.

This should fix #114.

9 years agowrite_kafka plugin: Topic property not being set
ciomaire [Mon, 26 Jan 2015 13:02:11 +0000 (14:02 +0100)]
write_kafka plugin: Topic property not being set

9 years agoMerge pull request #910 from vincentbernat/fix/ipmi-dont-use-sigusr2
Pierre-Yves Ritschard [Mon, 26 Jan 2015 12:56:29 +0000 (13:56 +0100)]
Merge pull request #910 from vincentbernat/fix/ipmi-dont-use-sigusr2

ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

9 years agoipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM
Vincent Bernat [Fri, 23 Jan 2015 17:55:04 +0000 (18:55 +0100)]
ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

Java uses SIGUSR2 to suspend/resume threads. The OpenIPMI plugins also
need a signal to resume its event loop when setting a timer. They can't
both use the same signal. We ask OpenIPMI to use SIGIO instead.

This should fix #114.

9 years agoMerge pull request #906 from obazoud/patch-1
Marc Fournier [Fri, 23 Jan 2015 14:07:44 +0000 (15:07 +0100)]
Merge pull request #906 from obazoud/patch-1

Wording automake

9 years agoadded doc CollectStatistics to section rrdcached
Micha Krause [Fri, 23 Jan 2015 13:24:54 +0000 (14:24 +0100)]
added doc CollectStatistics to section rrdcached

Fixes #907

Conflicts:
src/collectd.conf.pod

9 years agomysql: document defaults to boolean config options
Marc Fournier [Fri, 23 Jan 2015 14:01:52 +0000 (15:01 +0100)]
mysql: document defaults to boolean config options

9 years agolibstatgrab: fix detection of libstatgrab >= 0.90
Vincent Bernat [Fri, 23 Jan 2015 10:57:03 +0000 (11:57 +0100)]
libstatgrab: fix detection of libstatgrab >= 0.90

Ensure linking is done after compilation of the test program, otherwise
symbols cannot be found. `LDFLAGS` and `CFLAGS` are placed before the
test program on gcc command line while `LIBS` is placed after. Even if
in our case, `LDFLAGS` also contain the lib, being put before the
program while the linking phase is done with the same command leads to
`sg_init()` never found which is misinterpreted as requiring an
argument.

9 years agoWording automake
Olivier Bazoud [Thu, 22 Jan 2015 15:57:35 +0000 (16:57 +0100)]
Wording automake

9 years agowrite_http: consistent multi-instance support
Marc Fournier [Tue, 20 Jan 2015 22:09:56 +0000 (23:09 +0100)]
write_http: consistent multi-instance support

This makes the plugin use `<Node>` blocks liks most other write plugins,
while maintaining backwards compatibility with `<URL>` blocks.

It's a follow up to #899, which was merely a fix for the release
branches.

9 years agowrite_http: make callback names context-dependent
Marc Fournier [Sat, 17 Jan 2015 15:10:46 +0000 (16:10 +0100)]
write_http: make callback names context-dependent

This allows multiple destinations to work again (fixes #821), using the
same logic as other write plugins.

The callback name would now be something like:
    `write_http/http://example.com/endpoint`
which is not very nice.

The next step would be to change this plugin to use `<Node>` blocks
like many others, and pass the URL as a parameter inside each instance
block. So I see this patch as the minimum required to let 5.3 and 5.4
users use this plugin with multiple destinations.

Conflicts:
src/write_http.c

9 years agowrite_http: make callback names context-dependent
Marc Fournier [Sat, 17 Jan 2015 15:10:46 +0000 (16:10 +0100)]
write_http: make callback names context-dependent

This allows multiple destinations to work again (fixes #821), using the
same logic as other write plugins.

The callback name would now be something like:
    `write_http/http://example.com/endpoint`
which is not very nice.

The next step would be to change this plugin to use `<Node>` blocks
like many others, and pass the URL as a parameter inside each instance
block. So I see this patch as the minimum required to let 5.3 and 5.4
users use this plugin with multiple destinations.

9 years agoensure all curl-based plugins follow HTTP redirects
Marc Fournier [Fri, 16 Jan 2015 22:45:26 +0000 (23:45 +0100)]
ensure all curl-based plugins follow HTTP redirects

For the sake of consistency.

9 years agoadd Modbus/RTU support to modbus plugin
Eric Sandeen [Wed, 10 Dec 2014 21:38:09 +0000 (15:38 -0600)]
add Modbus/RTU support to modbus plugin

This allows access to a local RS-485 serial port
via the modbus plugin by specifying i.e.

  Device "/dev/ttyUSB0"
  Baudrate 38400

in a <Host> block.

For now it assumes 8N1; adding another config option
to support other configurations could be done later.

Lightly tested on my local setup.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
9 years agoRPM specfile: misc improvements related to perl files
Marc Fournier [Fri, 16 Jan 2015 16:57:00 +0000 (17:57 +0100)]
RPM specfile: misc improvements related to perl files

Avoids installing some files in two different packages & locations. Also
avoid unnecessary dependencies on -perl and -contrib packages.

Supersedes #896.

Thanks to @faxm0dem for helping work things out !

9 years agowrite_riemann: defaults to use TCP and batching
Marc Fournier [Thu, 15 Jan 2015 08:06:24 +0000 (09:06 +0100)]
write_riemann: defaults to use TCP and batching

Fixes #891

9 years agoRPM specfile: install client tools to a dedicated package
Marc Fournier [Wed, 14 Jan 2015 22:40:06 +0000 (23:40 +0100)]
RPM specfile: install client tools to a dedicated package

Avoids the package containing the daemon to depend on libcollectdclient.

Fixes #879

9 years agoRPM specfile: handle new write_log plugin
Marc Fournier [Wed, 14 Jan 2015 22:30:26 +0000 (23:30 +0100)]
RPM specfile: handle new write_log plugin

9 years agoMerge remote-tracking branch 'origin/pr/835'
Marc Fournier [Wed, 14 Jan 2015 22:28:18 +0000 (23:28 +0100)]
Merge remote-tracking branch 'origin/pr/835'

9 years agoperl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS
Jim Radford [Tue, 17 Sep 2013 17:52:03 +0000 (17:52 +0000)]
perl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS

9 years agolibperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS
Jim Radford [Wed, 7 Aug 2013 20:21:08 +0000 (13:21 -0700)]
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

Without this configure fails compile its libperl test program because
-lperl comes before the test program on the compiler command line.

9 years agoMerge pull request #886 from pyr/feature/write_log
Pierre-Yves Ritschard [Wed, 14 Jan 2015 08:25:25 +0000 (09:25 +0100)]
Merge pull request #886 from pyr/feature/write_log

Add a write_log output plugin which logs values.

9 years agoDo not mention plugins with no options.
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:06:37 +0000 (11:06 +0100)]
Do not mention plugins with no options.

9 years agomention write_log in the README
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:05:52 +0000 (11:05 +0100)]
mention write_log in the README

9 years agochange license
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:03:06 +0000 (11:03 +0100)]
change license

9 years agopython: Properly init the empty string with Python3.
Sven Trenkel [Mon, 12 Jan 2015 23:22:34 +0000 (23:22 +0000)]
python: Properly init the empty string with Python3.

9 years agoFix compiler warnings with Python3.
Sven Trenkel [Fri, 9 Jan 2015 21:28:24 +0000 (21:28 +0000)]
Fix compiler warnings with Python3.
https://github.com/collectd/collectd/issues/505

9 years agoAdd a write_log output plugin which logs values.
Pierre-Yves Ritschard [Thu, 8 Jan 2015 10:06:04 +0000 (11:06 +0100)]
Add a write_log output plugin which logs values.

I find this to be useful when developping new input plugins,
it allows creating a very simple configuration and combined
with `-f` can be used for a very simple workflow.

I'm proposing this, since I think it could be useful for
people wanting to debug their config on local agents as well.

9 years agoMerge pull request #870 from ifesdjeen/bugfix/absolute-in-multivalue-dispatch
Pierre-Yves Ritschard [Thu, 8 Jan 2015 09:14:48 +0000 (10:14 +0100)]
Merge pull request #870 from ifesdjeen/bugfix/absolute-in-multivalue-dispatch

Change "plugin_dispatch_multivalue" to accept any metric type.

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100)]
Merge branch 'collectd-5.4'

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3

9 years agoFix check for htonll in configure.ac
Manuel Luis Sanmartin Rozada [Mon, 31 Mar 2014 19:08:05 +0000 (21:08 +0200)]
Fix check for htonll in configure.ac

9 years agoMove last_poll_data to inside ceph_daemon struct
daryder [Wed, 7 Jan 2015 15:14:10 +0000 (10:14 -0500)]
Move last_poll_data to inside ceph_daemon struct

Also add backup search for last poll data

9 years agoMerge pull request #847 from mihu/bind_zone_fix
Pierre-Yves Ritschard [Wed, 7 Jan 2015 10:42:04 +0000 (11:42 +0100)]
Merge pull request #847 from mihu/bind_zone_fix

bind-plugin: fix zones iteratation upper limit

9 years agotypes_list: fix carriage return sign
Marc Fournier [Wed, 31 Dec 2014 13:54:37 +0000 (14:54 +0100)]
types_list: fix carriage return sign

Many thanks to @NsLib for mentioning this !

9 years agoRPM specfile: avoid packaging some files twice
Marc Fournier [Tue, 23 Dec 2014 11:59:44 +0000 (12:59 +0100)]
RPM specfile: avoid packaging some files twice

Fixes #874

9 years agoChanges to use base types, add comments, etc.
daryder [Mon, 22 Dec 2014 16:26:52 +0000 (11:26 -0500)]
Changes to use base types, add comments, etc.

9 years agoFix formatting
daryder [Mon, 22 Dec 2014 15:56:03 +0000 (10:56 -0500)]
Fix formatting

9 years agoAdd ceph base types
daryder [Mon, 22 Dec 2014 15:55:01 +0000 (10:55 -0500)]
Add ceph base types

9 years agoRPM specfile: revert back to sysvinit on EL6
Marc Fournier [Mon, 22 Dec 2014 15:16:12 +0000 (16:16 +0100)]
RPM specfile: revert back to sysvinit on EL6

Feedback on ca84b19de about using upstart by default on EL6 was
negative. This init system is not very well integrated on this distro,
so users would get confused.

9 years agoconfigure: Fixed check for AM_PATH_LIBCCRYPT
Yoga Ramalingam [Mon, 8 Dec 2014 18:09:47 +0000 (13:09 -0500)]
configure: Fixed check for AM_PATH_LIBCCRYPT

9 years agoChange "plugin_dispatch_multivalue" to accept any metric type.
Alex Petrov [Wed, 17 Dec 2014 11:43:24 +0000 (12:43 +0100)]
Change "plugin_dispatch_multivalue" to accept any metric type.

Currently, "plugin_dispatch_multivalue" works only with
"gauge_t" metric type. This commit changes it to accept a
"store_type" (one of "DS_TYPE_{GAUGE|COUTNTER|ABSOLUTE|DERIVE}").

9 years agocollectd.confpod: mention 2 new options to tail plugin
Marc Fournier [Mon, 15 Dec 2014 16:25:34 +0000 (17:25 +0100)]
collectd.confpod: mention 2 new options to tail plugin

... which were added in #673

9 years agocollectd.conf example: mention new write_riemann options
Marc Fournier [Mon, 15 Dec 2014 15:22:08 +0000 (16:22 +0100)]
collectd.conf example: mention new write_riemann options

9 years agocollectd.conf example: remove erroneous quotes
Marc Fournier [Mon, 15 Dec 2014 15:10:41 +0000 (16:10 +0100)]
collectd.conf example: remove erroneous quotes

Thanks to @ymettier for pointing that out !

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
src/libvirt.c

9 years agovirt plugin: only gather stats for running domains
Ruben Kerkhof [Tue, 9 Dec 2014 16:06:43 +0000 (17:06 +0100)]
virt plugin: only gather stats for running domains

Conflicts:
src/libvirt.c

9 years agoMerge pull request #857 from Lupul/patch-1
Marc Fournier [Fri, 12 Dec 2014 21:23:46 +0000 (22:23 +0100)]
Merge pull request #857 from Lupul/patch-1

virt plugin: Fix memory stats to use the same units

For the record, this is the same as 7bf99b36d, which got missed out from 627a050790.

9 years agovirt plugin: Fix memory stats to use the same units
Zollner Robert [Thu, 11 Dec 2014 00:18:31 +0000 (02:18 +0200)]
virt plugin: Fix memory stats to use the same units

memory_submit and memory_stats_submit should use same units "Bytes"

- Fixes: #856

9 years agoMerge pull request #1 from mfournier/ceph
daryder [Wed, 10 Dec 2014 19:13:01 +0000 (14:13 -0500)]
Merge pull request #1 from mfournier/ceph

ceph: a couple of small details

9 years agoceph: prepend all warning & error messages with plugin name
Marc Fournier [Wed, 10 Dec 2014 15:44:33 +0000 (16:44 +0100)]
ceph: prepend all warning & error messages with plugin name

9 years agoMerge pull request #853 from vincentbernat/fix/kafka-unavailable-partitions
Pierre-Yves Ritschard [Wed, 10 Dec 2014 15:20:15 +0000 (16:20 +0100)]
Merge pull request #853 from vincentbernat/fix/kafka-unavailable-partitions

write_kafka: check for partition availability before selecting one

9 years agowrite_kafka: check for partition availability before selecting one
Vincent Bernat [Wed, 10 Dec 2014 14:41:49 +0000 (15:41 +0100)]
write_kafka: check for partition availability before selecting one

When a partition is unavailable, sending to it will just lead to a lost
metric. Therefore, after selecting the partition, check if it is
available. If not, select the next one until we tried them all.

A future iteration may use consistent hashing to avoid to double the
work done on a partition when the previous one is unavailable.

9 years agoceph: replace erroneous format string in DEBUG statement
Marc Fournier [Tue, 2 Dec 2014 11:51:10 +0000 (12:51 +0100)]
ceph: replace erroneous format string in DEBUG statement

Fixes build error on 32bit systems

9 years agoceph: correct pod formatting error in manpage
Marc Fournier [Wed, 12 Nov 2014 08:30:02 +0000 (09:30 +0100)]
ceph: correct pod formatting error in manpage

9 years agomodbus: wrap long lines + indentation/alignment
Marc Fournier [Tue, 9 Dec 2014 23:37:52 +0000 (00:37 +0100)]
modbus: wrap long lines + indentation/alignment

9 years agoadded man page section for ModbusRegisterType
Jan Vitek [Thu, 6 Jun 2013 13:20:04 +0000 (15:20 +0200)]
added man page section for ModbusRegisterType

9 years agorenamed Function to ModbusRegisterType
Jan Vitek [Thu, 6 Jun 2013 13:10:10 +0000 (15:10 +0200)]
renamed Function to ModbusRegisterType

9 years agoadded possibility to choose between holding and input registers
Jan Vitek [Fri, 31 May 2013 13:34:05 +0000 (15:34 +0200)]
added possibility to choose between holding and input registers

9 years agobind-plugin: fix zones iteratation upper limit
Michal Humpula [Tue, 9 Dec 2014 12:08:36 +0000 (13:08 +0100)]
bind-plugin: fix zones iteratation upper limit

9 years agoadd missing credits to Michael Schenck
Marc Fournier [Fri, 5 Dec 2014 21:25:20 +0000 (22:25 +0100)]
add missing credits to Michael Schenck

9 years agoupstart example config: clarify expect stanza ambiguity
Marc Fournier [Fri, 5 Dec 2014 13:01:05 +0000 (14:01 +0100)]
upstart example config: clarify expect stanza ambiguity

9 years agoredhat initscript: move restart block to a function
Marc Fournier [Fri, 5 Dec 2014 12:52:09 +0000 (13:52 +0100)]
redhat initscript: move restart block to a function

This ensures the "condrestart" option will work.

9 years agoRPM specfile: indentation + other minor adjustments
Marc Fournier [Wed, 3 Dec 2014 16:48:54 +0000 (17:48 +0100)]
RPM specfile: indentation + other minor adjustments

9 years agoAdd ability to ignore bad daemon configs
daryder [Thu, 4 Dec 2014 20:09:19 +0000 (15:09 -0500)]
Add ability to ignore bad daemon configs

9 years agonetlink: ensure size_t portability in DEBUG() statement
Marc Fournier [Wed, 3 Dec 2014 15:15:28 +0000 (16:15 +0100)]
netlink: ensure size_t portability in DEBUG() statement

This prevents the following error when building on 32bit systems with
gcc 4.7.2:

netlink.c: In function 'ir_read':
netlink.c:783:7: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t' [-Werror=format]

9 years agoMerge pull request #839 from yogeswaran/python
trenkel [Wed, 3 Dec 2014 19:59:29 +0000 (20:59 +0100)]
Merge pull request #839 from yogeswaran/python

Fix Py list length check in cpy_build_meta()

9 years agoFixed indentation and decreased reference count
Yoga Ramalingam [Wed, 3 Dec 2014 19:37:06 +0000 (14:37 -0500)]
Fixed indentation and decreased reference count

9 years agoFix Py list length check in cpy_build_meta()
Yoga Ramalingam [Wed, 3 Dec 2014 17:20:17 +0000 (12:20 -0500)]
Fix Py list length check in cpy_build_meta()

9 years agoMerge pull request #834 from mfournier/zookeeper_build_error
Marc Fournier [Wed, 3 Dec 2014 15:08:50 +0000 (16:08 +0100)]
Merge pull request #834 from mfournier/zookeeper_build_error

zookeeper: initialize a variable

9 years agoMerge pull request #827 from yogeswaran/collectdctl
Pierre-Yves Ritschard [Wed, 3 Dec 2014 15:06:13 +0000 (16:06 +0100)]
Merge pull request #827 from yogeswaran/collectdctl

collectdctl command hangs on AIX and returns error 0 on Solaris.

9 years agoRemoved extra semicolon
Yoga Ramalingam [Wed, 3 Dec 2014 13:40:18 +0000 (08:40 -0500)]
Removed extra semicolon

9 years agoRPM specfile: switch to using upstart/systemd
Marc Fournier [Mon, 1 Dec 2014 13:31:14 +0000 (14:31 +0100)]
RPM specfile: switch to using upstart/systemd

Favor using systemd when installing on EL7, and upstart on EL6. No
changes for EL5. Uses the upstart & systemd config files from
the contrib/ directory.

The sysv initscript used on EL5 is still available in the
collectd-contrib package, for those who prefer using the traditional
init system.

9 years agozookeeper: initialize a variable
Marc Fournier [Tue, 2 Dec 2014 23:10:54 +0000 (00:10 +0100)]
zookeeper: initialize a variable

If the loop on line 132 doesn't iterate at least once, the function would
return the "sk" variable uninitialized.

This fixes the following build error:

cc1: warnings being treated as errors
zookeeper.c: In function 'zookeeper_read':
zookeeper.c:107: warning: 'sk' may be used uninitialized in this function
make[3]: *** [zookeeper.lo] Error 1

(caught by gcc version 4.1.2 on EL5)

9 years agoRPM specfile: require package providing ltdl.h
Marc Fournier [Tue, 2 Dec 2014 22:42:06 +0000 (23:42 +0100)]
RPM specfile: require package providing ltdl.h

9 years agoRPM specfile: add zookeeper plugin
Marc Fournier [Tue, 2 Dec 2014 21:04:50 +0000 (22:04 +0100)]
RPM specfile: add zookeeper plugin

9 years agozookeeper: add mention in README & AUTHORS
Marc Fournier [Tue, 2 Dec 2014 21:02:50 +0000 (22:02 +0100)]
zookeeper: add mention in README & AUTHORS

9 years agoreset counter type to it's initial value
Marc Fournier [Tue, 2 Dec 2014 20:49:47 +0000 (21:49 +0100)]
reset counter type to it's initial value

It was a COUNTER, not a GAUGE before it got accidentally deleted by
6372ca6a38.

9 years agoreintroduce counter, killed by error
Pierre-Yves Ritschard [Tue, 2 Dec 2014 15:59:23 +0000 (16:59 +0100)]
reintroduce counter, killed by error

9 years agoMerge pull request #826 from katzj/zookeeper
Pierre-Yves Ritschard [Tue, 2 Dec 2014 12:26:20 +0000 (13:26 +0100)]
Merge pull request #826 from katzj/zookeeper

Add a plugin for monitoring zookeeper

9 years agocpu plugin: Mark the "active" state as available.
Florian Forster [Tue, 2 Dec 2014 10:22:13 +0000 (11:22 +0100)]
cpu plugin: Mark the "active" state as available.

This fixes the !ByState && ByCpu case, i.e. when the user requests one
metric ("active") per CPU.

Bug: #820

9 years agocpu plugin: Fix ValuesPercentage to behave as documented.
Florian Forster [Tue, 2 Dec 2014 10:09:32 +0000 (11:09 +0100)]
cpu plugin: Fix ValuesPercentage to behave as documented.

The documentation claims that ValuesPercentage is only considered when
!ByState && !ByCpu. Fix the behavior to match this documented behavior.
This makes cpu_commit_without_aggregation much easier.

Bug: #820

9 years agoWrap the content of macro with do/while to make it safer as per code review comment
Yoga Ramalingam [Mon, 1 Dec 2014 14:55:10 +0000 (09:55 -0500)]
Wrap the content of macro with do/while to make it safer as per code review comment