notify_email plugin: Serialize all accesses to libesmtp using a mutex.
collection3: fix multiple hosts selection issue
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
nginx plugin: Make the cURL callback code easier to understand.
lpar plugin: Fix error handling of the "perfstat_partition_total" function.
According to the documentation the function returns -1 on error. The
code now assumes anything but one (the number of structures filled) as
error.
According to the documentation the function returns -1 on error. The
code now assumes anything but one (the number of structures filled) as
error.
lpar plugin: Document why comsumed ticks may be larger than entitled ticks.
lpar plugin: Refactor reading of "shared partitions".
Especially calculating the ticks unavailable to the partition has been
improved. The "pool statistics" may need some further work.
The code has been written without an AIX machine at hand, so it's
absolutely untested and may not even compile. Sorry.
Especially calculating the ticks unavailable to the partition has been
improved. The "pool statistics" may need some further work.
The code has been written without an AIX machine at hand, so it's
absolutely untested and may not even compile. Sorry.
lpar plugin: Use booleans for the config options.
lpar plugin: new attempt
Hello Florian,
here is a new version of my lpar plugin. I tried to address the
shortcomings of the previous attempt:
- Minimum and maximum proc capacity are gone, being static values
- The plugin now uses the cpu type for every value, so there is no need
anymore for the lpar_cpu type
- This also means there is no need anymore to compute rates in the
plugin, so the code is IMHO much more elegant
- There is a config option "ReportBySerial", as described in my previous
email
- We now use pool_busy_time directly instead of computing it from total
and idle
The patch is against the current 4.10 branch, rather than against
ar/lpar, because it is more of a complete rewrite than just fixes. I
could provide a patch against ar/lpar however if you prefer so.
Regards,
Aurélien Reynaud
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Hello Florian,
here is a new version of my lpar plugin. I tried to address the
shortcomings of the previous attempt:
- Minimum and maximum proc capacity are gone, being static values
- The plugin now uses the cpu type for every value, so there is no need
anymore for the lpar_cpu type
- This also means there is no need anymore to compute rates in the
plugin, so the code is IMHO much more elegant
- There is a config option "ReportBySerial", as described in my previous
- We now use pool_busy_time directly instead of computing it from total
and idle
The patch is against the current 4.10 branch, rather than against
ar/lpar, because it is more of a complete rewrite than just fixes. I
could provide a patch against ar/lpar however if you prefer so.
Regards,
Aurélien Reynaud
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
lpar plugin: Use the "cpu" type for the general CPU statistics.
New plugin - lpar
Hello,
here is a patch against 4.10 adding a new plugin "lpar".
LPAR stands for Logical PARtitions, which is the virtualization solution
for IBM high-end power systems running AIX.
The standard cpu plugin shows cpu usage as a percentage of each cpu
available to the system, but in an LPAR the number of cpus and their
apparent power can vary according to the load of every LPAR sharing the
same hardware and to the policy set by the admin.
This new plugin allows to monitor real (physical) CPU usage of the
virtualized system, as well as some other metrics specific to IBM's
partitioning solution.
Regards,
Aurélien Reynaud
--
Love is like PI - natural, irrational, endless, and very important.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Hello,
here is a patch against 4.10 adding a new plugin "lpar".
LPAR stands for Logical PARtitions, which is the virtualization solution
for IBM high-end power systems running AIX.
The standard cpu plugin shows cpu usage as a percentage of each cpu
available to the system, but in an LPAR the number of cpus and their
apparent power can vary according to the load of every LPAR sharing the
same hardware and to the policy set by the admin.
This new plugin allows to monitor real (physical) CPU usage of the
virtualized system, as well as some other metrics specific to IBM's
partitioning solution.
Regards,
Aurélien Reynaud
--
Love is like PI - natural, irrational, endless, and very important.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
network plugin: Use the complain mechanism to inform the user about ignored signatures.
perl plugin: Remove the deprecated "plugin_flush_{all,one}" functions.
perl plugin: Remove deprecated compatibility code from "Collectd_plugin_dispatch_values".
src/types.db: Remove the "mysql_qcache" and "mysql_threads" types.
Use the "v5upgrade" taret to preserve compatibility.
Use the "v5upgrade" taret to preserve compatibility.
add support for sysctlbyname: vm.stats.sys.v_swtch
src/utils_tail: Remove newline characters at the end of a line.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
utils_match: Let '^' and '$' affect lines rather than the full string.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Thanks to Renaud Chaput for pointing this out!
Thanks to Renaud Chaput for pointing this out!
Merge branch 'collectd-4.10'
Merge branch 'collectd-4.9' into collectd-4.10
src/utils_heap.c: Fix calculation of the parent's index.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
collectd-nagios: Remove forgotten commend.
collectd-nagios: Remove unnecessary includes.
The UNIX socket is now handled in the library, no need for including
those files anymore.
The UNIX socket is now handled in the library, no need for including
those files anymore.
collectdctl: Reorder includes and set strict C99/POSIX mode.
This enables NAN on some systems, e.g. old Linux boxes.
This enables NAN on some systems, e.g. old Linux boxes.
collectdctl: Fix comparison with uninitialized variable.
collectdctl: Fix problems with strict aliasing.
Merge branch 'collectd-4.10'
Merge branch 'collectd-4.9' into collectd-4.10
src/plugin.c: Improve an info message.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
Merge branch 'ad/redis'
Merge branch 'ff/redis' into ad/redis
write_redis plugin: Add all identifiers to a "set".
This should make it easy for front-ends to discover available metrics.
This should make it easy for front-ends to discover available metrics.
write_redis plugin: Use an "append" macro to fill the values buffer.
This way we don't have to copy the entire buffer, which is hopefully
faster.
This way we don't have to copy the entire buffer, which is hopefully
faster.
write_redis plugin: Fix copyright information.
redis plugin: Add default configuration.
redis plugin: Improve the types used for storing information.
redis plugin: Use a linked list rather than an AVL tree.
Since the main purpose of the data structure is to iterate over it, using
an AVL tree here is less efficient than a linked list. Also, it's easier
to read.
Since the main purpose of the data structure is to iterate over it, using
an AVL tree here is less efficient than a linked list. Also, it's easier
to read.
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.
src/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
src/configfile.c: Continue parsing config files if stat'ing one file fails.
src/utils_db_query.[ch]: Remove legacy code.
The "legacy mode" supported an old configuration schema of the
PostgreSQL plugin. This commit removes it, so only the recommended
configuration remains possible.
The "legacy mode" supported an old configuration schema of the
PostgreSQL plugin. This commit removes it, so only the recommended
configuration remains possible.
write_redis plugin: Add a new plugin writing collectd data to an instance of Redis.
collectd.conf(5): Improve the "Redis plugin" documentation a bit.
configure.in: Reorder the library checks alphabetically.
redis plugin: Simplify configuration handling.
Fix a number of minor bugs.
- The Port configuration option is a string, not a number. Fix
documentation.
- Fix a bad status assignement in port parser.
- Remove default node. Now node is mandatory to prevent
duplicates in tree.
- Update configuration example too.
- The Port configuration option is a string, not a number. Fix
documentation.
- Fix a bad status assignement in port parser.
- Remove default node. Now node is mandatory to prevent
duplicates in tree.
- Update configuration example too.
13 years agocollectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit archit...
collectdctl: Explicitly cast "long" to "int". This might be a problem on 32bit architectures.
amqp plugin: Warn about incorrectly used "ExchangeType" option in "Publish" block, too.
collectdctl: Added support for ‘U’ (undef) values in ‘putval’.
libcollectdclient: Fixed handling of ‘U’ (undef) in ‘PUTVAL’.
collectdctl: Improved error reporting.
collectdctl: Added support for the ‘putval’ command.
libcollectdclient: Added missing element to LCC_VALUE_LIST_INIT.
collectdctl: Moved examples section from help output to manpage.
collectdctl: ‘flush’ now supports multiple plugins/identifiers.
… just like the ‘unixsock’ plugin does.
… just like the ‘unixsock’ plugin does.
collectdctl(1): Updated the manpage according to the latest changes.
collectdctl: Improved error reporting.
collectdctl: Added ‘listval’ command.
Renamed ‘collectd-flush’ to ‘collectdctl’ (collectd control interface).
collectd-flush: Added ‘getval’ to the help output.
collectd-flush: Added support for the ‘getval’ command.
collectd-flush: Moved connection handling out of ‘flush()’.
collectd-flush: Switched to a command based syntax.
Basically, the command line now looks similar to the ‘unixsock’ text protocol,
i.e., a command is specified as first non-option argument followed by any
options of that command as defined by the protocol.
Basically, the command line now looks similar to the ‘unixsock’ text protocol,
i.e., a command is specified as first non-option argument followed by any
options of that command as defined by the protocol.
amqp plugin: Enable the "ExchangeType" option in Publish blocks, too.
collectd.conf(5): Add missing blank line.
collectd.conf(5): Finish documenting the AMQP plugin.
collectd.conf(5): Started documenting the AMQP plugin.
curl json: Fix checking the response code.
src/Makefile: Build and ship (in the tarball) the collectd-flush manpage.
collectd-flush: Include version and author information in usage output.
Just like the other tools.
Just like the other tools.
collectd-flush: Determine default socket from configured localstatedir.
collectd-flush: Do not use ‘getopt_long()’.
This is a GNU extension and, thus, not portable.
Also, pimped the usage output a bit.
This is a GNU extension and, thus, not portable.
Also, pimped the usage output a bit.
collectd-flush: Simplified ‘usage()’ a bit.
amqp plugin: Use the content type to determine how to decode received messages.
The "Format" config option is now only valid in "Publish" blocks.
The "Format" config option is now only valid in "Publish" blocks.
amqp plugin: Improve handling of the "routing key".
If no routing key is configured, the publish code will now create one based
on the value's identifier. The subscribing code will no longer use a
default but use an empty routing key if nothing was configured.
If no routing key is configured, the publish code will now create one based
on the value's identifier. The subscribing code will no longer use a
default but use an empty routing key if nothing was configured.
amqp plugin: Implement parsing of "PUTVAL" data.
Data transmission via AMQP works now! \o/
Data transmission via AMQP works now! \o/
amqp plugin: Implement the "Format" config option.
By default, the publishing code now creates "command" (i.e. PUTVAL) output.
For now this is easier to parse, so use this for the subscribing code.
(For now, anyways. I guess JSON will come later, too.)
By default, the publishing code now creates "command" (i.e. PUTVAL) output.
For now this is easier to parse, so use this for the subscribing code.
(For now, anyways. I guess JSON will come later, too.)
Merge branch 'master' into sp/amqp
src/utils_cmd_putval.[ch]: Implement "create_putval".
write_http plugin: Move "wh_value_list_to_string" to src/common.[ch].
amqp plugin: Only accept the "Persistent" option in "Publish" blocks.
amqp plugin: Add a debug message.
amqp plugin: Enable the "StoreRates" option only when configuring a "Publish" block.
collectd-flush: Minor coding style changes.
collectd-flush: Add a missing "break" in a "switch" case.
Update Makefile.am to build collectd-flush
As I am no automake expert, I basically copied
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
As I am no automake expert, I basically copied
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Add collectd-flush command line utility.
collectd-flush is a small command-line utility which uses libcollectdclient
to flush collectd through the unixsock plugin. As far as I know, there is
no easy way to work with unix sockets from the shell, so if someone
wanted to flush collectd without this program, they would need to do it
through some other language (or restart the deamon).
I am no C wizard, so please bear with me if I have
done something a stupid way. :)
The code is based on/inspired by collectd-nagios.
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
collectd-flush is a small command-line utility which uses libcollectdclient
to flush collectd through the unixsock plugin. As far as I know, there is
no easy way to work with unix sockets from the shell, so if someone
wanted to flush collectd without this program, they would need to do it
through some other language (or restart the deamon).
I am no C wizard, so please bear with me if I have
done something a stupid way. :)
The code is based on/inspired by collectd-nagios.
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: Håkon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
amqp plugin: First step towards subscribing to data via AMQP.
amqp plugin: Use the "camqp" prefix for all functions.
The library uses the "amqp" prefix, so we should use something else.
The library uses the "amqp" prefix, so we should use something else.
amqp plugin: Implement publishing to multiple brokers.
amqp plugin: Chose (hopefully sane) default values for all config options.
src/collectd.conf.in: Add missing config options of the AMQP plugin.
amqp plugin: Added some comments. Rewrapped lines of the license header.
amqp plugin: Implement the "StoreRates" option.
amqp plugin: Put the connecting code into a separate function.
amqp plugin: Initialize the port number to 5672.
amqp plugin: Let the user chose the delivery method.
Use "volatile" by default, but enable the user to switch to "persistent" if
it is important that no value is lost.
Use "volatile" by default, but enable the user to switch to "persistent" if
it is important that no value is lost.
amqp plugin: Implement persistent connection handling.
A connection is now opened on the first value to be written and is kept
open for as long as possible. This is hopefully much more efficient than
opening a new connection for each value.
The value_list_t is now converted to JSON first, before locking the
global connection object, in order to hold the lock for the least
possible time.
A connection is now opened on the first value to be written and is kept
open for as long as possible. This is hopefully much more efficient than
opening a new connection for each value.
The value_list_t is now converted to JSON first, before locking the
global connection object, in order to hold the lock for the least
possible time.
amqp plugin: Add error messages and give saner example config values.