]> git.ipfire.org Git - thirdparty/collectd.git/log
thirdparty/collectd.git
5 years agodaemon: Add "plugin_instance" and "type_instance" back to identifier_t.
Florian Forster [Wed, 29 Jul 2020 07:53:41 +0000 (09:53 +0200)] 
daemon: Add "plugin_instance" and "type_instance" back to identifier_t.

5 years agoTree wide: uc_get_rate → uc_get_rate_vl
Florian Forster [Tue, 28 Jul 2020 19:14:02 +0000 (21:14 +0200)] 
Tree wide: uc_get_rate → uc_get_rate_vl

5 years agoMakefile.am: Compile "utils_llist" only once.
Florian Forster [Fri, 17 Jul 2020 15:48:08 +0000 (17:48 +0200)] 
Makefile.am: Compile "utils_llist" only once.

5 years agosrc/daemon/plugin.c: Refactor plugin_register_flush().
Florian Forster [Wed, 8 Jul 2020 21:07:26 +0000 (23:07 +0200)] 
src/daemon/plugin.c: Refactor plugin_register_flush().

5 years agosrc/daemon/utils_cache.c: Don't overwrite the meta data of existing entries.
Florian Forster [Thu, 2 Jul 2020 10:09:13 +0000 (12:09 +0200)] 
src/daemon/utils_cache.c: Don't overwrite the meta data of existing entries.

The cache entry's meta data is not the same as the metric's meta data.
Overwriting the cache entry's meta data breaks a number of plugins,
including the network and write_stackdriver plugins.

5 years agosrc/daemon/utils_cache_mock.c: Migrate from "metric_single_t" to "metric_t".
Florian Forster [Thu, 16 Jul 2020 16:20:00 +0000 (18:20 +0200)] 
src/daemon/utils_cache_mock.c: Migrate from "metric_single_t" to "metric_t".

5 years agosrc/daemon/identity.[ch]: Remove; superseded by metric_family_t and metric_t.
Florian Forster [Mon, 29 Jun 2020 08:57:14 +0000 (10:57 +0200)] 
src/daemon/identity.[ch]: Remove; superseded by metric_family_t and metric_t.

5 years agosrc/daemon/plugin.c: Check argument to plugin_dispatch_metric_family().
Florian Forster [Mon, 29 Jun 2020 08:42:32 +0000 (10:42 +0200)] 
src/daemon/plugin.c: Check argument to plugin_dispatch_metric_family().

5 years agosrc/daemon/plugin.c: Migrate from "metric_list_add" to "metric_family_metric_append".
Florian Forster [Thu, 16 Jul 2020 16:18:34 +0000 (18:18 +0200)] 
src/daemon/plugin.c: Migrate from "metric_list_add" to "metric_family_metric_append".

5 years agosrc/daemon/{plugin,utils_threshold}.c: Replace "label_set_get" with "metric_label_get".
Florian Forster [Thu, 16 Jul 2020 16:17:03 +0000 (18:17 +0200)] 
src/daemon/{plugin,utils_threshold}.c: Replace "label_set_get" with "metric_label_get".

5 years agodaemon: migrate to metric_parse_identity().
Florian Forster [Tue, 21 Jul 2020 17:00:53 +0000 (19:00 +0200)] 
daemon: migrate to metric_parse_identity().

5 years agodaemon: Create the metric_family_t and metric_t types.
Florian Forster [Fri, 17 Jul 2020 11:11:57 +0000 (13:11 +0200)] 
daemon: Create the metric_family_t and metric_t types.

A "metric family" is a set of metrics, all with the same name (but
different labels and/or label values). The identity is split between the
two types: the "metric family" holds the "name" while the "metric" holds
the labels. Likewise, the "metric family" holds the metric type, the
"metric" holds the metric value.

This commit contains all required changes to compile the daemon, but
pretty much everything else still fails to build. The tests have not yet
updated either.

5 years agodaemon: s/metric_t/metric_single_t/g
Florian Forster [Fri, 17 Jul 2020 11:09:28 +0000 (13:09 +0200)] 
daemon: s/metric_t/metric_single_t/g

5 years agosrd/daemon/utils_cache.c: Fix an invalid variable name in a DEBUG() statement.
Florian Forster [Wed, 24 Jun 2020 20:12:28 +0000 (22:12 +0200)] 
srd/daemon/utils_cache.c: Fix an invalid variable name in a DEBUG() statement.

5 years agosrc/daemon/plugin.c: Refactor plugin_convert_values_to_metrics().
Florian Forster [Wed, 24 Jun 2020 20:11:45 +0000 (22:11 +0200)] 
src/daemon/plugin.c: Refactor plugin_convert_values_to_metrics().

*   Rename variables to fit the naming schema better.
*   Improve the error message. value_to_metric() can and has failed for
    other reasons than out of memory.

5 years agosrc/daemon/plugin.c: Implement plugin_valuelist_to_identity().
Florian Forster [Wed, 24 Jun 2020 20:08:50 +0000 (22:08 +0200)] 
src/daemon/plugin.c: Implement plugin_valuelist_to_identity().

This new function maps a value_list_t to a identity_t, using the same
logic as the Prometheus collectd exporter and the write_prometheus plugin.

This should, eventually, replace identity_create_legacy().

5 years agosrc/daemon/plugin.[ch]: Ensure that "time" and "interval" are set at enqueue time.
Florian Forster [Wed, 24 Jun 2020 20:06:11 +0000 (22:06 +0200)] 
src/daemon/plugin.[ch]: Ensure that "time" and "interval" are set at enqueue time.

This also ensures that an "instance" label (as used by the Prometheus
collectd exporter) exists. This is currently essentially a placeholder
for target labels.

5 years agosrc/daemon/utils_cache.c: Add uc_meta_data_add_unsigned_int_vl().
Florian Forster [Wed, 24 Jun 2020 10:51:59 +0000 (12:51 +0200)] 
src/daemon/utils_cache.c: Add uc_meta_data_add_unsigned_int_vl().

With this change, the daemon (without plugins) compiles!

5 years agosrc/daemon/utils_cache.c: Update to the new identity_marshal_text() API.
Florian Forster [Tue, 23 Jun 2020 08:47:32 +0000 (10:47 +0200)] 
src/daemon/utils_cache.c: Update to the new identity_marshal_text() API.

5 years agodaemon: Changes because src/daemon/metric.[ch] was created.
Florian Forster [Thu, 16 Jul 2020 16:12:25 +0000 (18:12 +0200)] 
daemon: Changes because src/daemon/metric.[ch] was created.

5 years agosrc/daemon/utils_threshold.c: Remove access to obsolete metric_t fields.
Florian Forster [Thu, 18 Jun 2020 11:26:34 +0000 (13:26 +0200)] 
src/daemon/utils_threshold.c: Remove access to obsolete metric_t fields.

threshold_get() is mostly a placeholder for now; appropriate TODOs have
been left in the code.

5 years agosrc/daemon/utils_cache_mock.c: Fix function definitions to match the header file.
Florian Forster [Thu, 18 Jun 2020 09:22:09 +0000 (11:22 +0200)] 
src/daemon/utils_cache_mock.c: Fix function definitions to match the header file.

5 years agodaemon: Remove identity functions.
Florian Forster [Fri, 17 Jul 2020 10:57:35 +0000 (12:57 +0200)] 
daemon: Remove identity functions.

5 years agosrc/daemon/plugin.c: Add a bunch of TODOs to plugin_format_metric().
Florian Forster [Wed, 17 Jun 2020 13:25:21 +0000 (15:25 +0200)] 
src/daemon/plugin.c: Add a bunch of TODOs to plugin_format_metric().

Minor cleanups:
*   Replace "metric_p" with "m".
*   Use "identity_get_label" instead of "c_avl_get".
*   Declare variables late.

5 years agosrc/daemon/plugin.[ch]: Add stub for identity_parse().
Florian Forster [Wed, 17 Jun 2020 13:20:47 +0000 (15:20 +0200)] 
src/daemon/plugin.[ch]: Add stub for identity_parse().

No implementation yet; just trying to get the existing code to compile.

5 years agosrc/daemon/plugin.[ch]: Implement identity_compare().
Florian Forster [Wed, 17 Jun 2020 08:48:37 +0000 (10:48 +0200)] 
src/daemon/plugin.[ch]: Implement identity_compare().

5 years agodaemon: More cleanups.
Florian Forster [Fri, 17 Jul 2020 10:42:25 +0000 (12:42 +0200)] 
daemon: More cleanups.

*   Struct "metric_t": unnecessary fields "type", "plugin", "ds" have
    been removed. The field "value_ds_type" has been renamed to
    "value_type".
*   The reference counted, multiple instance "meta_data_list_head_t" type
    has been removed. Manually doing the reference counting all over the
    place is error prone and it seems like premature optimization.
*   The "<type>_destroy" functions must handle NULL gracefully. Removed
    NULL-checks around their invocation to improve readability.

# Conflicts:
# src/daemon/metrics_list_test.c

5 years agodaemon: Reworked some code in src/daemon/plugin.[ch].
Florian Forster [Fri, 17 Jul 2020 10:28:49 +0000 (12:28 +0200)] 
daemon: Reworked some code in src/daemon/plugin.[ch].

Unfortunately it's all a bit messy and entangled. Since this is such
an early WIP, I didn't spend the (substantial) time needed to pick this
into separate changes. The changes in this commit are:

*   Create a consistent naming schema for the identity functions:
    *   Rename "create_identity" to "identity_create_legacy".
    *   Rename "clone_identity" to "identity_clone".
    *   Rename "destroy_identity" to "identity_destroy".
*   Add "identity_create" to allocate a new identity_t.
*   Copy key and value strings within "identity_add_label".
    *   Make use of "identity_create" and "identity_add_label" in
        "identity_clone", "identity_create_legacy" and others that used
        to fiddle with the AVL tree directly.
*   Remove the "_p" suffix used for pointers. This is quite unusual for
    the collectd codebase.

# Conflicts:
# src/daemon/metrics_list_test.c

5 years agodaemon: Use metric_t internally
Florian Forster [Fri, 17 Jul 2020 10:25:36 +0000 (12:25 +0200)] 
daemon: Use metric_t internally

This is a WIP

This commit is where the major transform takes palce; the internal
representation is changed, and the read plugins use that indirectly
when they submit a value list transparently.

The baromerter read plugin has been converted to using metric_t
representation natively.

The write plugins have to be adapted to use these new single data
source metrics.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: I9bdeaa59de5c58d11c0ae0e7b55d68d9e4d77fa1

# Conflicts:
# src/daemon/metrics_list_test.c

5 years ago[metric-label-support]: Modify write queue to use metric_t
Manoj Srivastava [Tue, 3 Dec 2019 22:33:27 +0000 (14:33 -0800)] 
[metric-label-support]: Modify write queue to use metric_t

This commit adds an updated write queue data structure, and updates
the enqueue and dequeue calling paths. Note that while this compiles
and the tests pass, thisis not a functioning collectd by itself, the
caching and networking code is a work in progress.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: I7f41f9271abc481067b9bcdedf88d2c5b5da9bc9

5 years ago[metric-label-support]: Utility functions for the new data structure
Manoj Srivastava [Mon, 2 Dec 2019 17:11:47 +0000 (09:11 -0800)] 
[metric-label-support]: Utility functions for the new data structure

This commit adds utility function to clone and destroy identity and
metrics objects introduced earlier, and adds unit testing for them.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: I87ffe1e4b8393be7a5a6e1c5714cd28e2cf0a355

5 years ago[metric-label-support]: Utility to convert value_list_t to metric_t
Manoj Srivastava [Wed, 20 Nov 2019 18:03:40 +0000 (10:03 -0800)] 
[metric-label-support]: Utility to convert value_list_t to metric_t

This is another step in implementing the proposal defined in the
document  "Adding Labels to Collectd Metrics"
 - https://docs.google.com/document/d/173gGP3tUD3yfN2NNHxCv0BsKsacfDlSyoaQIn7MqLtQ/edit?usp=sharing
This commit adds a utility method to convert from the old metric
represetation to a the new datastructures updated as per the document:
"Compare data structures for metric labels (collectd)"
- https://docs.google.com/document/d/1RZ7YAO6lWcDDvevzxFGVDgv4UQpdgWoT7OCP9Vpb2CU/edit?usp=sharing

This method is designed to be called from plugindispatch_values during
the transition period before read plugins are amended to use the
metric_t data structure directly.

The unit test serves as a example usage.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: Iecfaf06355a53c1ad2951775ee3f331a852ef14d

5 years ago[metric-label-support]: Code cleanup
Manoj Srivastava [Tue, 8 Oct 2019 21:08:33 +0000 (14:08 -0700)] 
[metric-label-support]: Code cleanup

This commit adds no change in behaviour or functionality, but cleans
up a few diagnostic, updates  the metrics_t data structure to add
names of the type and subtype, and fixes a space/tab anpmaly.. The
tests still work.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: I9e2d7283f2aaf5b7d67747bae7eb781b87fb4595

5 years ago[metric-label-support]: Initial setup
Manoj Srivastava [Thu, 26 Sep 2019 21:32:18 +0000 (14:32 -0700)] 
[metric-label-support]: Initial setup

This is the initial commit on the proposal defined in the document
"Adding Labels to Collectd Metrics"
  - https://docs.google.com/document/d/173gGP3tUD3yfN2NNHxCv0BsKsacfDlSyoaQIn7MqLtQ/edit?usp=sharing
With the datastructures updated as per the document:
"Compare data structures for metric labels (collectd)"
  - https://docs.google.com/document/d/1RZ7YAO6lWcDDvevzxFGVDgv4UQpdgWoT7OCP9Vpb2CU/edit?usp=sharing

This commit adds the initial declaration and definition of the basic
data structure, and sets up the build system to add in unit testing
for the label store, the identity and metrics data streuctures.

Signed-off-by: Manoj Srivastava <srivasta@google.com>
Change-Id: I29673ab36f75db2ac487ee6a22907e3deba2f965

5 years agosrc/daemon/metric.[ch]: Add metric_label_{get,set,reset}().
Florian Forster [Sun, 28 Jun 2020 19:07:27 +0000 (21:07 +0200)] 
src/daemon/metric.[ch]: Add metric_label_{get,set,reset}().

label_set_{get,add,reset} have been made static, providing the calling
code with a nicer API.

5 years agosrc/daemon/metric.[ch]: Data types and functions representing metrics.
Florian Forster [Sun, 21 Jun 2020 16:33:58 +0000 (18:33 +0200)] 
src/daemon/metric.[ch]: Data types and functions representing metrics.

This implementation closely mirrors the Prometheus / OpenMetrics
protocol buffer.

A "metric family" is a set of metrics, all with the same name (but
different labels and/or label values). The identity is split between the
two types: the "metric family" holds the "name" while the "metric" holds
the labels. Likewise, the "metric family" holds the metric type, the
"metric" holds the metric value.

This commit contains all required changes to compile the daemon, but
pretty much everything else still fails to build. The tests have not yet
updated either.

The metric_marshal_text() function uses a strbuf_t* and generates the
OpenMetric exposition format.

5 years agoMerge pull request #3508 from octo/metric_t
Florian Forster [Wed, 22 Jul 2020 04:48:05 +0000 (06:48 +0200)] 
Merge pull request #3508 from octo/metric_t

Implement metric_t and metric_family_t.

5 years agosrc/daemon/metric.[ch]: Improve doc comments. 3508/head
Florian Forster [Mon, 20 Jul 2020 19:30:05 +0000 (21:30 +0200)] 
src/daemon/metric.[ch]: Improve doc comments.

5 years agostatsd plugin: Rename "metric_type_t" to avoid a name clash.
Florian Forster [Fri, 17 Jul 2020 08:48:32 +0000 (10:48 +0200)] 
statsd plugin: Rename "metric_type_t" to avoid a name clash.

5 years agoformat_json: Rename "label_t" to "keyval_t" in test.
Florian Forster [Fri, 17 Jul 2020 08:36:52 +0000 (10:36 +0200)] 
format_json: Rename "label_t" to "keyval_t" in test.

This is to avoid a name clash with the type defined in "metric.h".

5 years agosrc/testing.h: Support NULL pointers in EXPECT_EQ_STR().
Florian Forster [Thu, 16 Jul 2020 16:20:27 +0000 (18:20 +0200)] 
src/testing.h: Support NULL pointers in EXPECT_EQ_STR().

Changes in "format_graphite" fix the following error:

./src/testing.h:77:56: error: the address of ‘want’ will always evaluate as ‘true’ [-Werror=address]
   77 |              #actual, got__ ? got__ : "(null)", expect ? expect : "(null)");   \

5 years agosrc/testing.h: Support const pointers in CHECK_NOT_NULL().
Florian Forster [Fri, 17 Jul 2020 08:33:14 +0000 (10:33 +0200)] 
src/testing.h: Support const pointers in CHECK_NOT_NULL().

5 years agosrc/daemon/metric.[ch]: Implement metric_family_append().
Florian Forster [Tue, 7 Jul 2020 07:52:57 +0000 (09:52 +0200)] 
src/daemon/metric.[ch]: Implement metric_family_append().

5 years agosrc/daemon/metric.[ch]: Add metric_family_metric_reset().
Florian Forster [Sun, 28 Jun 2020 19:41:47 +0000 (21:41 +0200)] 
src/daemon/metric.[ch]: Add metric_family_metric_reset().

This and metric_family_metric_append() replace the metric_list_{add,reset}
functions.

5 years agosrc/daemon/metric.[ch]: Add metric_label_{get,set,reset}().
Florian Forster [Sun, 28 Jun 2020 19:07:27 +0000 (21:07 +0200)] 
src/daemon/metric.[ch]: Add metric_label_{get,set,reset}().

label_set_{get,add,reset} have been made static, providing the calling
code with a nicer API.

5 years agosrc/daemon/metric.[ch]: Implement metric_parse_identity().
Florian Forster [Tue, 21 Jul 2020 14:43:42 +0000 (16:43 +0200)] 
src/daemon/metric.[ch]: Implement metric_parse_identity().

5 years agosrc/daemon/metric.[ch]: Data types and functions representing metrics.
Florian Forster [Sun, 21 Jun 2020 16:33:58 +0000 (18:33 +0200)] 
src/daemon/metric.[ch]: Data types and functions representing metrics.

This implementation closely mirrors the Prometheus / OpenMetrics
protocol buffer.

A "metric family" is a set of metrics, all with the same name (but
different labels and/or label values). The identity is split between the
two types: the "metric family" holds the "name" while the "metric" holds
the labels. Likewise, the "metric family" holds the metric type, the
"metric" holds the metric value.

This commit contains all required changes to compile the daemon, but
pretty much everything else still fails to build. The tests have not yet
updated either.

5 years agoMerge pull request #3509 from octo/avltree
Florian Forster [Mon, 20 Jul 2020 16:36:27 +0000 (18:36 +0200)] 
Merge pull request #3509 from octo/avltree

avltree: Return errno values; unify argument handling.

5 years agoavltree: Return errno values; unify argument handling. 3509/head
Florian Forster [Thu, 2 Jul 2020 18:52:05 +0000 (20:52 +0200)] 
avltree: Return errno values; unify argument handling.

5 years agoMerge pull request #3507 from octo/remove-absolute
Florian Forster [Fri, 17 Jul 2020 08:12:25 +0000 (10:12 +0200)] 
Merge pull request #3507 from octo/remove-absolute

Tree-wide: Remove support for "absolute" metric values.

5 years agoTree-wide: Remove support for "absolute" metric values. 3507/head
Florian Forster [Thu, 16 Jul 2020 16:55:13 +0000 (18:55 +0200)] 
Tree-wide: Remove support for "absolute" metric values.

5 years agoMerge pull request #3481 from octo/strbuf
Florian Forster [Thu, 16 Jul 2020 18:11:31 +0000 (20:11 +0200)] 
Merge pull request #3481 from octo/strbuf

strbuf: Library that implements printing to a dynamically allocated buffer.

5 years agostrbuf: Update buf->size if realloc succeeds. 3481/head
Florian Forster [Thu, 9 Jul 2020 10:33:09 +0000 (12:33 +0200)] 
strbuf: Update buf->size if realloc succeeds.

5 years agostrbuf: Implenet "strbuf_printn" and "strbuf_print_escaped".
Florian Forster [Sun, 21 Jun 2020 19:23:22 +0000 (21:23 +0200)] 
strbuf: Implenet "strbuf_printn" and "strbuf_print_escaped".

5 years agocommon: Use the strbuf library in format_values().
Florian Forster [Fri, 19 Jun 2020 09:35:19 +0000 (11:35 +0200)] 
common: Use the strbuf library in format_values().

5 years agocommon: Add test for format_values().
Florian Forster [Fri, 19 Jun 2020 09:31:35 +0000 (11:31 +0200)] 
common: Add test for format_values().

5 years agostrbuf: Add STRBUF_CREATE_FIXED, unify naming.
Florian Forster [Fri, 19 Jun 2020 08:14:53 +0000 (10:14 +0200)] 
strbuf: Add STRBUF_CREATE_FIXED, unify naming.

This changes the macro and function name to use "fixed" when a buffer and
its size are provided, and "static" if `sizeof()` is used to determine the
size.

The macros now return and expect a `strbuf_t`, i.e. *not* a pointer. This
makes it easier to see that the buffer is allocated on the stack and may
go out of scope.

The buffer size in the tests has been changed to 9, so that `sizeof(array)`
and `sizeof(pointer)` return different values.

5 years agostrbuf: Improve documentation of exported functions.
Florian Forster [Fri, 19 Jun 2020 07:41:35 +0000 (09:41 +0200)] 
strbuf: Improve documentation of exported functions.

5 years agostrbuf: Add tests for stack allocation.
Florian Forster [Fri, 19 Jun 2020 07:41:19 +0000 (09:41 +0200)] 
strbuf: Add tests for stack allocation.

Add tests for the STRBUF_CREATE[_STATIC] macros. This surfaced a bug with
the STRBUF_DESTROY macro, which was missing `… while (0)` at the end.

5 years agostrbuf: Library that implements printing to a dynamically allocated buffer.
Florian Forster [Mon, 18 Sep 2017 14:35:51 +0000 (16:35 +0200)] 
strbuf: Library that implements printing to a dynamically allocated buffer.

5 years agoMerge pull request #3493 from octo/configfile
Florian Forster [Thu, 9 Jul 2020 15:11:57 +0000 (17:11 +0200)] 
Merge pull request #3493 from octo/configfile

src/daemon/configfile.c: Remove special case for the "libvirt" plugin.

5 years agosrc/daemon/configfile.c: Remove special case for the "libvirt" plugin. 3493/head
Florian Forster [Thu, 2 Jul 2020 18:55:21 +0000 (20:55 +0200)] 
src/daemon/configfile.c: Remove special case for the "libvirt" plugin.

5 years agoMerge pull request #3263 from duckfez/http_output_fix
Matthias Runge [Sat, 6 Jun 2020 17:37:17 +0000 (19:37 +0200)] 
Merge pull request #3263 from duckfez/http_output_fix

write_http no longer writes http response to stdout

5 years agoMerge pull request #3463 from miesi/master
Florian Forster [Wed, 20 May 2020 07:46:25 +0000 (09:46 +0200)] 
Merge pull request #3463 from miesi/master

mysql: report slave_io_running and slave_sql_running

5 years agorun format.sh to comply with coding style 3463/head
Thomas Mieslinger [Wed, 20 May 2020 06:13:13 +0000 (08:13 +0200)] 
run format.sh to comply with coding style

5 years agoreplace long if else with compact code
Thomas Mieslinger [Wed, 20 May 2020 06:09:02 +0000 (08:09 +0200)] 
replace long if else with compact code

5 years agoreplace slave_running with generic bool
Thomas Mieslinger [Wed, 20 May 2020 06:07:12 +0000 (08:07 +0200)] 
replace slave_running with generic bool

5 years agomysql: report slave status running io and sql
Thomas Mieslinger [Wed, 13 May 2020 19:30:20 +0000 (21:30 +0200)] 
mysql: report slave status running io and sql

5 years agoMerge pull request #3458 from octo/man-types-db
Florian Forster [Tue, 12 May 2020 07:04:47 +0000 (09:04 +0200)] 
Merge pull request #3458 from octo/man-types-db

types.db(5): Improve wording and document conventions.

5 years agotypes.db(5): Improve wording and document conventions. 3458/head
Florian Forster [Mon, 11 May 2020 07:36:28 +0000 (09:36 +0200)] 
types.db(5): Improve wording and document conventions.

5 years agoMerge pull request #3398 from mbakhoff/sensu-source
Matthias Runge [Wed, 6 May 2020 17:01:31 +0000 (19:01 +0200)] 
Merge pull request #3398 from mbakhoff/sensu-source

write_sensu: add the IncludeSource option

5 years agoMerge pull request #3443 from octo/sensors-man
Matthias Runge [Wed, 6 May 2020 16:55:41 +0000 (18:55 +0200)] 
Merge pull request #3443 from octo/sensors-man

collectd.conf(5): Document the format expected by "sensors"' ignore list.

5 years agoMerge pull request #3452 from maciejsszmigiero/mqtt-reconnect-fix
Florian Forster [Sat, 2 May 2020 20:31:37 +0000 (22:31 +0200)] 
Merge pull request #3452 from maciejsszmigiero/mqtt-reconnect-fix

MQTT: Resubscribe after a reconnect

5 years agoFix code style issues in src/mqtt.c 3452/head
Maciej S. Szmigiero [Fri, 1 May 2020 19:08:17 +0000 (21:08 +0200)] 
Fix code style issues in src/mqtt.c

This is an automated code style fix generated by running
"contrib/format.sh src/mqtt.c".
No functional change intended.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
5 years agoMQTT: Resubscribe after a reconnect
Maciej S. Szmigiero [Fri, 1 May 2020 18:15:20 +0000 (20:15 +0200)] 
MQTT: Resubscribe after a reconnect

After losing our connection to a MQTT broker our subscription will be gone,
too, so we need to subscribe to our topic once again after reconnecting,
otherwise collectd will not receive any MQTT messages anymore.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
5 years agoMerge pull request #3450 from hightea/zk-add-mntr-fields
Florian Forster [Tue, 28 Apr 2020 16:47:28 +0000 (18:47 +0200)] 
Merge pull request #3450 from hightea/zk-add-mntr-fields

Zookeeper - Add missing 3.5 mntr fields

5 years agoZookeeper - Add missing 3.5 mntr fields 3450/head
Théophane Charbonnier [Tue, 28 Apr 2020 13:04:42 +0000 (15:04 +0200)] 
Zookeeper - Add missing 3.5 mntr fields

Add missing zk_last_proposal_size , zk_min_proposal_size and zk_max_proposal_size mntr fields (available since zk 3.5) to handled fields

5 years agoMerge pull request #3446 from F4-Group/handle-full-stat-name
Florian Forster [Tue, 28 Apr 2020 10:57:23 +0000 (12:57 +0200)] 
Merge pull request #3446 from F4-Group/handle-full-stat-name

Add target in category for varnish 6

5 years agoAdd backend name in vbe stat 3446/head
Charly Koza [Mon, 27 Apr 2020 09:57:39 +0000 (11:57 +0200)] 
Add backend name in vbe stat

5 years agoSplit stat key on dot, extract target for SMA/SMF and use it in category
Charly Koza [Fri, 24 Apr 2020 09:14:04 +0000 (11:14 +0200)] 
Split stat key on dot, extract target for SMA/SMF and use it in category

For example, this adds v0 and Transient for SMA, allowing to monitor
cache size properly

Fixes https://github.com/collectd/collectd/issues/2206

5 years agoMerge pull request #3445 from F4-Group/varnish6-support
Florian Forster [Mon, 27 Apr 2020 15:44:16 +0000 (17:44 +0200)] 
Merge pull request #3445 from F4-Group/varnish6-support

Add varnish 6 support

5 years agoRestrict workers stats to versions before v6 3445/head
Charly Koza [Thu, 23 Apr 2020 14:34:16 +0000 (16:34 +0200)] 
Restrict workers stats to versions before v6

5 years agoUpdate counters for MSE 3.0 - varnish plugin
Ismael Puerto [Sat, 28 Dec 2019 00:19:31 +0000 (01:19 +0100)] 
Update counters for MSE 3.0 - varnish plugin

5 years agoAdd counter for vmod-goto, only for Varnish Plus 6
Ismael Puerto [Fri, 27 Dec 2019 23:43:57 +0000 (00:43 +0100)] 
Add counter for vmod-goto, only for Varnish Plus 6

5 years agoVSM only apply for Varnish 4 or 5
Ismael Puerto [Mon, 23 Dec 2019 00:18:57 +0000 (00:18 +0000)] 
VSM only apply for Varnish 4 or 5

5 years agoAdd varnish 6 new values
Charly Koza [Thu, 23 Apr 2020 14:02:48 +0000 (16:02 +0200)] 
Add varnish 6 new values

Extracted from https://github.com/collectd/collectd/pull/3360

5 years agoMerge pull request #3410 from mbakhoff/amqp-failover
Florian Forster [Mon, 27 Apr 2020 11:22:45 +0000 (13:22 +0200)] 
Merge pull request #3410 from mbakhoff/amqp-failover

amqp: allow multiple hosts for failover

5 years agoamqp: improve example conf 3410/head
Märt Bakhoff [Mon, 27 Apr 2020 09:22:04 +0000 (12:22 +0300)] 
amqp: improve example conf

5 years agoMerge pull request #3441 from maciejsszmigiero/disk-plugin-udev-rule
Florian Forster [Sun, 26 Apr 2020 19:59:14 +0000 (21:59 +0200)] 
Merge pull request #3441 from maciejsszmigiero/disk-plugin-udev-rule

Provide an udev rule with ID_SERIAL based, disk plugin usable ID attribute.

5 years agoUpdate conf files
Charly Koza [Thu, 23 Apr 2020 14:00:24 +0000 (16:00 +0200)] 
Update conf files

5 years agoAdd varnish 6 support
Charly Koza [Thu, 23 Apr 2020 13:52:00 +0000 (15:52 +0200)] 
Add varnish 6 support

5 years agoMerge pull request #2730 from viulian/master
Matthias Runge [Thu, 23 Apr 2020 06:22:24 +0000 (08:22 +0200)] 
Merge pull request #2730 from viulian/master

adding mosquitto_loop after mosquitto_publish, otherwise qos=1 messag…

5 years agocollectd.conf(5): Document the format expected by "sensors"' ignore list. 3443/head
Florian Forster [Thu, 23 Apr 2020 05:42:50 +0000 (07:42 +0200)] 
collectd.conf(5): Document the format expected by "sensors"' ignore list.

This question recently came up on the mailing list.

5 years agoProvide an udev rule with ID_SERIAL based, disk plugin usable ID attribute 3441/head
Maciej S. Szmigiero [Sun, 19 Apr 2020 15:57:07 +0000 (17:57 +0200)] 
Provide an udev rule with ID_SERIAL based, disk plugin usable ID attribute

Disk plugin UdevNameAttr option is very useful for making sure that the
same disk always ends in the same RRD file no matter which particular
device node it ends being assigned by the OS.

However, using the most fitting ID_SERIAL udev attribute for this purpose
results in data about the whole disk and each partition being mixed
together incorrectly, since this attribute has exactly the same value for
the whole disk device node and its particular partition nodes.

Let's introduce an ID_COLLECTD attribute instead which differentiates
between the whole disk and its particular partitions in a new udev rule
file provided in "contrib" directory.
To warn users about the issue let's also add a relevant note to the
UdevNameAttr option description.

Based on Stewart Adam's workaround from
https://github.com/collectd/collectd/issues/823

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
5 years agoCode files don't need execute permission
Maciej S. Szmigiero [Sun, 19 Apr 2020 14:34:13 +0000 (16:34 +0200)] 
Code files don't need execute permission

Some .c files had execute permission bit set needlessly.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
5 years agoMerge pull request #3439 from ffontaine/master
Matthias Runge [Wed, 15 Apr 2020 08:31:31 +0000 (10:31 +0200)] 
Merge pull request #3439 from ffontaine/master

src/dpdk_telemetry.c: fix build on musl

5 years agosrc/dpdk_telemetry.c: fix build on musl 3439/head
Fabrice Fontaine [Tue, 14 Apr 2020 12:49:19 +0000 (14:49 +0200)] 
src/dpdk_telemetry.c: fix build on musl

Include unistd.h instead of sys/unistd.h to fix the following build
failure on musl:

src/dpdk_telemetry.c:43:10: fatal error: sys/unistd.h: No such file or directory
 #include <sys/unistd.h>
          ^~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/aafb8c72f147fefc7a988c45e4dc17de48b07a95

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
5 years agoMerge pull request #2841 from elfiesmelfie/feat_mdevents
Dagobert Michelsen [Thu, 9 Apr 2020 14:30:49 +0000 (16:30 +0200)] 
Merge pull request #2841 from elfiesmelfie/feat_mdevents

New plugin to read RAID events

5 years agoMerge pull request #3432 from ryan-mccabe/master
Matthias Runge [Thu, 9 Apr 2020 13:31:16 +0000 (15:31 +0200)] 
Merge pull request #3432 from ryan-mccabe/master

amqp1: Add options to limit send queue length

5 years agoclang-format 3263/head
Duane Waddle [Sun, 5 Apr 2020 16:18:12 +0000 (11:18 -0500)] 
clang-format