Florian Forster [Sat, 25 May 2013 08:31:54 +0000 (10:31 +0200)]
src/plugin.c: Move the perl and python "global" magic to plugin_load().
The config file handling is really not the best place to have this. Also,
the feature I'm working on would have to copy this magic if left in the
config code, and I *really* don't want that.
Florian Forster [Sat, 25 May 2013 07:58:46 +0000 (09:58 +0200)]
collectd.conf(5): Document the new "LoadPlugin" behavior.
Github: #333
Florian Forster [Sat, 25 May 2013 07:46:36 +0000 (09:46 +0200)]
src/plugin.c: Make plugin_load() idempotent, i.e. don't load plugins twice.
Previously, multiple 'LoadPlugin "foo"' lines would dlopen the same .so file
twice and call its module_register function twice. This would eventually result
in complaints about callbacks with the same name being registered. With this
patch each plugin is only loaded only once, allowing people to write "self
contained" configuration segments.
Thanks to Tim Bunce for suggesting this!
Github: #333
Florian Forster [Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)]
Merge branch 'ef/mic'
Florian Forster [Fri, 17 May 2013 14:45:30 +0000 (16:45 +0200)]
README: Document power consumption being collected by the mic plugin.
Florian Forster [Fri, 17 May 2013 14:44:02 +0000 (16:44 +0200)]
mic plugin: Fix indentation issue.
Florian Forster [Fri, 17 May 2013 14:26:23 +0000 (16:26 +0200)]
mic plugin: Change the name of the power settings …
… to reflec the names documented in the manpage.
Evan Felix [Thu, 16 May 2013 15:51:12 +0000 (08:51 -0700)]
Drop suffixes, now that we are putting them in correct types
Evan Felix [Thu, 16 May 2013 00:14:54 +0000 (17:14 -0700)]
Do proper storage of power numbers, do conversion to base units.
Evan Felix [Tue, 14 May 2013 22:13:04 +0000 (15:13 -0700)]
Add Documentaion for Power collection in the mic plugin
Evan Felix [Tue, 14 May 2013 18:07:46 +0000 (11:07 -0700)]
mic plugin: Code for power readings.
Florian Forster [Sun, 12 May 2013 10:21:07 +0000 (12:21 +0200)]
curl_xml plugin: Allow arbitrarily long callback names.
Fixes issue #286.
Florian Forster [Sun, 12 May 2013 10:17:47 +0000 (12:17 +0200)]
src/common.[ch]: Add the ssnprintf_alloc() function.
Florian Forster [Sun, 12 May 2013 09:53:52 +0000 (11:53 +0200)]
src/plugin.c: Allocate read-callback names on the heap.
This allows to use arbitrarily long callback names.
Prerequisite for fixing #286.
Florian Forster [Sat, 11 May 2013 08:59:02 +0000 (10:59 +0200)]
collectd.conf(5): Add documentation for the MIC plugin.
Florian Forster [Sat, 11 May 2013 08:11:24 +0000 (10:11 +0200)]
configure.in: Remove the unused "plugin_mic" variable.
Florian Forster [Sat, 11 May 2013 07:55:09 +0000 (09:55 +0200)]
mic plugin: Use the "core number" as plugin instance.
Previously, per-core CPU statistics would be dispatched as (e.g.):
<host>/mic-0/cpu-1-user
This makes graping hard, because it required to parse the type instance to
seperate out different graphs. The core number has therefore been moved to the
plugin instance, so the "mic" plugin behaves more like the "cpu" plugin, e.g.:
<host>/mic-0-cpu-1/cpu-user
Florian Forster [Sat, 11 May 2013 07:50:27 +0000 (09:50 +0200)]
mic plugin: Some more coding style changes. Mostly breaking long lines.
Florian Forster [Sat, 11 May 2013 07:40:05 +0000 (09:40 +0200)]
mic plugin: Remove the NUM_THERMS define.
Also some coding style changes: Limit line length, move temporary variables
to an innter scope, print the temperature name in an error message (rather
than its ID).
Florian Forster [Sat, 11 May 2013 07:31:50 +0000 (09:31 +0200)]
AUTHORS, README: Add Evan and the mic plugin.
Evan Felix [Fri, 10 May 2013 18:01:37 +0000 (11:01 -0700)]
cleanup mic number initializing. Prefix Debug and error messages
Evan Felix [Thu, 9 May 2013 23:24:33 +0000 (16:24 -0700)]
Use proper values out of memory utilization
Evan Felix [Thu, 9 May 2013 22:00:36 +0000 (15:00 -0700)]
Fix input parameter
Evan Felix [Thu, 9 May 2013 21:30:19 +0000 (14:30 -0700)]
Cleanup errors from upstream review, cleanup typeographical errors.
David Brown [Mon, 6 May 2013 23:02:19 +0000 (16:02 -0700)]
here's some bits to fix CFLAGS to CPPFLAGS
Evan Felix [Fri, 26 Apr 2013 23:02:47 +0000 (16:02 -0700)]
rework dependencies for mic plugin
Evan Felix [Mon, 22 Apr 2013 23:44:33 +0000 (16:44 -0700)]
fix copy framework error
Florian Forster [Fri, 10 May 2013 07:05:03 +0000 (09:05 +0200)]
AUTHORS, README: Add the "cgroups" plugin.
Florian Forster [Fri, 10 May 2013 07:04:27 +0000 (09:04 +0200)]
cgroups plugin: Rename the "cgroups_cpuacct" plugin.
The new name is sufficient and much easier to type / remember.
Florian Forster [Fri, 26 Apr 2013 14:25:37 +0000 (16:25 +0200)]
collectd.conf(5): Fixed a typo (comma vs. dot) and markup fixes.
Florian Forster [Fri, 26 Apr 2013 14:22:56 +0000 (16:22 +0200)]
src/types.db: Remove the unused "cpuacct" type.
Florian Forster [Fri, 26 Apr 2013 14:14:24 +0000 (16:14 +0200)]
cgroups_cpuacct plugin: Read file line-by-line.
Use the field name from the file as type instance when dispatching values.
Evan Felix [Mon, 22 Apr 2013 15:04:50 +0000 (08:04 -0700)]
Add config options
Evan Felix [Fri, 19 Apr 2013 01:04:56 +0000 (18:04 -0700)]
add cpu stat gathering
Evan Felix [Thu, 18 Apr 2013 23:46:05 +0000 (16:46 -0700)]
Add Thermal gathering, and the config properly
Evan Felix [Thu, 18 Apr 2013 20:28:04 +0000 (13:28 -0700)]
Initial implementation of build addition, and memory gathering for the mic card
Florian Forster [Thu, 18 Apr 2013 10:12:40 +0000 (12:12 +0200)]
cgroups_cpuacct plugin: Re-indent read_cpuacct_root().
The rest of the file is indented using tabs.
Florian Forster [Thu, 18 Apr 2013 10:10:37 +0000 (12:10 +0200)]
cgroups_cpuacct plugin: Use type "cpu" to submit value lists.
Florian Forster [Thu, 18 Apr 2013 10:05:12 +0000 (12:05 +0200)]
cgroups_cpuacct plugin: Minor style fixes.
* Avoid mixed declarations.
* Use parse_value() rather than atoll().
* Comment static arguments to walk_directory().
* Return an error if the read() function can't locate the cgroup
mount point.
Florian Forster [Thu, 18 Apr 2013 09:29:04 +0000 (11:29 +0200)]
src/common.[ch]: read_file_contents: Use {s,}size_t rather than int.
Michael Stapelberg [Fri, 16 Dec 2011 20:10:05 +0000 (20:10 +0000)]
Add cgroups_cpuacct plugin to collect CPU user/system time per cgroup
This is handy for computers using systemd, as systemd puts each service
into a separate cgroup.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 17 Apr 2013 05:56:08 +0000 (07:56 +0200)]
Merge branch 'cm/lvm'
Github: #291
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 17 Apr 2013 05:55:25 +0000 (07:55 +0200)]
AUTHORS, README: Add Chad and the LVM plugin.
Chad Malfait [Sat, 13 Apr 2013 19:34:38 +0000 (13:34 -0600)]
Changed plugin from volume to lvm
Signed-off-by: Florian Forster <octo@collectd.org>
Chad Malfait [Sat, 13 Apr 2013 17:30:55 +0000 (11:30 -0600)]
Removed un-needed files
Signed-off-by: Florian Forster <octo@collectd.org>
Laurent [Sun, 14 Apr 2013 10:23:32 +0000 (12:23 +0200)]
amqp: add Graphite{SeparateInstances,AlwaysAppendDS} options
Florian Forster [Sat, 13 Apr 2013 06:25:15 +0000 (08:25 +0200)]
volume plugin: Fix a couple of issues from the code review.
* Use df_complex as data type.
* Submit LV sizes and "free", but not "total" and "used".
* Fix error handling; don't use variable if it is NULL, remove calls to
exit().
Florian Forster [Thu, 11 Apr 2013 15:09:11 +0000 (08:09 -0700)]
snmp plugin: Removed "mixed delaration".
This should fix this warning Fabien Wernli reported:
snmp.c:1381: warning: ISO C90 forbids mixed declarations and code
Chad Malfait [Thu, 11 Apr 2013 05:48:38 +0000 (23:48 -0600)]
Changed data type from vg to vol_group and lv to logical_vol to be more descriptive
Chad Malfait [Thu, 11 Apr 2013 05:15:56 +0000 (23:15 -0600)]
changed symbol check for lvm2app
Chad Malfait [Thu, 11 Apr 2013 02:36:06 +0000 (20:36 -0600)]
added missing comma to AC_CHECK_LIB for lvm2app
Chad Malfait [Thu, 11 Apr 2013 01:57:07 +0000 (19:57 -0600)]
Added logical volume size metrics
Florian Forster [Wed, 10 Apr 2013 15:38:48 +0000 (17:38 +0200)]
src/Makefile.am: Really don't distribute *.pb-c.[ch].
Florian Forster [Wed, 10 Apr 2013 14:54:27 +0000 (16:54 +0200)]
src/Makefile.am: Add *.proto to EXTRA_DIST. D'oh!
Florian Forster [Wed, 10 Apr 2013 14:46:14 +0000 (16:46 +0200)]
Build system: Don't ship the generated *.pb-c.[ch] files.
They depend on specific versions of the protobuf-c.h header file, so
shipping this will cause problems for people having a different version
of protoc-c installed. This reverts some of the work done in #269, but
distcheck should still work. Meh.
Marc Fournier [Wed, 10 Apr 2013 12:39:13 +0000 (14:39 +0200)]
RedHat RPM spec: updated for 5.3.0
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Wed, 10 Apr 2013 02:33:23 +0000 (04:33 +0200)]
configure.in: Fix libgcrypt flags on FreeBSD.
On FreeBSD, AM_PATH_LIBGCRYPT sets LIBGCRYPT_CFLAGS but not
LIBGCRYPT_CPPFLAGS. Use both variables to be on the save side.
Florian Forster [Wed, 10 Apr 2013 02:08:59 +0000 (19:08 -0700)]
Bump version to 5.3.0; Update ChangeLog.
Florian Forster [Wed, 10 Apr 2013 01:44:29 +0000 (18:44 -0700)]
Merge branch 'collectd-5.2'
Florian Forster [Tue, 9 Apr 2013 00:59:28 +0000 (17:59 -0700)]
Bump version to 5.2.2; Update ChangeLog.
Florian Forster [Tue, 9 Apr 2013 00:55:06 +0000 (17:55 -0700)]
Merge branch 'collectd-5.1' into collectd-5.2
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Tue, 9 Apr 2013 00:54:19 +0000 (17:54 -0700)]
Bump version to 5.1.3; Update ChangeLog.
Florian Forster [Tue, 9 Apr 2013 00:44:55 +0000 (17:44 -0700)]
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.1
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Sun, 7 Apr 2013 18:45:10 +0000 (20:45 +0200)]
Bump version to 4.10.9; Update ChangeLog.
Florian Forster [Sun, 7 Apr 2013 17:26:13 +0000 (19:26 +0200)]
netapp plugin: Fix the interval used by the SnapVault and quota metrics.
Additional fix for Github issue #288.
Florian Forster [Sun, 7 Apr 2013 17:23:40 +0000 (19:23 +0200)]
Merge branch 'collectd-5.2'
Florian Forster [Sun, 7 Apr 2013 17:23:27 +0000 (19:23 +0200)]
Merge branch 'collectd-5.1' into collectd-5.2
Florian Forster [Sun, 7 Apr 2013 17:20:14 +0000 (19:20 +0200)]
Merge branch 'jk/snmp' into collectd-5.1
Florian Forster [Sun, 7 Apr 2013 15:45:47 +0000 (17:45 +0200)]
write_riemann plugin: Reorder the functions to get rid or prototypes.
Florian Forster [Sun, 7 Apr 2013 05:10:20 +0000 (07:10 +0200)]
write_riemann plugin: Use the "Attributes" of an Event rather than abuse the "Tags".
Riemann 0.2.0 provides "Attributes", which are key-value pairs. Since
the plugin previously basically abused the tag system for adding this
kind of data, switch to the new and shiny thing :)
Florian Forster [Sun, 7 Apr 2013 05:08:47 +0000 (07:08 +0200)]
src/riemann.proto: Import the protocol buffer for Riemann 0.2.0.
Florian Forster [Sun, 7 Apr 2013 04:21:42 +0000 (06:21 +0200)]
Merge remote-tracking branch 'github-octo/ff/netapp' into collectd-5.1
Florian Forster [Sun, 7 Apr 2013 04:17:49 +0000 (06:17 +0200)]
Merge branch 'collectd-5.2'
Florian Forster [Sun, 7 Apr 2013 03:54:24 +0000 (05:54 +0200)]
Merge branch 'collectd-5.1' into collectd-5.2
Conflicts:
configure.in
Florian Forster [Sun, 7 Apr 2013 03:44:38 +0000 (05:44 +0200)]
Merge branch 'collectd-4.10' into collectd-5.1
Conflicts:
configure.in
src/mysql.c
src/network.c
src/thermal.c
Chad Malfait [Sun, 7 Apr 2013 02:45:39 +0000 (20:45 -0600)]
Corrected typo
Chad Malfait [Sun, 7 Apr 2013 02:34:09 +0000 (20:34 -0600)]
Returning lvm_errno on error
Chad Malfait [Sun, 7 Apr 2013 01:32:27 +0000 (19:32 -0600)]
added the use of df_complex and changed fprintf to ERROR for error
messages. Also changed variable names to follow recommended standard
from the website.
Chad Malfait [Sun, 7 Apr 2013 00:54:11 +0000 (18:54 -0600)]
changed LIBADD to reference variable BUILD_WTH_LIBLVM2APP_LIBS
Chad Malfait [Sat, 6 Apr 2013 20:44:51 +0000 (14:44 -0600)]
Set default size from GB to bytes.
Florian Forster [Sat, 6 Apr 2013 19:29:07 +0000 (12:29 -0700)]
.gitignore: Add src/*.pb-c.[ch]
Florian Forster [Sat, 6 Apr 2013 19:26:50 +0000 (12:26 -0700)]
configure.in: Fix dependency of the pinba and write_riemann plugins.
Since the generated *.pb-c.[ch] files are now included in the
distribution, they only depend on the <google/protobuf-c/protobuf-c.h>
header file, not the protobuf compiler.
Florian Forster [Sat, 6 Apr 2013 19:25:26 +0000 (12:25 -0700)]
src/Makefile.am: Move *.pb-c.[ch] to MAINTAINERCLEANFILES.
Only generate build rules for these files if protoc-c is available and
use the provided files from the distribution if it is not.
Yves Mettier [Sat, 6 Apr 2013 18:14:27 +0000 (11:14 -0700)]
src/Makefile.am: Include .c and .h files generated from Protocol Buffers in the distribution.
Fixes Github issue #269.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Tue, 20 Nov 2012 13:56:45 +0000 (14:56 +0100)]
bindings/Makefile: Hint the user at --with-perl-bindings.
… in case 'perl Makefile.PL' fails.
Fixes Github issue #290.
Signed-off-by: Florian Forster <octo@collectd.org>
Sebastian Harl [Tue, 20 Nov 2012 13:44:43 +0000 (14:44 +0100)]
build system (Perl bindings): Make Makefile.PL's PREFIX/INSTALL_BASE optional.
Both options may cause problems:
- PREFIX might clash with INSTALL_BASE being set in $PERL_MM_OPT.
- INSTALL_BASE without any further options set will install into non-standard
directories in many cases.
Rather, use PREFIX=${prefix} as default but overwrite that if
--with-perl-bindings=... has been used.
Thanks to faxm0dem for reporting the INSTALL_BASE problems on IRC and
bvarner and nirik for reporting this in GH #177 and #196.
This is a follow-up / fix for
97e8f346a88eccf4d1608c21d5cc6ee9620c1c41.
Fixes Github issue #290.
Signed-off-by: Florian Forster <octo@collectd.org>
Chad Malfait [Sat, 6 Apr 2013 16:53:32 +0000 (10:53 -0600)]
removed unused var plugin_volume
Florian Forster [Sat, 6 Apr 2013 16:23:16 +0000 (18:23 +0200)]
network plugin: Make sure gcrypt is initialized before using any of its functions.
@marekbecka found that sockent_open() is called during the configuration
phase, but gcrypt is initialized later, during the initialization phase.
This patch will initialize gcrypt in sockent_open() if any sockets with
security are configured.
Fixes Github issue #273.
Chad Malfait [Sat, 6 Apr 2013 04:56:29 +0000 (22:56 -0600)]
Added configuration for autotools
Chad Malfait [Sat, 6 Apr 2013 04:50:30 +0000 (22:50 -0600)]
initial commit of volume.c
Dave Cottlehuber [Thu, 7 Feb 2013 00:38:07 +0000 (01:38 +0100)]
Don't clobber TMPDIR during Java detection
- Java detection used TMPDIR as var to parse command output
- TMPDIR is used in libltdl later on in ./configure
- alternative fix is local var or subshell
- fixes issue introduced via #
33163ee
Conflicts:
configure.in
Signed-off-by: Florian Forster <octo@collectd.org>
Manuel CISSÉ [Fri, 15 Feb 2013 10:03:00 +0000 (11:03 +0100)]
notify_email: Add charset in Content-Type header (seems required by some picky spam filters)
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 5 Apr 2013 05:31:35 +0000 (07:31 +0200)]
configure.in: Check for protobuf-c.h.
Thanks to Yves Mettier pointing this out in #269 and for providing an
initial patch.
Florian Forster [Fri, 5 Apr 2013 00:32:36 +0000 (17:32 -0700)]
netapp plugin: Fix intervals used when dispatching values.
It used to use the interval of the <Host /> block when in fact it should
have used the interval of the data blocks.
Fixes Github issue #288.
Florian Forster [Wed, 3 Apr 2013 02:20:17 +0000 (19:20 -0700)]
snmp plugin: Fix compilation issue.
Thanks to Magnus for pointing this out.
Florian Forster [Mon, 1 Apr 2013 14:54:45 +0000 (16:54 +0200)]
nfs plugin: Copy the name before calling the non-const lookup function.
Fixes Github issue #70. Thanks to Jeff for reporting this issue.
Florian Forster [Mon, 1 Apr 2013 14:38:08 +0000 (16:38 +0200)]
rrdcached plugin: Connect to the daemon in the read() callback.
Fixes Github issue #275. Thanks to Yves Mettier for reporting this bug!
Florian Forster [Fri, 29 Mar 2013 20:30:21 +0000 (13:30 -0700)]
Merge branch 'collectd-5.1' into collectd-5.2
gkos [Wed, 13 Mar 2013 16:19:04 +0000 (13:19 -0300)]
src/libcollectdclient/network_buffer.c check for htonll exitence
before defining it. I have to to this to get it compiled on AIX6
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 29 Mar 2013 19:50:23 +0000 (12:50 -0700)]
snmp plugin: Allocate "oid_list" on the stack.