thermal plugin: mark some variables as static
Fix the remainging -Wshadow issues on master
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge pull request #1597 from rubenk/turbostat-fix-prototypes
Turbostat: fix a few old-style prototypes
Turbostat: fix a few old-style prototypes
Merge pull request #1595 from rubenk/turbostat-fix-shadowing-issue
Turbostat: fix shadowing issue
Turbostat: fix shadowing issue
Merge pull request #1594 from rubenk/ceph-fix-shadowing-issue
Ceph: fix shadowing issue
Ceph: fix shadowing issue
Merge pull request #1596 from rubenk/fix-a-few-more-prototypes
Fix a few more prototypes
Fix a few more prototypes
Turbostat: fix a few old-style prototypes
Fix a few more prototypes
Found with -Wstrict-prototypes and -Wold-style-definition
Found with -Wstrict-prototypes and -Wold-style-definition
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Turbostat: fix shadowing issue
turbostat.c: In function ‘delta_thread’:
turbostat.c:460:26: error: declaration of ‘core_delta’ shadows a global
declaration [-Werror=shadow]
const struct core_data *core_delta)
^~~~~~~~~~
turbostat.c:163:4: note: shadowed declaration is here
} *core_delta, *core_even, *core_odd;
^~~~~~~~~~
turbostat.c: In function ‘delta_thread’:
turbostat.c:460:26: error: declaration of ‘core_delta’ shadows a global
declaration [-Werror=shadow]
const struct core_data *core_delta)
^~~~~~~~~~
turbostat.c:163:4: note: shadowed declaration is here
} *core_delta, *core_even, *core_odd;
^~~~~~~~~~
Ceph: fix shadowing issue
Merge pull request #1584 from rubenk/fix-wrong-logical-op
utils_avltree.c: fix compiler warning
utils_avltree.c: fix compiler warning
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge branch 'Wshadow' into collectd-5.4
Define _DEFAULT_SOURCE in addition to _BSD_SOURCE
This enables forward compatibility with the ongoing
deprecation of _BSD_SOURCE.
(cherry picked from commit 3bc1a46bebfa53ec0f0e12d6406ca126a3ad6bf3)
This enables forward compatibility with the ongoing
deprecation of _BSD_SOURCE.
(cherry picked from commit 3bc1a46bebfa53ec0f0e12d6406ca126a3ad6bf3)
Merge branch 'collectd-5.5'
Fix memory leak in redis.c
Fix a few issues found by -Wshadow
utils_avltree.c: fix compiler warning
make[3]: Entering directory '/home/ruben/src/collectd/src/daemon'
CC utils_avltree.lo
utils_avltree.c: In function ‘rebalance’:
utils_avltree.c:248:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
utils_avltree.c:258:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
make[3]: Entering directory '/home/ruben/src/collectd/src/daemon'
CC utils_avltree.lo
utils_avltree.c: In function ‘rebalance’:
utils_avltree.c:248:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
utils_avltree.c:258:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
Merge branch 'collectd-5.5'
write_sensu: define _GNU_SOURCE for asprintf
On Linux, asprintf and vasprintf are only available when _GNU_SOURCE is defined.
On Linux, asprintf and vasprintf are only available when _GNU_SOURCE is defined.
Merge branch 'collectd-5.5'
write_sensu: remove custom asprintf implementation
This was guarded by HAVE_ASPRINTF, but we never had a configure check
for asprintf (or vasprintf).
This only turned up when I made the function static, since they now
clash with the prototypes in stdio.h on FreeBSD.
As far as I know all the platforms we build on have these functions.
If this turns out to be not the case, we can always add compat functions
to our utilies later.
For now, this fixes the build on FreeBSD.
This was guarded by HAVE_ASPRINTF, but we never had a configure check
for asprintf (or vasprintf).
This only turned up when I made the function static, since they now
clash with the prototypes in stdio.h on FreeBSD.
As far as I know all the platforms we build on have these functions.
If this turns out to be not the case, we can always add compat functions
to our utilies later.
For now, this fixes the build on FreeBSD.
Merge branch 'collectd-5.5'
write_riemann: add new header to Makefile.am
Fixes 'make distcheck'
Fixes 'make distcheck'
Merge branch 'collectd-5.5'
Fix prototype of subst()
Commit e1b93f5 changed the signature of this function, but not the
prototype.
Commit e1b93f5 changed the signature of this function, but not the
prototype.
write_sensu: mark asprintf as static
Commit straigh to 5.5. This plugin didn't exist in 5.4.
Commit straigh to 5.5. This plugin didn't exist in 5.4.
write_sensu: mark vasprintf as static
Commit straight to 5.5. This plugin didn't exist in 5.4
Commit straight to 5.5. This plugin didn't exist in 5.4
write_riemann: move prototype to header file
redis: mark redis_handle_query as static
Commit straight to 5.5. This plugin didn't exist in 5.4.
Commit straight to 5.5. This plugin didn't exist in 5.4.
redis: mark redis_handle_info as static
Commit straight to 5.5. This plugin didn't exist in 5.4.
Commit straight to 5.5. This plugin didn't exist in 5.4.
barometer: mark Detect_sensor_type as static
Make function start with lowercase 'd' while we're at it.
Commit straight to 5.5.
Make function start with lowercase 'd' while we're at it.
Commit straight to 5.5.
collectd.c: mark notify_systemd as static
Commit straight to 5.5. This function didn't exist in 5.4.
Commit straight to 5.5. This function didn't exist in 5.4.
collectd.c: mark notify_upstart as static
Commit straight to 5.5. This function didn't exist in 5.4.
Commit straight to 5.5. This function didn't exist in 5.4.
sensu: mark replace_str as static
Commit straight to 5.5. This plugin doesn't exist in 5.4
Commit straight to 5.5. This plugin doesn't exist in 5.4
sensu: mark sensu_format_name2 as static
Commit straight to 5.5, this plugin doesn't exist in 5.4
Commit straight to 5.5, this plugin doesn't exist in 5.4
Fix prototype of uc_get_size
Commit straight to 5.5, this function doesn't exist in 5.4.
Commit straight to 5.5, this function doesn't exist in 5.4.
Fix prototype of plugin_log_available_writers
Commit straight to 5.5, this function doesn't exist in 5.4
Commit straight to 5.5, this function doesn't exist in 5.4
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge pull request #1582 from rubenk/missing-prototypes
Missing prototypes
Missing prototypes
xmms: mark cxmms_read as static
sensors: mark sensors_free_features as static
processes: mark ps_read_process as static
utils_db_query.c: make udb_query_free_one static
battery: mark dict_get_double as static
types_list.c: add header for prototypes
utils_subst.c: add header for prototypes
utils_random.c: add header for prototypes
utils_cmd_getval.c: add header for prototypes
utils_cmd_flush.c: add header for prototypes
threshold.c: mark ut_config as static
latency_counter_create: fix signature
utils_latency.c: mark change_bin_width as static
utils_cmd_putval.c: include header for prototypes
Include header for prototype of handle_putnotif
Add prototype for module_register
liboconfig: mark oconfig_free_all as static
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
CONTRIBUTING.md: improve wording
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge branch 'collectd-5.5'
Extend collected metrics in redis plugin
This change adds support for other interesting Redis metrics:
* expired_keys
* keyspace_hits, keyspace_misses
* total_net_input_bytes, total_net_output_bytes
It also fixes the DS type for expired_keys, which was incorrectly
expressed as gauge instead of derive.
This change adds support for other interesting Redis metrics:
* expired_keys
* keyspace_hits, keyspace_misses
* total_net_input_bytes, total_net_output_bytes
It also fixes the DS type for expired_keys, which was incorrectly
expressed as gauge instead of derive.
redis: change expired_keys type from GAUGE to DERIVE
Thanks for @falzm for pointing this out in #1483 !
Thanks for @falzm for pointing this out in #1483 !
configure.ac: fix path when testing for liboconfig/parser.c presence
processes: use long for pids on linux and solaris
Up to now, we had a mix of `int`, `long` and `pid_t` to represent the
variable part of `/proc/<PID>/status` and friends. This patch
standardizes on `long` on the Linux and Solaris platforms.
The max size of `int` is smaller than the maximum number of processes
current kernels support. `pid_t` is used to ensure portability of
functions such as `getpid()`, which aren't used in this plugin, and
apparently resolves to an `int` on Solaris.
This is a follow up to bb978c1, which triggered a format string issue on
solaris 64 bit.
Up to now, we had a mix of `int`, `long` and `pid_t` to represent the
variable part of `/proc/<PID>/status` and friends. This patch
standardizes on `long` on the Linux and Solaris platforms.
The max size of `int` is smaller than the maximum number of processes
current kernels support. `pid_t` is used to ensure portability of
functions such as `getpid()`, which aren't used in this plugin, and
apparently resolves to an `int` on Solaris.
This is a follow up to bb978c1, which triggered a format string issue on
solaris 64 bit.
Merge pull request #1550 from mfournier/processes-longpid
processes: use long for pids on linux and solaris
processes: use long for pids on linux and solaris
Move unversioned .so to -devel subpackage
Replace traffic with interface in man page
The traffic plugin was renamed a long time ago.
The traffic plugin was renamed a long time ago.
Merge pull request #1555 from falzm/extend-interface
Report packets dropped in interface plugin
Report packets dropped in interface plugin
Merge branch 'pr/1480'
Provide the configuration tests for NetBSD.
Absent guidance to the contrary, getting this applied is a
precondition for the individual plugin updates I'll subsequently
submit pull requests for.
Absent guidance to the contrary, getting this applied is a
precondition for the individual plugin updates I'll subsequently
submit pull requests for.
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge pull request #1570 from rubenk/detect-bison
configure.ac: detect bison
configure.ac: detect bison
Merge pull request #1545 from mfournier/contributing
add CONTRIBUTING.md
add CONTRIBUTING.md
Merge pull request #1567 from rubenk/fix-typo-in-config
Fix typo in collectd.conf
Fix typo in collectd.conf
Merge pull request #1506 from mfournier/apache-content-type-1170
apache: warn about possible misconfiguration
apache: warn about possible misconfiguration
Merge pull request #1561 from mfournier/modbus-set-debug
modbus: avoid enabling libmodbus's debug flag by default
modbus: avoid enabling libmodbus's debug flag by default
configure.ac: detect bison
We use some bison-specific extensions so we really need bison, not yacc.
This has bitten a few people before, so make it easier for them.
Bison is only needed when compiling from git, since we ship the generated file
in the tarball. We take this into account by checking for the generated file first.
We use some bison-specific extensions so we really need bison, not yacc.
This has bitten a few people before, so make it easier for them.
Bison is only needed when compiling from git, since we ship the generated file
in the tarball. We take this into account by checking for the generated file first.
Fix typo in collectd.conf
modbus: avoid enabling libmodbus's debug flag by default
Having this enabled makes collectd's stdout and stderr very noisy. From
now on, only activate this flag when collectd is built with
--enable-debug.
Thanks to Eric Sandeen for mentioning this problem on IRC.
Having this enabled makes collectd's stdout and stderr very noisy. From
now on, only activate this flag when collectd is built with
--enable-debug.
Thanks to Eric Sandeen for mentioning this problem on IRC.
Report packets dropped in interface plugin
Add `if_dropped` to the metrics reported by the interface plugin.
Add `if_dropped` to the metrics reported by the interface plugin.
processes: use long for pids on linux and solaris
Up to now, we had a mix of `int`, `long` and `pid_t` to represent the
variable part of `/proc/<PID>/status` and friends. This patch
standardizes on `long` on the Linux and Solaris platforms.
The max size of `int` is smaller than the maximum number of processes
current kernels support. `pid_t` is used to ensure portability of
functions such as `getpid()`, which aren't used in this plugin, and
apparently resolves to an `int` on Solaris.
This is a follow up to bb978c1, which triggered a format string issue on
solaris 64 bit.
Up to now, we had a mix of `int`, `long` and `pid_t` to represent the
variable part of `/proc/<PID>/status` and friends. This patch
standardizes on `long` on the Linux and Solaris platforms.
The max size of `int` is smaller than the maximum number of processes
current kernels support. `pid_t` is used to ensure portability of
functions such as `getpid()`, which aren't used in this plugin, and
apparently resolves to an `int` on Solaris.
This is a follow up to bb978c1, which triggered a format string issue on
solaris 64 bit.
Merge branch 'collectd-5.5'
Merge branch 'collectd-5.4' into collectd-5.5
Merge pull request #1521 from coreykosak/factor-out-common-code
Factor out some common functionality
Factor out some common functionality
Merge pull request #1540 from mfournier/write_sensu_segfault_fix
write_sensu: avoid calling strlen() on variable set to NULL
write_sensu: avoid calling strlen() on variable set to NULL
Merge pull request #1529 from jamtur01/patch-1
Fixed typo in CounterSum documentation
Fixed typo in CounterSum documentation
add CONTRIBUTING.md
Mostly a summarized version of, or pointers to, information found in the
wiki.
These guidelines are supposed to show up when users open new issues or
pull requests on github.
See https://github.com/blog/1184-contributing-guidelines
Mostly a summarized version of, or pointers to, information found in the
wiki.
These guidelines are supposed to show up when users open new issues or
pull requests on github.
See https://github.com/blog/1184-contributing-guidelines
RPM specfile: re-enable varnish plugin on EL7
... as the collectd-5.5 line now supports the varnish 4 API.
... as the collectd-5.5 line now supports the varnish 4 API.
write_sensu: avoid calling strlen() on variable set to NULL
This fixes a segfault when no `Tag` option is set.
This fixes a segfault when no `Tag` option is set.