[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Wed Sep 14 21:15:07 CEST 2016
ChangeLog | 158 +++++++++++++++++++++++++
contrib/examples/myplugin.c | 38 ++++--
contrib/migrate-4-5.px | 2 -
src/Makefile.am | 1 +
src/amqp.c | 8 +-
src/apache.c | 23 ++--
src/apcups.c | 5 +-
src/apple_sensors.c | 8 +-
src/aquaero.c | 5 +-
src/ascent.c | 5 +-
src/battery.c | 5 +-
src/battery_statefs.c | 103 +++++++---------
src/bind.c | 5 +-
src/chrony.c | 5 +-
src/collectd.conf.in | 9 +-
src/collectd.conf.pod | 87 +++++++++++++-
src/conntrack.c | 53 ++-------
src/contextswitch.c | 5 +-
src/cpu.c | 32 ++---
src/cpufreq.c | 61 +++-------
src/cpusleep.c | 5 +-
src/curl.c | 19 +--
src/curl_json.c | 20 ++--
src/curl_xml.c | 11 +-
src/daemon/common.c | 12 ++
src/daemon/common.h | 5 +
src/daemon/meta_data.c | 67 +++++++++++
src/daemon/meta_data.h | 5 +
src/daemon/plugin.c | 21 ++--
src/dbi.c | 15 +--
src/df.c | 5 +-
src/disk.c | 26 ++---
src/dns.c | 15 +--
src/email.c | 5 +-
src/entropy.c | 27 +----
src/ethstat.c | 4 +-
src/fhcount.c | 7 +-
src/filecount.c | 9 +-
src/gps.c | 5 +-
src/hddtemp.c | 5 +-
src/hugepages.c | 272 +++++++++++++++++++++----------------------
src/interface.c | 10 +-
src/ipc.c | 5 +-
src/ipmi.c | 5 +-
src/iptables.c | 19 ++-
src/ipvs.c | 15 +--
src/irq.c | 5 +-
src/java.c | 50 ++++----
src/load.c | 11 +-
src/lpar.c | 5 +-
src/lua.c | 16 +--
src/lvm.c | 5 +-
src/madwifi.c | 24 ++--
src/match_regex.c | 132 ++++++++++++++++++---
src/mbmon.c | 5 +-
src/md.c | 5 +-
src/memcachec.c | 9 +-
src/memcached.c | 49 ++++----
src/mic.c | 47 +++-----
src/modbus.c | 9 +-
src/mqtt.c | 8 +-
src/multimeter.c | 5 +-
src/mysql.c | 122 +++++++++----------
src/netapp.c | 48 +++-----
src/netlink.c | 15 +--
src/nginx.c | 2 +-
src/ntpd.c | 5 +-
src/nut.c | 7 +-
src/olsrd.c | 5 +-
src/onewire.c | 37 +++---
src/openldap.c | 16 +--
src/openvpn.c | 23 ++--
src/pinba.c | 14 +--
src/ping.c | 5 +-
src/powerdns.c | 12 +-
src/processes.c | 13 +--
src/protocols.c | 6 +-
src/python.c | 20 ++--
src/redis.c | 5 +-
src/routeros.c | 16 +--
src/rrdcached.c | 10 +-
src/sensors.c | 7 +-
src/serial.c | 10 +-
src/sigrok.c | 4 +-
src/smart.c | 24 ++--
src/snmp.c | 10 +-
src/statsd.c | 25 ++--
src/swap.c | 12 +-
src/tail.c | 9 +-
src/tail_csv.c | 12 +-
src/tape.c | 10 +-
src/target_set.c | 214 +++++++++++++++++++++++++++++++---
src/target_v5upgrade.c | 32 +++--
src/teamspeak2.c | 15 +--
src/ted.c | 5 +-
src/thermal.c | 61 +++-------
src/tokyotyrant.c | 9 +-
src/turbostat.c | 22 ++--
src/types.db | 1 -
src/uptime.c | 7 +-
src/users.c | 5 +-
src/utils_format_graphite.c | 23 +++-
src/utils_format_graphite.h | 1 +
src/varnish.c | 33 ++----
src/virt.c | 92 +++++----------
src/vmem.c | 11 +-
src/vserver.c | 25 ++--
src/wireless.c | 5 +-
src/write_graphite.c | 17 +--
src/write_kafka.c | 11 +-
src/write_log.c | 95 +++++++++++++--
src/write_mongodb.c | 11 +-
src/write_redis.c | 11 +-
src/xencpu.c | 12 +-
src/xmms.c | 5 +-
src/zfs_arc.c | 33 ++----
src/zookeeper.c | 14 +--
version-gen.sh | 2 +-
118 files changed, 1558 insertions(+), 1335 deletions(-)
New commits:
commit edc55eb5b933d6b9f30c511d24172ee6a66cefcf
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 20:24:39 2016 +0200
hugepages plugin: Add "g_" prefix to global variables.
commit f03587a8173a8f6d8dace98c35a0e24bf8f8564d
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 20:24:13 2016 +0200
hugepages plugin: Add myself to the list of authors.
commit d191bd9ecabcc93fa52abf6ce59a914ca9fdca10
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 07:25:54 2016 +0200
hugepages plugin: Remove an unused variable.
commit a78f607649122abb0684b191f6e8d1e44a117017
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 13:21:45 2016 +0200
hugepages plugin: Implement the "ValuesPages", "ValuesBytes" and "ValuesPercentage" options.
commit 9dadbd1f23d0ecbae7e8a7dc4fbaa7f73e7ea18a
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 11:59:46 2016 +0200
hugepages plugin: Use the "complex" config callback.
commit 51b9d014491109dad2e26981d04549200eef0d44
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 11:56:04 2016 +0200
hugepages plugin: Parse page size from the directory name.
commit 624012732bd5db5449c58d9a0f9d844fb4a391c1
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 11:22:39 2016 +0200
hugepages plugin: Refactor the read_hugepage_entry() function.
* Move static variables into the "entry_info" struct.
* Turn flag into an actual flag, rather than a counter.
* Close "fh" as soon as possible.
* Return early if flags != HP_HAVE_ALL.
* Remove dead code (d_name *always* contains a dash).
commit 56a368209ea679eaa6790de419b68573505afb74
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 10:35:22 2016 +0200
hugepages plugin: Don't use pathconf(_PC_NAME_MAX).
Since we allocate the buffer on the stack, this doesn't make sense:
Best case, the returned value is the same as the PATH_MAX define. Worst
case, the returned value is larger and we create a stack overflow.
commit 5e6a4f71a69ce27dae513133ee74c2551cf72fb8
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 5 10:26:50 2016 +0200
hugepages plugin: Run clang-format.
commit 51bc7c4a5523f2b03c24e32064b28c7c8426534d
Merge: 03af72c f7649ae
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 13:59:05 2016 +0200
Merge remote-tracking branch 'github/pr/1931'
commit f7649ae4a3270efe73f55bd00ca7fb89f269b8ec
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 08:21:47 2016 +0200
Tree wide: Unify initialization of multi-value value lists.
Use struct initializers to initialize the array like so:
value_t values[] = {
/* ... */
};
Then initialize the value_list_t with:
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
commit 24a099f4089569f2e1863c6ab455b844c7cacd3f
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 08:58:51 2016 +0200
contrib/examples/myplugin.c: Use a compound literal in the example plugin, too.
commit e14e8b7f5c5bf9d0fe5cc632c6383f304d4ac2ad
Author: Florian Forster <octo at collectd.org>
Date: Wed Sep 14 08:19:41 2016 +0200
Tree wide: Use compound literals when dealing with value_t.
commit 03af72c5ef8b98ddfcab87ea44b764f5b0e165aa
Merge: c4d7964 02f8dbc
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 22:27:34 2016 +0200
Merge branch 'collectd-5.6'
Conflicts:
src/collectd.conf.in
commit 02f8dbc0985310574ea2837cd5e3c06cccda203d
Merge: 7e3059b ba52f94
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 22:26:31 2016 +0200
Merge branch 'collectd-5.5' into collectd-5.6
commit c4d79642e546f4992d5d4b3d62ae74490d21ee87
Merge: 0a95b83 0030d42
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 21:42:07 2016 +0200
Merge remote-tracking branch 'github/pr/1930'
commit 0030d4216cda0062baf7f9047bb524eebfaaf1ad
Author: Florian Forster <ff at octo.it>
Date: Tue Sep 13 20:52:58 2016 +0200
regex match: snprintf → ssnprintf
ssnprintf() ensures null termination, which is especially important when using "%s" in the format.
commit ee1cd3f1b15680ddf6777703c5714d209cf68881
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Tue Sep 13 14:17:32 2016 -0400
Address review comments:
- Fix match bug.
- Use sfree everywhere.
- Better variable names.
commit 0a95b83f89a553be1ac2beae2003927e74230d23
Merge: a9683eb 4d37074
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 10:50:40 2016 +0200
Merge remote-tracking branch 'github/pr/1929'
commit ba52f94929822b1968f05cfbb37985af2e0b83a4
Author: Florian Forster <octo at collectd.org>
Date: Tue Sep 13 10:44:46 2016 +0200
curl_json plugin: Skip unexpected non-map values.
Assume, for example, the config `Key "*/foo"`. This config expects JSON
in the form:
{
"bar": {
"foo": 1337
}
}
If the available JSON is instead:
{
"error_code": 0,
"bar": {
"foo": 1337
}
}
the code will take a look at the zero associated with "error_code" and
determine that a map (with key "foo") is expected instead. Previously
the code would continue, eventually calling `cj_get_type()` which
expects that `key->type` is a valid pointer, resulting in a segmentation
fault.
This patch does three things to ensure that this segmentation fault does
not happen again:
1. `cj_get_type()` checks its argument to make sure it is valid before
dereferencing any pointers.
2. In case a non-map is found when a map is expected, the code will
return instead of limping on.
3. After calling `cj_cb_inc_array_index()`, which may update the key,
make sure that it actually did and that key is valid now.
Fixes: #1896
commit 814c06a57df26b901e503c59195b34dff837f4a2
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Mon Sep 12 18:53:31 2016 -0400
Document MetaData.
commit 994fe26cc9e2b6b81341d332d94fe3b245ad00df
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Mon Sep 12 17:56:47 2016 -0400
Allow Match:Regex to match metadata.
commit a9683eb26fde194a19c698ca828f1b638185b868
Merge: a302b46 2f2f63a
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 21:05:39 2016 +0200
Merge remote-tracking branch 'github/pr/1922'
commit a302b46b0f8b178ea6e360e21a525273598bf652
Merge: 59919c4 7e2fd35
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 20:22:35 2016 +0200
Merge remote-tracking branch 'github/pr/1915'
commit 7e2fd35065855e81dbcb90f5463b62723e637f31
Author: Florian Forster <ff at octo.it>
Date: Mon Sep 12 20:19:57 2016 +0200
src/utils_format_graphite.c: Re-insert blank line.
commit 2f2f63a8c96ecd07e481b2d28f03ce0e82c55f5a
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Mon Sep 12 13:07:52 2016 -0400
Address more review comments:
- Locking fixes,
- Leak fixes.
commit f95938c4b379da2f28b9423a682012a49a617832
Author: Michael Leinartas <mleinartas at twitter.com>
Date: Mon Sep 12 12:20:16 2016 -0500
Improve if statement readability with braces
commit 3458b7647a8a5b7555b3fb0097d81bda4923e7c6
Author: Michael Leinartas <mleinartas at twitter.com>
Date: Mon Sep 12 10:20:34 2016 -0500
Update collectd.conf manpage and address style issues
commit 59919c47562a2266a6dbd306a78113cb8ddd5ffe
Merge: 2a9bdee cfa9652
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 15:56:28 2016 +0200
Merge remote-tracking branch 'github/pr/1927'
commit 276d1e1bdfc3e02431bb05c06da7a16f80fa7e47
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 14:16:00 2016 +0200
collectd.conf(5): Document the semantics of the "TypesDB" option in more detail.
Fixed: #1241
commit e935e855188de7475fcc76c88e4a709894363ad5
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 11:49:52 2016 +0200
contrib/migrate-4-5.px: Don't convert "ps_code" and "ps_data" to derive.
Fixes: #1687
commit 8d78a2b27ddcc2e0dbca30be9c888479a4757c1f
Author: Michael Leinartas <mleinartas at twitter.com>
Date: Thu Sep 8 14:00:35 2016 -0500
Add missing option to write_graphite example
Signed-off-by: Florian Forster <octo at collectd.org>
commit cfa9652f77aced1a4f5e5b611177f84bdd11f609
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 09:33:47 2016 +0200
varnish plugin: Fix syntax error.
commit 4d370741101aeb037ae52f3529a4a0869e0dc08a
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 09:26:26 2016 +0200
turbostat plugin: Use parse_value_file().
commit e67a651b07f09fbd4850b9fa5b842f1b87d1992e
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 09:20:18 2016 +0200
thermal plugin: Use parse_value_file().
commit 486b566fa4dce30202b0c1d680e0e537dfad4d30
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 09:06:20 2016 +0200
entropy plugin: Use parse_value_file().
commit 270994227b52651b91a6e2b46e6b8eba32d789d5
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 09:02:26 2016 +0200
cpufreq plugin: Use parse_value_file().
commit 0cf23dfad554180158e44b4a7292f72f27549c31
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 08:47:16 2016 +0200
conntrack plugin: Use parse_value_file().
commit b9864f683bb778ef52b314db389187f1bd7755bb
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 08:34:09 2016 +0200
battery plugin: Replace getvalue() with parse_value_file().
commit 95ef899242f7f2cf552162601608239d6d8eaa09
Author: Florian Forster <octo at collectd.org>
Date: Fri Sep 9 16:50:06 2016 +0200
src/daemon/common.[ch]: Implement parse_value_file().
Fixes: #1914
commit 2a9bdee896ac6372fb58288efaba3166bc4b6b6a
Merge: 9927325 44884a0
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 07:58:29 2016 +0200
Merge remote-tracking branch 'github/pr/1920'
commit 9927325e311d2507b1cf7bcda4d1f0347ffb1585
Merge: c599624 6a151af
Author: Florian Forster <octo at collectd.org>
Date: Mon Sep 12 07:56:26 2016 +0200
Merge remote-tracking branch 'github/pr/1924'
commit fe4af1c0492b00fed423211d465798bf926da6b1
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Sun Sep 11 18:54:48 2016 -0400
Address review comments:
- Add meta_data_as_string,
- Use utility function.
- Leak fixes.
- Minor optimization.
commit 6a151af7649eb811a5f8dc1bd78c21e6c53c74aa
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Sun Sep 11 21:04:17 2016 -0400
Address review comments:
- Use a global to allow config-less operation.
- Use utility function.
commit 2f0b03e515cd82e6fd46ff98ea99a0f671f3bc22
Author: Florian Forster <octo at collectd.org>
Date: Sun Sep 11 21:35:34 2016 +0200
Tree wide: Don't document the user_data_t holds user data.
commit 5cd5988ec752f441254fc887117c3d5aa8f8d094
Author: Florian Forster <octo at collectd.org>
Date: Sun Sep 11 21:21:56 2016 +0200
Tree wide: Use user_data_t compound literal where appropriate.
commit 60ec28dd104bdeef4c5ed6882fb2b663ca9da2eb
Author: Florian Forster <octo at collectd.org>
Date: Sun Sep 11 20:31:31 2016 +0200
apache plugin: End statements with semi-colons.
If only I knew why this wasn't considered a syntax error …
commit 7e3059ba3dde87dbe89e21cb7844a10f9e83d6f5
Author: Florian Forster <octo at collectd.org>
Date: Sun Sep 11 10:01:10 2016 +0200
Bump version to 5.6.0; Update ChangeLog.
commit bdb2f9c94f874aa8f8ba2a926c8c7821dc49c433
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Fri Sep 9 13:30:15 2016 -0400
Document Plugin:WriteLog configuration.
commit 976b9c4bfc6a2ab821fb7a087b015906ba7d36a8
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Thu Sep 8 11:39:50 2016 -0400
Add optional configuration to write_log; allow writing JSON.
commit db1d3f57a0ea740e6011a394605121ce433aced0
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Thu Sep 8 12:26:00 2016 -0400
Document interpolation and DeleteMetaData.
commit 89c6aa454f70fa7088db97736bf188ee199a3ad4
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Wed Sep 7 17:00:14 2016 -0400
Implement interpolation.
commit 0377ab15b414528ed5ae8a31840eba745cf2a6b2
Author: Igor Peshansky <igorpeshansky at github.com>
Date: Tue Sep 6 19:01:04 2016 -0400
Allow deleting metadata keys.
commit 44884a0e89790a1477844f7ce317aabcd1d730c2
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date: Fri Sep 9 11:08:27 2016 +0200
onewire plugin - improve error messages
Actually print error messages, return value from OW API is either 0 or -1 - not very informative.
commit 836598b100f9acec988fcfe9a14e349e4186783b
Author: Michael Leinartas <mleinartas at twitter.com>
Date: Thu Sep 8 13:13:26 2016 -0500
Add option to write_graphite: DropDuplicateFields
This option drops duplicate type and type_instance fields or duplicate
type and plugin fields.
example_host.memory.memory.cached becomes example_host.memory.cached
example_host.cpu.0.cpu.idle becomes example_host.cpu.0.idle
More information about the collectd-changes
mailing list