Vincent Brillault [Sat, 23 Aug 2014 15:16:07 +0000 (17:16 +0200)]
Turbostat: introduce 'delta' data sets
This patch replace the 'old = new - old' mecanism with a simpler
'delta = new - old' one
Vincent Brillault [Sat, 23 Aug 2014 14:32:29 +0000 (16:32 +0200)]
Turbostat: remove proc_stat global variable
Vincent Brillault [Sat, 23 Aug 2014 14:30:06 +0000 (16:30 +0200)]
Turbostat: use _Bool for boolean values
Vincent Brillault [Sat, 23 Aug 2014 13:53:12 +0000 (15:53 +0200)]
Turbostat: simplify aperf_mperf_unstable & skip_c[01]
Vincent Brillault [Sat, 23 Aug 2014 13:35:59 +0000 (15:35 +0200)]
Turbostat: Fix sched affinity mess
get_msr doesn't need to be run on the CPU targetted. However, when run
on another CPU, perfomances will decrease as task have to be scheduled
on another CPU. Migrating to another CPU during the setup (where only a
few get_msr are done) is probably not worth it. However, in the
get_counters function, the large number of get_msr query makes it
potentially important.
This patch also introduce the restoration of the scheduling affinity as
it was before the plugin invocation.
Vincent Brillault [Sat, 23 Aug 2014 09:22:38 +0000 (11:22 +0200)]
Turbodtat: tcc_activation_temp is a package concept, so store it in packages
Vincent Brillault [Sat, 23 Aug 2014 07:50:13 +0000 (09:50 +0200)]
Turbostat: use ssnprintf instead of snprintf
Vincent Brillault [Sat, 23 Aug 2014 09:15:57 +0000 (11:15 +0200)]
Turbostat: fix some WARNING/ERROR calls
Vincent Brillault [Sat, 23 Aug 2014 07:49:21 +0000 (09:49 +0200)]
Turbostat: use sizeof for the buffer sier of s*printf
Vincent Brillault [Sat, 23 Aug 2014 07:46:31 +0000 (09:46 +0200)]
Turbostat: better error handling for get/read_msr
Vincent Brillault [Sat, 23 Aug 2014 07:32:04 +0000 (09:32 +0200)]
Turbostat: Refactor migrate CPU before get_MSR
In two out of three "get_msr" calls, there is a CPU migration, which
does not seem to be used by something else (in one case, it was used by
the rdtsc call).
Move the migrate call directly into the open_msr function
Vincent Brillault [Sat, 23 Aug 2014 07:28:07 +0000 (09:28 +0200)]
Turbostat set_temperature_target: get msr from the correct cpu
Vincent Brillault [Sat, 23 Aug 2014 07:20:23 +0000 (09:20 +0200)]
Turbostat: Only open msr once in get_counters
Vincent Brillault [Sat, 23 Aug 2014 06:56:28 +0000 (08:56 +0200)]
Turbostat: use MSR_IA32_TSC instead of rdtsc
Vincent Brillault [Fri, 22 Aug 2014 23:06:30 +0000 (01:06 +0200)]
Turbostat: reorder checks: start with 'uid == 0 ?'
Vincent Brillault [Fri, 22 Aug 2014 22:58:25 +0000 (00:58 +0200)]
Turbostat: refactor cpu probing
Reorganization and rewriting of the cpu-probing code:
- Only support genuine_intel CPUs
- Remove variables that are always expected to be true
- Make supported pkg/core cstates more comprehensive
- Simplify rafl code (remove unused warning feature: intervals too long)
Vincent Brillault [Fri, 22 Aug 2014 22:53:10 +0000 (00:53 +0200)]
Turbostat: remove unused variable has_epb
Vincent Brillault [Fri, 22 Aug 2014 22:49:40 +0000 (00:49 +0200)]
Turbostat: remove has_aperf
We refuse to run if it's not true, so let's just assume it is
Vincent Brillault [Fri, 22 Aug 2014 22:46:42 +0000 (00:46 +0200)]
Turbostat: Remove has_invariant_tsc
We refuse to run if it's not true, so let's just assume it is
Vincent Brillault [Fri, 22 Aug 2014 22:42:49 +0000 (00:42 +0200)]
Turbostat: remove 'units' variable, only used once
Vincent Brillault [Fri, 22 Aug 2014 22:26:22 +0000 (00:26 +0200)]
Turbostat: remove unused show_* variables
Vincent Brillault [Fri, 22 Aug 2014 16:56:24 +0000 (18:56 +0200)]
Turbostat: Explain why _GNU_SOURCE is required
Vincent Brillault [Thu, 21 Aug 2014 16:15:01 +0000 (18:15 +0200)]
Turbostat: Don't manage 'Interval' manually, already done by collectd
Vincent Brillault [Thu, 21 Aug 2014 16:11:24 +0000 (18:11 +0200)]
Turbostat: specify parse_int_file format
Vincent Brillault [Thu, 21 Aug 2014 16:09:26 +0000 (18:09 +0200)]
Turbostat: replace sprintf with ssnprintf from common.h
Vincent Brillault [Thu, 21 Aug 2014 16:06:56 +0000 (18:06 +0200)]
Turbostat: expand __must_check macro and remove it
Vincent Brillault [Thu, 21 Aug 2014 16:05:36 +0000 (18:05 +0200)]
Turbostat: replace stdbool.h with C99 _Bool
Vincent Brillault [Thu, 21 Aug 2014 16:03:07 +0000 (18:03 +0200)]
Turbostat: Emphasize the origin of the code
Vincent Brillault [Thu, 21 Aug 2014 09:23:11 +0000 (11:23 +0200)]
Turbostat: Don't include msr-index.h, use standard header
Vincent Brillault [Mon, 23 Jun 2014 18:52:57 +0000 (20:52 +0200)]
Turbostat: Rename instance type "pc%02d" to "pkg%02d"
Nicolas Iooss [Mon, 23 Jun 2014 16:08:15 +0000 (18:08 +0200)]
Turbostat: make DO_OR_GOTO_ERR look like a function
Signed-off-by: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
[git@lerya.net: Ported from other git, changed commit name]
Signed-off-by: Vincent Brillault <git@lerya.net>
Vincent Brillault [Fri, 20 Jun 2014 08:30:09 +0000 (10:30 +0200)]
Turbostat plugin: refactor function declarations
- Remove horrible STATIC_MUST_CHECK macro
- Define __must_check __attribute__((warn_unused_result))
- Refactor function declaration: type only on first line
Vincent Brillault [Thu, 19 Jun 2014 22:06:42 +0000 (00:06 +0200)]
Include turbostat plugin during compilation
Vincent Brillault [Thu, 19 Jun 2014 21:39:05 +0000 (23:39 +0200)]
Add sources for new turbostat plugin
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
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
Marc Fournier [Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4
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
trenkel [Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)]
Merge pull request #890 from trenkel/master
Fix compiler warnings with Python3.
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
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
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
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
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
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>
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
Marc Fournier [Wed, 28 Jan 2015 14:06:28 +0000 (15:06 +0100)]
RPM specfile: doc clarification
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.
ciomaire [Mon, 26 Jan 2015 13:02:11 +0000 (14:02 +0100)]
write_kafka plugin: Topic property not being set
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
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.
Marc Fournier [Fri, 23 Jan 2015 14:07:44 +0000 (15:07 +0100)]
Merge pull request #906 from obazoud/patch-1
Wording automake
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
Marc Fournier [Fri, 23 Jan 2015 14:01:52 +0000 (15:01 +0100)]
mysql: document defaults to boolean config options
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.
Olivier Bazoud [Thu, 22 Jan 2015 15:57:35 +0000 (16:57 +0100)]
Wording automake
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.
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
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.
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.
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>
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 !
Marc Fournier [Thu, 15 Jan 2015 08:06:24 +0000 (09:06 +0100)]
write_riemann: defaults to use TCP and batching
Fixes #891
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
Marc Fournier [Wed, 14 Jan 2015 22:30:26 +0000 (23:30 +0100)]
RPM specfile: handle new write_log plugin
Marc Fournier [Wed, 14 Jan 2015 22:28:18 +0000 (23:28 +0100)]
Merge remote-tracking branch 'origin/pr/835'
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
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.
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.
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:06:37 +0000 (11:06 +0100)]
Do not mention plugins with no options.
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:05:52 +0000 (11:05 +0100)]
mention write_log in the README
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:03:06 +0000 (11:03 +0100)]
change license
Sven Trenkel [Mon, 12 Jan 2015 23:22:34 +0000 (23:22 +0000)]
python: Properly init the empty string 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
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.
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.
Marc Fournier [Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100)]
Merge branch '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
Marc Fournier [Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3
Manuel Luis Sanmartin Rozada [Mon, 31 Mar 2014 19:08:05 +0000 (21:08 +0200)]
Fix check for htonll in configure.ac
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
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 !
Marc Fournier [Tue, 23 Dec 2014 11:59:44 +0000 (12:59 +0100)]
RPM specfile: avoid packaging some files twice
Fixes #874
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.
Yoga Ramalingam [Mon, 8 Dec 2014 18:09:47 +0000 (13:09 -0500)]
configure: Fixed check for AM_PATH_LIBCCRYPT
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}").
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
Marc Fournier [Mon, 15 Dec 2014 15:22:08 +0000 (16:22 +0100)]
collectd.conf example: mention new write_riemann options
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 !
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
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
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.
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
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
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.
Marc Fournier [Tue, 9 Dec 2014 23:37:52 +0000 (00:37 +0100)]
modbus: wrap long lines + indentation/alignment
Jan Vitek [Thu, 6 Jun 2013 13:20:04 +0000 (15:20 +0200)]
added man page section for ModbusRegisterType
Jan Vitek [Thu, 6 Jun 2013 13:10:10 +0000 (15:10 +0200)]
renamed Function to ModbusRegisterType
Jan Vitek [Fri, 31 May 2013 13:34:05 +0000 (15:34 +0200)]
added possibility to choose between holding and input registers
Michal Humpula [Tue, 9 Dec 2014 12:08:36 +0000 (13:08 +0100)]
bind-plugin: fix zones iteratation upper limit